更新线路版本

YRF
1 parent 12665bca
Showing 51 changed files with 1535 additions and 263 deletions
src/main/java/com/bsth/controller/LineController.java
src/main/java/com/bsth/controller/LineVersionsController.java
src/main/java/com/bsth/controller/SectionRouteController.java
src/main/java/com/bsth/controller/StationController.java
src/main/java/com/bsth/entity/LineVersions.java
src/main/java/com/bsth/repository/LineVersionsRepository.java
src/main/java/com/bsth/repository/LsSectionRouteRepository.java
src/main/java/com/bsth/repository/LsStationRouteRepository.java
src/main/java/com/bsth/repository/SectionRouteCacheRepository.java
src/main/java/com/bsth/repository/SectionRouteRepository.java
src/main/java/com/bsth/repository/StationRouteCacheRepository.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/service/LineVersionsService.java
src/main/java/com/bsth/service/SectionRouteService.java
src/main/java/com/bsth/service/StationService.java
src/main/java/com/bsth/service/impl/LineVersionsServiceImpl.java
src/main/java/com/bsth/service/impl/SectionRouteServiceImpl.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/impl/StationServiceImpl.java
@@ -90,7 +90,7 @@ public class LineController extends BaseController&lt;Line, Integer&gt; {
 			lineVersions.setName("原始版本");
 			lineVersions.setLine(t);
 			lineVersions.setLineCode(t.getLineCode());
-			lineVersions.setStartDate(t.getCreateDate());
+			lineVersions.setStartDate(new java.sql.Date(new Date().getTime()));
 			lineVersions.setEndDate(new java.sql.Date(endDate.getTime()));// 2088-8-8 00:00:00
 			lineVersions.setVersions(1);
 			lineVersions.setStatus(1);
@@ -85,4 +85,12 @@ public class LineVersionsController extends BaseController&lt;LineVersions, Integer
 		return service.findCurrentVersion(lineId);
 	}
+	/**
+	 * 根据id发布版本号（修改isupdate字段）
+	 */
+	@RequestMapping(value = "issueVersion", method = RequestMethod.POST)
+	public Map<String, Object> issueVersion(@RequestParam(defaultValue = "id") int id) {
+		return service.issueVersion(id);
+	}
+	
 }
@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import com.bsth.entity.SectionRoute;
+import com.bsth.entity.StationRouteCache;
 import com.bsth.service.SectionRouteService;
 /**
@@ -55,6 +56,12 @@ public class SectionRouteController extends BaseController&lt;SectionRoute, Integer
     public Iterable<SectionRoute> list(@RequestParam Map<String, Object> map) {
         return routeService.list(map);
     }
+    
+    @RequestMapping(value = "/cacheList", method = RequestMethod.GET)
+    public List<StationRouteCache> cacheList(@RequestParam Map<String, Object> map) {
+//    	 routeService.cacheList(map)
+        return null;
+    }
 	/**
 	 * @Description :TODO(查询路段信息)
@@ -76,8 +83,8 @@ public class SectionRouteController extends BaseController&lt;SectionRoute, Integer
 	 * 
 	 * @return Map<String, Object> 
 	 */
-	@RequestMapping(value = "/findSectionCache" , method = RequestMethod.GET)
-	public  List<Map<String, Object>> findPointsCache(@RequestParam Map<String, Object> map) {
+	@RequestMapping(value = "/findCacheSection" , method = RequestMethod.GET)
+	public  List<Map<String, Object>> getSectionRouteCache(@RequestParam Map<String, Object> map) {
 		return routeService.getSectionRouteCache(map);
 	}
@@ -105,6 +112,11 @@ public class SectionRouteController extends BaseController&lt;SectionRoute, Integer
 		return routeService.findUpSectionRouteCode(map);
 	}
+	@RequestMapping(value = "/findCacheUpSectionRouteCode" , method = RequestMethod.GET)
+	public List<Map<String, Object>> findCacheUpSectionRouteCode(@RequestParam Map<String, Object> map) {
+		return routeService.findCacheUpSectionRouteCode(map);
+	}
+	
 	/**
 	 * @Description :TODO(引用路段)
 	 * 
@@ -157,4 +157,15 @@ public class StationController extends BaseController&lt;Station, Integer&gt; {
 		return GetUIDAndCode.getStationId();
 	}
+	/**
+	 * @Description :TODO(查询站点编码)
+	 * 
+	 * @return int <stationCode站点编码>
+	 */
+	@RequestMapping(value="stationCacheSave" , method = RequestMethod.POST)
+	public Map<String, Object> stationCacheSave(@RequestParam Map<String, Object> map) {
+		map.put("createBy", "");
+		map.put("updateBy", "");
+		return service.stationCacheSave(map);
+	}
 }
@@ -69,6 +69,12 @@ public class LineVersions{
 	 */ 
 	private int status;
+	/**
+	 * 是否发布 int length(1)
+	 * 0（没有），1（发布）
+	 */
+	private int isupdate;
+	
 	public Integer getId() {
 		return id;
 	}
@@ -156,5 +162,13 @@ public class LineVersions{
 	public void setStatus(int status) {
 		this.status = status;
 	}
+
+	public int getIsupdate() {
+		return isupdate;
+	}
+
+	public void setIsupdate(int isupdate) {
+		this.isupdate = isupdate;
+	}
 }
 \ No newline at end of file
@@ -79,4 +79,12 @@ public interface LineVersionsRepository extends BaseRepository&lt;LineVersions, Int
 	 */
 	@Query(value = "  SELECT lv.versions FROM LineVersions lv where lv.line.id = ?1 and lv.status=1")
 	public Integer findCurrentVersion(Integer id);
+
+	/**
+	 * 发布版本
+	 */
+	@Transactional
+	@Modifying
+	@Query(value = "UPDATE LineVersions lv set lv.isupdate=1 where lv.id=?1 ")
+	public int issueVersion(int id);
 }
@@ -37,4 +37,11 @@ public interface LsSectionRouteRepository extends BaseRepository&lt;LsSectionRoute,
     @Modifying
     @Query(value="DELETE from bsth_c_ls_sectionroute where line = ?1  and directions = ?2 and versions=?3", nativeQuery=true)
     public void batchDelete(Integer line, Integer dir, Integer versions);
+
+    /**
+     * 更新路线前撤销线路版本下历史原有路段路由
+     */
+    @Modifying
+    @Query(value="UPDATE bsth_c_ls_sectionroute set destroy = 1 where line = ?1  and directions = ?2 and versions=?3", nativeQuery=true)
+	public void batchDestroy(Integer sectionRouteLine, Integer directions, Integer versions);
 }
@@ -42,4 +42,14 @@ public interface LsStationRouteRepository extends BaseRepository&lt;LsStationRoute,
     @Modifying
     @Query(value="DELETE from bsth_c_ls_stationroute where line = ?1  and directions = ?2 and versions = ?3", nativeQuery=true)
     public void batchDelete(Integer line,Integer dir, Integer versions);
+
+    /**
+     * 更新路线前撤销线路版本号历史原有站点路由
+     * 
+     * @param line
+     * @param dir
+     */
+    @Modifying
+    @Query(value="UPDATE bsth_c_ls_stationroute set destroy = 1 where line = ?1  and directions = ?2 and versions = ?3", nativeQuery=true)
+    public void batchDestroy(Integer sectionRouteLine, Integer directions, Integer versions);
 }
@@ -139,4 +139,18 @@ public interface SectionRouteCacheRepository extends BaseRepository&lt;SectionRoute
     @Modifying
     @Query(value="delete from bsth_c_sectionroute_cache where line_code = ?1  and directions = ?2", nativeQuery=true)
     public void sectionRouteCacheDel(String lineCode,Integer dir);
-}
+    
+    @Modifying
+    @Query(value="delete from bsth_c_sectionroute_cache where line = ?1  and directions = ?2", nativeQuery=true)
+    public void sectionRouteCacheDel(Integer lineId,Integer dir);
+    
+    /**
+	 * @Description :TODO(查询线路某方向下的上一个路段序号)
+	 * 
+	 * @param map <lineId:线路ID； direction：方向；sectionRouteCode：路段编码>
+	 * 
+	 * @return List<Map<String, Object>> 
+	 */
+	@Query(value = " select  MAX(r.sectionroute_code) as sectionrouteCode   from bsth_c_sectionroute_cache r  WHERE r.line=?1 and r.directions =?2 and r.sectionroute_code< ?3 and r.destroy = 0", nativeQuery=true)
+	List<Object[]> findCacheUpSectionRouteCode(Integer lineId,Integer direction,Integer stationRouteCode);
+}
 \ No newline at end of file
@@ -202,4 +202,7 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
     @Modifying
     @Query(value="delete from SectionRoute sr where sr.line.id = ?1  and sr.lineCode = ?2")
 	public void batchDelete(Integer lineId, String lineCode);
+
+    @Query("select r from SectionRoute r where r.line.id=?1 and r.directions=?2 and r.destroy=0 order by r.sectionrouteCode")
+	public List<SectionRoute> findByLine(Integer lineId, Integer dir);
 }
 package com.bsth.repository;
 import java.util.List;
-import java.util.Map;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
-import com.bsth.entity.StationRoute;
 import com.bsth.entity.StationRouteCache;
-import com.bsth.entity.search.CustomerSpecs;
 /**
  * 
@@ -57,12 +52,16 @@ public interface StationRouteCacheRepository extends BaseRepository&lt;StationRoute
 	/**
      * 更新路线删除线路缓存站点
      * 
-     * @param line
+     * @param lineCode
      * @param dir
      */
     @Modifying
     @Query(value="delete from bsth_c_stationroute_cache where line_code = ?1 and directions = ?2 ", nativeQuery=true)
     public void stationRouteCacheDel(String lineCode,Integer dir);
+    
+    @Modifying
+    @Query(value="delete from bsth_c_stationroute_cache where line = ?1 and directions = ?2 ", nativeQuery=true)
+    public void stationRouteCacheDel(Integer lineId,Integer dir);
     @Query(value = "SELECT  a.`stationRoute.id`," +
@@ -137,4 +136,7 @@ public interface StationRouteCacheRepository extends BaseRepository&lt;StationRoute
 					"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);
+	@Modifying
+	@Query(value="UPDATE bsth_c_stationroute_cache  set station_route_code = (station_route_code+10) where line = ?1  and directions = ?2 and station_route_code >=?3 and destroy = 0", nativeQuery=true)
+	public void stationUpdStationRouteCode(Integer line,Integer dir,Integer routeCod);
 }
@@ -188,7 +188,7 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 			" a.stationRouteUpdateDate," +
 			" b.id AS stationId," +
 			" b.station_cod AS stationCode," +
-			" b.station_name AS stationName," +
+			" a.stationRouteName," +
 			" b.road_coding AS stationRoadCoding," +
 			" b.db_type AS stationDbType," +
 			" b.b_jwpoints AS stationJwpoints," +
@@ -211,6 +211,7 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 			" 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," +
@@ -258,6 +259,9 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 	@Query("select r from StationRoute r where r.lineCode=?1 and r.directions=?2 and r.destroy=0 order by r.stationRouteCode")
 	List<StationRoute> findByLine(String lineCode, int updown);
+	@Query("select r from StationRoute r where r.line.id=?1 and r.directions=?2 and r.destroy=0 order by r.stationRouteCode")
+	List<StationRoute> findByLine(Integer lineId, Integer dir);
+	
 	@EntityGraph(value = "stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
 	@Query("select s from StationRoute s where s.destroy=0 and s.lineCode=?1")
 	List<StationRoute> findByLineCode(String lineCode);
@@ -39,4 +39,6 @@ public interface LineVersionsService extends BaseService&lt;LineVersions, Integer&gt; 
 	Map<String, Object> add(Map<String, Object> map);
+	Map<String, Object> issueVersion(int id);
+
 }
@@ -61,8 +61,11 @@ public interface SectionRouteService extends BaseService&lt;SectionRoute, Integer&gt; 
 	 */
 	 List<Map<String, Object>> findUpSectionRouteCode(Map<String, Object> map);
+	 List<Map<String, Object>> findCacheUpSectionRouteCode(Map<String, Object> map);
+	 
 	 Map<String, Object> quoteSection(Map<String, Object> map);
 	void batchUpdate(Integer lineId, String lineCode);
+
 }
@@ -52,6 +52,8 @@ public interface StationService extends BaseService&lt;Station, Integer&gt; {
 	 */
 	Map<String, Object> stationSaveMap(Map<String, Object> map);
+	Map<String, Object> stationCacheSave(Map<String, Object> map);
+	
 	/**
 	 * @Description :TODO(更新站点保存)
 	 * 
@@ -83,5 +85,8 @@ public interface StationService extends BaseService&lt;Station, Integer&gt; {
 	Map<String, Object> cacheSave(Map<String, Object> map);
 	Map<String, Object> stationCacheUpdate(Map<String, Object> map);
+
+	Map<String, Object> referenceCurrentVersion(Map<String, Object> map);
+
 }
@@ -258,5 +258,16 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
 	public Integer findCurrentVersion(int lineId) {
 		return repository.findCurrentVersion(lineId);
 	}
-	
+
+	@Override
+	public Map<String, Object> issueVersion(int id) {
+		Map<String, Object> resultMap = new HashMap<>();
+		
+			int statu = repository.issueVersion(id);
+			if (statu == 1) 
+				resultMap.put("status", ResponseCode.SUCCESS);
+			else 
+				resultMap.put("status", ResponseCode.ERROR);
+		return resultMap;
+	}
 }
@@ -131,8 +131,8 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 	@Transactional
 	@Override
 	public List<Map<String, Object>> getSectionRouteCache(Map<String, Object> map) {
-		int lineId = map.get("line.id_eq").equals("") ? 0 : Integer.parseInt(map.get("line.id_eq").toString());
-		int directions = map.get("directions_eq").equals("") ? 0 : Integer.parseInt(map.get("directions_eq").toString());
+		int lineId = map.get("lineId").equals("") ? 0 : Integer.parseInt(map.get("lineId").toString());
+		int directions = map.get("dir").equals("") ? 0 : Integer.parseInt(map.get("dir").toString());
 		List<Object[]> listObjArray = Cacherepository.getSectionRouteCache(lineId, directions);
 		List<Map<String, Object>> resultList = new ArrayList<Map<String,Object>>(); 
 		if(listObjArray.size()>0) {
@@ -297,6 +297,23 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 		}
 		return list;
 	}
+	
+	@Override
+	public List<Map<String, Object>> findCacheUpSectionRouteCode(Map<String, Object> map) {
+		Integer lineId = map.get("lineId").equals("") ? null : Integer.parseInt(map.get("lineId").toString());
+		Integer direction = map.get("direction").equals("") ? null : Integer.parseInt(map.get("direction").toString());
+		Integer stationRouteCode = map.get("sectionRouteCode").equals("") ? null : Integer.parseInt(map.get("sectionRouteCode").toString());
+		List<Object[]> reslutList = Cacherepository.findCacheUpSectionRouteCode(lineId, direction, stationRouteCode);
+		List<Map<String, Object>> list = new ArrayList<Map<String,Object>>();
+		if(reslutList.get(0)!=null) {
+			for(int i = 0 ; i <reslutList.size() ;i++){
+				Map<String, Object> tempM = new HashMap<String, Object>();
+				tempM.put("sectionrouteCode", reslutList.get(i));
+				list.add(tempM);
+			}
+		}
+		return list;
+	}
 	@Override
 	public Map<String, Object> quoteSection(Map<String, Object> map) {
@@ -7,9 +7,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.mozilla.javascript.ObjArray;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -17,7 +15,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.Line;
-import com.bsth.entity.LineVersions;
 import com.bsth.entity.LsSectionRoute;
 import com.bsth.entity.LsStationRoute;
 import com.bsth.entity.Section;
@@ -40,7 +37,6 @@ import com.bsth.util.TransGPS;
 import com.bsth.util.TransGPS.Location;
 import com.bsth.util.Geo.GeoUtils;
 import com.bsth.util.Geo.Point;
-import com.google.gson.JsonObject;
 /**
  * 
@@ -171,7 +167,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 				String bsectionVectorS = null;
 				if(!sectionsBpoints.equals(""))
 					 bsectionVectorS = "LINESTRING(" + sectionsBpoints + ")";				
-				repository.systemSave(sectionCode, sectionName, crosesRoad, endNode, startNode, middleNode, gsectionVector, bsectionVectorS, sectionType, csectionVector, roadCoding, sectionDistance, sectionTime, dbType, speedLimit, descriptions, versions, sectionId);
+				repository.systemSave(sectionCode, sectionName, crosesRoad, endNode, startNode, middleNode, gsectionVector, bsectionVectorS, sectionType, csectionVector, roadCoding, sectionDistance, sectionTime, dbType, speedLimit, descriptions, 1, sectionId);
 				SectionRoute route = new SectionRoute();
 				Line line = lineRepository.findOne(sectionRouteLine);
 				Section section = repository.findOne(sectionId);
@@ -663,7 +659,8 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 			// 路段时长
 			Double  sectionTime = map.get("sectionTime").equals("") ? null : Double.valueOf(map.get("sectionTime").toString());
 			// 路段路由
-			Integer sectionrouteCode = map.get("sectionrouteCode").equals("") ? null : Integer.valueOf(map.get("sectionrouteCode").toString());
+//			Integer sectionrouteCode = map.get("sectionrouteCode").equals("") ? null : Integer.valueOf(map.get("sectionrouteCode").toString());
+			Integer sectionrouteCode = 100;
 			SectionRouteCache resultS = routeCacheRepository.findOne(sectionRouteId);
 			int old_code = resultS.getSectionrouteCode();
 			if(sectionrouteCode!=null) {
@@ -1172,7 +1172,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 	    		tempM.put("stationCode", objects.get(i)[19]);
-	    		tempM.put("stationName", objects.get(i)[20]);
+	    		tempM.put("stationRouteName", objects.get(i)[20]);
 	    		tempM.put("stationRoadCoding", objects.get(i)[21]);
@@ -18,7 +18,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.Line;
 import com.bsth.entity.LineInformation;
-import com.bsth.entity.LineVersions;
 import com.bsth.entity.Section;
 import com.bsth.entity.SectionRoute;
 import com.bsth.entity.SectionRouteCache;
@@ -34,7 +33,6 @@ import com.bsth.repository.SectionRouteRepository;
 import com.bsth.repository.StationRepository;
 import com.bsth.repository.StationRouteCacheRepository;
 import com.bsth.repository.StationRouteRepository;
-import com.bsth.service.LineVersionsService;
 import com.bsth.service.StationService;
 import com.bsth.util.GetUIDAndCode;
 import com.bsth.util.TransGPS;
@@ -89,8 +87,6 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 	@Autowired
 	LineVersionsRepository lineVersionsRepository;
-	private GeoUtils geoUtils;
-		
 	Logger logger = LoggerFactory.getLogger(this.getClass());
 	/**
@@ -895,6 +891,156 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 	}
 	/**
+	 * @Description :TODO(新增缓存站点保存)
+	 */
+	@Transactional
+	@Override
+	public Map<String, Object> stationCacheSave(Map<String, Object> map) {
+		Map<String, Object> resultMap = new HashMap<String, Object>();
+		try {
+			// 站点编码
+			String stationCod = "";
+			// 站点ID
+			Integer stationId = null;
+			// 站点名称
+			String zdmc = map.get("zdmc").equals("") ? "" : map.get("zdmc").toString();
+			// 方向
+			Integer directions = map.get("directions").equals("") ? null : Integer.parseInt(map.get("directions").toString());
+			// 原坐标点
+			String bJwpoints = map.get("bJwpoints").equals("") ? "" : map.get("bJwpoints").toString();
+			String bJwpointsArray[] = null;
+			if(bJwpoints!=null) {
+				bJwpointsArray = bJwpoints.split(" ");
+			}
+			List<Object[]> stationNameList = repository.findStationName(directions,zdmc);
+			Map<String, Object> isHaveMap = isHaveStationname(bJwpointsArray[0],bJwpointsArray[1],stationNameList);
+			// 是否撤销
+			Integer destroy = map.get("destroy").equals("") ? null : Integer.parseInt(map.get("destroy").toString());
+			// 版本
+			Integer versions = map.get("versions").equals("") ? null : Integer.parseInt(map.get("versions").toString());
+			// 说明
+			String descriptions = map.get("descriptions").equals("") ? "" : map.get("descriptions").toString();
+			if(Boolean.parseBoolean(isHaveMap.get("isHave").toString())) {
+				stationId = Integer.parseInt(isHaveMap.get("id").toString());
+			}else {
+				// 站点编码
+				stationCod = map.get("stationCod").equals("") ? "" : map.get("stationCod").toString();
+				// 站点ID
+				stationId = Integer.valueOf(stationCod);
+				// 圆半径
+				Integer radius = map.get("radius").equals("") ? null : Integer.parseInt(map.get("radius").toString());
+				// 图形类型
+				String shapesType = map.get("shapesType").equals("") ? "" : map.get("shapesType").toString();
+				// 创建人
+				Integer createBy = map.get("createBy").equals("") ? null : Integer.parseInt(map.get("createBy").toString());
+				// 修改人
+				Integer updateBy = map.get("updateBy").equals("") ?  null : Integer.parseInt(map.get("updateBy").toString());
+				// 城建坐标经度
+				Float x = map.get("x").equals("") ?  null : Float.parseFloat(map.get("x").toString());
+				// 城建坐标纬度
+				Float y = map.get("y").equals("") ? null : Float.parseFloat(map.get("y").toString());
+				// 道路编码
+				String roadCoding = map.get("roadCoding").equals("") ? "" : map.get("roadCoding").toString();
+				// 原坐标类型
+				String dbType = map.get("dbType").equals("") ? "" : map.get("dbType").toString();
+				// WGS经纬度
+				Float gLonx = null;
+				// WGS纬度
+				Float gLaty = null;
+				if(bJwpointsArray.length>0) {
+					Location resultPoint = FromBDPointToWGSPoint(bJwpointsArray[0],bJwpointsArray[1]);
+					gLonx = (float)resultPoint.getLng();
+					gLaty = (float)resultPoint.getLat();
+				}
+				// 多边形原坐标点集合
+				String bPloygonGrid = map.get("bPolygonGrid").equals("") ? "" : map.get("bPolygonGrid").toString();
+				// 多边形WGS坐标点集合
+				String gPloygonGrid ="";
+				if(!bPloygonGrid.equals("")) {
+					String bPloygonGridArray[] = bPloygonGrid.split(",");
+					int bLen_ = bPloygonGridArray.length;
+					for(int b = 0 ;b<bLen_;b++) {
+						String tempArray[]= bPloygonGridArray[b].split(" ");
+						Location resultPoint = FromBDPointToWGSPoint(tempArray[0],tempArray[1]);
+						 if(b==0) {
+							 gPloygonGrid = String.valueOf(resultPoint.getLng()) + " " + String.valueOf(resultPoint.getLat());
+						 }else {
+							 gPloygonGrid = gPloygonGrid +  ',' + String.valueOf(resultPoint.getLng()) + " " + String.valueOf(resultPoint.getLat());
+						 }
+					}
+				}
+				if(bPloygonGrid.equals(""))
+					bPloygonGrid = null;
+				else
+					bPloygonGrid = "POLYGON(("  + bPloygonGrid +"))";
+				if(gPloygonGrid.equals(""))
+					gPloygonGrid = null;
+				else
+					gPloygonGrid = "POLYGON(("  + gPloygonGrid +"))";
+				// 保存站点
+				repository.stationSave(stationCod, zdmc, roadCoding, dbType, bJwpoints, 
+										gLonx, gLaty, x, y, gPloygonGrid,bPloygonGrid, destroy, radius, 
+										shapesType, versions, descriptions, createBy, updateBy,stationId);
+			}
+			Station station = repository.findOne(stationId);
+			StationRouteCache arg0 = new StationRouteCache();
+			// 距离
+			Double distances =  map.get("distances").equals("") ? 0.0d : Double.parseDouble(map.get("distances").toString());
+			// 时间
+			Double toTime = map.get("toTime").equals("") ? 0.0d : Double.parseDouble(map.get("toTime").toString());
+			// 站点路由名称
+			String stationName = map.get("stationName").equals("") ? "" : map.get("stationName").toString();
+			// 线路ID
+			int line = map.get("lineId").equals("") ? 0 : Integer.parseInt(map.get("lineId").toString());
+			// 线路信息
+			Line resultLine = lineRepository.findOne(line);
+			// 站点路由序号
+			String stationRouteCodeStr = map.get("stationRouteCode").equals("") ? "" : map.get("stationRouteCode").toString();
+			// 站点类型
+			String stationMark = map.get("stationMark").equals("") ? "" : map.get("stationMark").toString();
+			Integer stationRouteCode = null;
+			if(stationRouteCodeStr!="") {
+				String stationRouteCodeArray [] = stationRouteCodeStr.split("_");
+				stationRouteCode = Integer.parseInt(stationRouteCodeArray[0].toString())+1;
+			}else {
+				stationRouteCode = 100;
+			}
+			// 线路
+			arg0.setLine(resultLine);
+			arg0.setLineCode(resultLine.getLineCode());
+			// 站点
+			arg0.setStation(station);
+			// 站点路由名称
+			arg0.setStationName(stationName);
+			// 站点路由编码
+			arg0.setStationCode(station.getStationCod());
+			// 站点路由序号
+			arg0.setStationRouteCode(stationRouteCode);
+			// 站点路由类型
+			arg0.setStationMark(stationMark);
+			// 站点路由站点方向
+			arg0.setDirections(directions);
+			// 站点路由到站距离
+			arg0.setDistances(distances);
+			// 站点路由到站时间
+			arg0.setToTime(toTime);
+			// 站点版本号
+			arg0.setVersions(versions);
+			// 是否撤销
+			arg0.setDestroy(destroy);
+			// 站点路由说明
+			arg0.setDescriptions(descriptions);
+			routeCacheRepository.stationUpdStationRouteCode(line, directions, stationRouteCode);
+			routeCacheRepository.save(arg0);
+			resultMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			resultMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+		}
+		return resultMap;
+	}
+	
+	/**
 	 * @Description :TODO(更新站点保存)
 	 * 
 	 * @param map <bJwpoints：中心点百度坐标；bPolygonGrid：多边形图形百度坐标；dbType：原坐标类型；
@@ -918,7 +1064,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			String stationCod = map.get("stationCod").equals("") ? "" : map.get("stationCod").toString();
 			String zdmc = map.get("zdmc").equals("") ? "" : map.get("zdmc").toString();
 			// 站点名称
-			String stationName = map.get("stationName").equals("") ? "" : map.get("stationName").toString();
+			String stationRouteName = map.get("stationName").equals("") ? "" : map.get("stationName").toString();
 			// 所在道路编码
 			String roadCoding = map.get("roadCoding").equals("") ? "" : map.get("roadCoding").toString();
 			// 经纬坐标类型 
@@ -1005,7 +1151,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			Station station = repository.findOne(stationId);
 			Line line = lineRepository.findOne(LineId);
 			StationRoute stationRoute = new StationRoute();
-			stationRoute.setStationName(stationName);
+			stationRoute.setStationName(stationRouteName);
 			stationRoute.setId(stationRouteId);
 			stationRoute.setStationRouteCode(stationRouteCode);
 			stationRoute.setStation(station);
@@ -1201,7 +1347,6 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			// 保存路段
 			sectionRouteRepository.save(sectionRoute);
 		}
-		
 	}
 	/**
@@ -1222,10 +1367,10 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			String libraryPointstr =  s.getbJwpoints();
 			String points[] = libraryPointstr.toString().split(" ");
 			Point center = new Point(Double.parseDouble(points[0]), Double.parseDouble(points[1]));
-			// 在40m内认为是同一个站点
-			Circle circle = new Circle(center, 40);
+			// 在60m内认为是同一个站点
+			Circle circle = new Circle(center, 60);
 			// 匹配到了用数据库中的点替换
-			if (geoUtils.isPointInCircle(point, circle)) {
+			if (GeoUtils.isPointInCircle(point, circle)) {
 				map.put("name", s.getStationName().toString());
 				map.put("potion_lng", points[0]);
 				map.put("potion_lat", points[1]);
@@ -1716,4 +1861,36 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 		}
 		return resultMap;
 	}
+
+	/**
+	 * @Description :TODO(引用当前版本)
+	 */
+	@Override
+	@Transactional
+	public Map<String, Object> referenceCurrentVersion(Map<String, Object> map) {
+		Map<String, Object> resultMap = new HashMap<String, Object>();
+		try {
+			Integer lineId = Integer.parseInt(map.get("lineId").toString());
+			Integer dir = Integer.parseInt(map.get("directions").toString());
+			List<StationRoute> stationRoutes = routeRepository.findByLine(lineId, dir);
+			List<SectionRoute> sectionRoutes = sectionRouteRepository.findByLine(lineId, dir);
+			// 删除缓存路由数据
+			routeCacheRepository.stationRouteCacheDel(lineId, dir);
+			sectionRouteCacheRepository.sectionRouteCacheDel(lineId, dir);
+			// 当前版本路由保存到缓存路由
+			List<StationRouteCache> stationRouteCaches = JSONArray.parseArray(JSON.toJSONString(stationRoutes), StationRouteCache.class);
+			List<SectionRouteCache> sectionRouteCaches = JSONArray.parseArray(JSON.toJSONString(sectionRoutes), SectionRouteCache.class);
+			for(StationRouteCache sr:stationRouteCaches) {
+				routeCacheRepository.save(sr);
+			}
+			for(SectionRouteCache sr:sectionRouteCaches) {
+				sectionRouteCacheRepository.save(sr);
+			}
+			resultMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			resultMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+		}
+		return resultMap;
+	}
 }
 \ No newline at end of file
+<!-- 新增站点 -->
+<div class="modal fade" id="add_station_mobal" role="basic" aria-hidden="true">
+	<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="add_station_form" action="/module" method="post">
+					<div class="alert alert-danger display-hide"> <button class="close" data-close="alert"></button>
+						您的输入有误，请检查下面的输入项
+					</div>
+					<!-- 线路ID -->
+					<input type="hidden" name="lineId" id="lineIdInput"  value="" />
+					<input type="hidden" name="bPolygonGrid" id="bPolygonGridInput"  value="" />
+					<input type="hidden" name="gPolygonGrid" id="gPolygonGridInput"  value="" />
+					<input type="hidden" name="gJwpoints" id="gJwpointsInput">
+					<input type="hidden" name="dbType" id="dbTypeInput" value="b"/>
+					<input type="hidden" name="x" id="xInput" value=""/>
+					<input type="hidden" name="y" id="yInput" value=""/>
+					<!-- 站点名称 -->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="control-label col-md-3">
+          						<span class="required"> * </span> 站点名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                    		</label>
+							<div class="col-md-6">
+								<input type="text" class="form-control" name="zdmc" id="zdmcInput" placeholder="站点名称" readonly="readonly"> 
+							</div>
+						</div>
+					</div>
+					<!-- 站点路由名称 -->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="control-label col-md-3">
+          						<span class="required"> * </span> 站点路由名称:
+                    		</label>
+							<div class="col-md-6">
+								<input type="text" class="form-control" name="stationName" id="stationNameInput" placeholder="站点路由名称"> 
+							</div>
+						</div>
+					</div>
+					<!-- 站点编码 -->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="control-label col-md-3">
+          						<span class="required"> * </span>站点编码&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                    		</label>
+							<div class="col-md-6">
+								<input type="text" class="form-control" name="stationCod" id="stationCodInput" readonly="readonly">
+							</div>
+						</div>
+					</div>
+					<!-- 站点方向 -->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="control-label col-md-3">
+          						<span class="required"> * </span>站点方向&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                    		</label>
+							<div class="col-md-6">
+								<select name="directions" class="form-control" id="stationdirSelect">
+									<option value="">-- 请选择站点类型 --</option>
+									<option value="0">上行</option>
+									<option value="1">下行</option>
+								</select>
+							</div>
+						</div>
+					</div>
+					
+					<!-- 站点序号 -->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="control-label col-md-3">
+          						<span class="required"> * </span>站点序号&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                    		</label>
+							<div class="col-md-6">
+								<select name="stationRouteCode" class="form-control" id="stationrouteSelect" style="width:100%"></select>
+								<span class="help-block">说明:选择的站点将作为本站序号的参考，成为选择站点的下一站。 </span>
+							</div>
+						</div>
+					</div>
+					
+					<!-- 站点类型 -->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="control-label col-md-3">
+          						<span class="required"> * </span>站点类型&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                    		</label>
+							<div class="col-md-6">
+								<select name="stationMark" class="form-control" id="stationMarkSelect">
+									<option value="">-- 请选择站点类型 --</option>
+									<option value="B">起点站</option>
+									<option value="Z">中途站</option>
+									<option value="E">终点站</option>
+									<option value="T">停车场</option>
+								</select>
+							</div>
+						</div>
+					</div>
+					<!-- 中心位置坐标点 -->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="col-md-3 control-label"><span class="required"> * </span>经纬度坐标点:</label>
+							<div class="col-md-6">
+								<input type="text" class="form-control" name="bJwpoints" id="bJwpointsInput">
+							</div>
+						</div>
+					</div>
+					<!-- 几何图形类型 -->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="col-md-3 control-label"><span class="required"> * </span>几何图形类型:</label>
+							<div class="col-md-6">
+								<input type="text" class="form-control" name="shapesType" id="shapesTypeSelect" placeholder="几何图形类型" readonly="readonly">
+							</div>
+						</div>
+					</div>
+					<!-- 圆形半径 -->
+					<div class="form-body" id="radiusGroup">
+						<div class="form-group">
+							<label class="col-md-3 control-label"><span class="required"> * </span>圆形半径&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+							<div class="col-md-6">
+								<input type="text" class="form-control" name="radius" id="radiusInput" placeholder="圆形半径">
+							</div>
+						</div>
+					</div>
+					<!-- 是否撤销 -->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="col-md-3 control-label"><span class="required"> * </span>是否撤销&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+							<div class="col-md-6">
+								<select name="destroy" class="form-control" id="destroySelect">
+									<option value="">-- 请选择撤销类型 --</option>
+									<option value="0">否</option>
+									<option value="1">是</option>
+								</select>
+							</div>
+						</div>
+					</div>
+					
+					<!-- 道路编码-->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="control-label col-md-3">道路编码&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+							<div class="col-md-6">
+								<input type="text" class="form-control" name="roadCoding" id="roadCodingCodInput">
+							</div>
+						</div>
+					</div>
+					<!-- 到站时间 -->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="col-md-3 control-label">到站时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+							<div class="col-md-6">
+								<input type="text" class="form-control" name="toTime" id="toTimeInput" >
+								<span class="help-block">单位:分钟(min)</span>
+							</div>
+						</div>
+					</div>
+					<!-- 到站距离 -->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="col-md-3 control-label">到站距离&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+							<div class="col-md-6">
+								<input type="text" class="form-control" name="distances" id="distancesInput" >
+								<span class="help-block">单位:公里(km)</span>
+							</div>
+						</div>
+					</div>
+					<!-- 版本号 -->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="col-md-3 control-label">版本号&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+							<div class="col-md-6">
+								<input type="text" class="form-control" name="versions" id='versionsInput' Readonly>
+							</div>
+						</div>
+					</div>
+					
+					<!-- 描述/说明 -->
+	                <div class="form-group">
+	                	<label class="control-label col-md-3"> 描述/说明&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+                 		<div class="col-md-6">
+                     		<textarea class="form-control" rows="3" name="descriptions" id="descriptionsTextarea" placeholder="描述/说明"></textarea>
+                    	</div>
+	                </div>
+				</form>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn default" data-dismiss="modal" id="addMobalHiden">取消</button>
+				<button type="button" class="btn btn-primary" id="addStationButton">提交数据</button>
+			</div>
+		</div>
+	</div>
+</div>
+<script type="text/javascript">
+$('#add_station_mobal').on('AddStationMobal.show', function(e, addMap,ajaxd,staobj,editRoute,fun){
+	var Station =  staobj;
+	var Line = editRoute.getLineObj();
+	// 延迟加载
+	setTimeout(function(){
+		// 显示mobal
+		$('#add_station_mobal').modal({show : true,backdrop: 'static', keyboard: false});
+	},200);
+	// 当调用 hide 实例方法时触发
+	$('#add_station_mobal').on('hide.bs.modal', function () {
+		closeMobleSetClean();
+	});
+	// 当模态框对用户可见时触发（将等待 CSS 过渡效果完成）。
+	$('#add_station_mobal').on('show.bs.modal', function () {
+		// 获取站点编码元素，添加站点编码值
+		ajaxd.getStationCode(function(stationCode) {
+			// 线路ID.
+			$('#lineIdInput').val(Line.id);
+			// 获取站点名称元素设值.
+			$('#zdmcInput').val(Station.stationNamebootbox);
+			// 获取站点路由名称元素设值.
+			$('#stationNameInput').val(Station.stationNamebootbox);
+			// 站点编码.
+			$('#stationCodInput').val(stationCode).attr('Readonly','Readonly');
+			// 获取方向元素，并添加值.
+			$('#stationdirSelect').val(Line.dir).attr('Readonly','Readonly');
+			// 百度地图经纬度坐标中心点.
+			$('#bJwpointsInput').val(Station.bJwpoints).attr('Readonly','Readonly');
+			// 百度坐标点图形集合.
+			$('#bPolygonGridInput').val(Station.bPolygonGrid);
+			// 获取图形类型元素，并添加值
+			if(Station.shapesType=='r')
+				$('#shapesTypeSelect').val('圆形');
+			else if(Station.shapesType=='d') {
+				$('#radiusGroup').hide();
+				$('#shapesTypeSelect').val('多边形');
+			}
+			// 获取圆形半径元素，并添加值
+			$('#radiusInput').val(Station.radius);
+			// 是否撤销
+			$('#destroySelect').val(0); 
+			
+			var initzdlyP = {'lineId':Line.id,'destroy':0,'direction':Line.dir};
+			initSelect(initzdlyP);
+		});
+	});
+	// 站点序号值改变事件
+	$('#stationrouteSelect').on('change',function() {
+		var stationRValue = $('#stationrouteSelect').val();
+		if(stationRValue=='请选择...') {
+			$('#stationMarkSelect').val('B');
+		}else {
+			var tempStr = stationRValue.split('_');
+			if(tempStr[1] == 'E') {
+				$('#stationMarkSelect').val('E');
+			}else {
+				$('#stationMarkSelect').val('Z');
+			}
+		}
+	});
+	// 获取表单元素
+	var form = $('#add_station_form');
+	// 获取错误提示信息元素
+	var error = $('.alert-danger', form);
+	//提交
+	$('#addStationButton').on('click', function() {
+		// 表单提交
+		form.submit();
+	});
+	// 表单验证
+	form.validate({
+		errorElement : 'span', 
+		errorClass : 'help-block help-block-error', 
+		focusInvalid : true, 
+		rules : {
+			'stationName' : {required : true,maxlength : 50,},// 站点名称 必填项
+			'stationCod': {required : true,},// 站点编码 必填项 必须输入合法的数字（负数，小数）。
+			'directions' : {required : true,dirIs : true},// 站点方向 必填项 必填项
+			'stationRouteCode' : {isStart : true},// 站点序号
+			'stationMark' : {required : true,},// 站点类型 必填项.
+			'bJwpoints' : {required : true,},// 经纬度坐标点 必填项.
+			'shapesType' : {required : true,},// 几何图形类型 必填项.
+			'radius' : {required : true,},// 几何图形类型 必填项.
+			'destroy' : {required : true,},// 是否撤销 必填项.
+			'toTime' : {number : true},// 到站时间 必须输入合法的数字（负数，小数）。
+			'distances' : {number : true},// 到站距离 必须输入合法的数字（负数，小数）。 
+			'descriptions' : {maxlength: 150}// 描述与说明 // 描述与说明
+	
+		},
+		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 params = form.serializeJSON();
+			error.hide();
+			if(params.shapesType=='圆形')
+				params.shapesType='r';
+			else if(params.shapesType=='多边形')
+				params.shapesType='d';
+			if(params.stationRouteCode=='请选择...')
+				params.stationRouteCode='';
+			// 保存
+			ajaxd.stationCacheSave(params,function(data) {
+				if(data.status=='SUCCESS') {
+					// 弹出添加成功提示消息
+					layer.msg('添加成功...');
+				}else {
+					// 弹出添加失败提示消息
+					layer.msg('添加失败...');
+				}
+				closeMobleSetClean();
+				// 隐藏moble
+				hideMoble();
+			});
+		}
+	});
+	function initSelect(p){
+		ajaxd.getzdlyInfo(p,function(array) {
+			// 定义路段路由长度、渲染拼音检索下拉框格式数据.
+			var len_ = array.length,paramsD = new Array();
+			if(len_>0) {
+				paramsD.push({'id':'请选择...','text':'请选择...'});
+				// 遍历.
+				$.each(array, function(i, g){
+					// 判断.
+					if(g.name!='' || g.name != null) {
+						// 添加拼音检索下拉框格式数据数组.
+						paramsD.push({'id':g.stationRouteCode + '_' + g.stationMark + '_' + g.directions,
+									  'text':g.stationName + ' (' + g.stationRouteCode + ')' + '  --' + fun.dirdmToName(g.directions)});
+					}
+				});
+				$('#stationrouteSelect').empty();
+				// 初始化上一个路段拼音检索下拉框.
+				initPinYinSelect2($('#stationrouteSelect'),paramsD,function(selector) {
+				});
+			}
+		});
+	}
+	function closeMobleSetClean() {
+		// 清除地图覆盖物
+		addMap.clearMarkAndOverlays();
+		// 刷新站点列表
+		$('#station').click();
+	}
+	function hideMoble() {
+		// 隐藏mobal
+		$('#add_station_mobal').modal('hide');
+	}
+	// 当站点类型为中途站或者终点站时,上一站点为必填项！
+	$.validator.addMethod("isStart", function(value,element) {
+		var tel = false;
+		var stationMarkV = $('#stationMarkSelect').val();
+		var stationrouteSelectV = $('#stationrouteSelect').val();
+		if(stationMarkV =='B'){
+			tel = true;
+			return  tel;
+		}else if(stationMarkV =='Z' || stationMarkV =='E'){
+			if(stationrouteSelectV!='' && stationrouteSelectV!='请选择...'  && stationrouteSelectV!=null){
+				tel = true;
+				return  tel;
+			}
+		}
+		return tel; 
+	}, '当站点类型为中途站或者终点站时,上一站点为必填项！');
+	// 方向
+	$.validator.addMethod("dirIs", function(value,element) {
+		var tel = true;
+		var stationMarkV = $('#stationdirSelect').val();
+		if(stationMarkV!=Line.dir){
+			tel = false;
+		}
+		return tel; 
+	}, '方向必须一致!');
+});
+</script>
 \ No newline at end of file
+<!-- 选择站点新增方式 -->
+<div class="modal fade" id="addstation_select_mobal" tabindex="-1" role="basic" aria-hidden="true">
+	<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">站点新增方式
+					<i class="fa fa-question-circle tipso-animation" style="color: rgba(158, 158, 158, 0.49);"></i>
+				</h4>
+			</div>
+			<div class="modal-body">
+				<form class="form-horizontal" action="/" method="post" id="formBootbox" role="form">
+					<div class="alert alert-danger display-hide" id="requiredname">
+						<button class="close" data-close="alert"></button>
+							站点名称为必填项
+					</div>
+					<!-- 站点名称 -->
+					<div class="form-group" id="formRequ">
+						<label class="col-md-3 control-label"><span class="required"> * </span>站点名称：</label>
+						<div class="col-md-9">
+							<input type="text" class="form-control input-medium" id="stationNamebootboxInput" name="stationNamebootbox">
+						</div>
+					</div>
+					<!-- 新增方式 -->
+					<div class="form-group">
+						<label class="col-md-3 control-label">新增方式：</label>
+						<div class="col-md-9">
+							<div class="icheck-list">
+								<label>
+									<input type="radio" class="icheck" name="baseRes" value=0 checked> 系统生成
+								</label>
+								<label >
+									<input type="radio" class="icheck" name="baseRes" value=1 > 手动添加
+								</label>
+							</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="addSelectnextButton">下一步</button>
+			</div>
+		</div>
+	</div>
+</div>
+<script type="text/javascript">
+$('#addstation_select_mobal').on('AddSelectMobal.show', function(e,map_,drw,ajaxd_,editRoute,fun){
+	var stationObj = {};
+	// 加载显示mobal
+	$('#addstation_select_mobal').modal({show : true,backdrop: 'static', keyboard: false});
+	setTimeout(function(){
+		var offsetY =  $('.modal-dialog').offset().top-3 ,
+			offsetX =  $('.modal-dialog').offset().left-10 ;
+		$('.tipso-animation').tipso({
+		      speed           : 100,
+		      background      : '#0ed0e8',
+		      color           : '#ffffff',
+		      position		  :'right',
+		      width           : 390,
+		      delay           : 400,
+		      animationIn	  : 'bounceIn',
+		      animationOut	  : 'bounceOut',
+		      offsetX         : -(offsetX),
+		      offsetY         : -(offsetY),
+		      content	      :'<span style="display:block; float:left;font-size:x-small;line-height:10px">A)系统生成：根据站点名称自动生成以150米为半径范围的圆.</span></br>'+
+				   			    '<span style="display:block; float:left;font-size:x-small">B)手动添加：手动在地图上画出站点范围，然后双击鼠标右键保存.</span>',
+		    
+		});
+		$('.tipso-animation').tipso('show');
+		setTimeout(function(){$('.tipso-animation').tipso('hide');},4000);
+	},500);
+	// 获取表单元素
+	var form = $('#formBootbox');
+	// 错误提示元素
+	var requiredname = $('#requiredname', form);
+	// 下一步点击事件
+	$('#addSelectnextButton').on('click', function() {
+		// 表单提交
+		form.submit();
+	});
+	// 表单验证
+	form.validate({
+		errorElement : 'span', 
+		errorClass : 'help-block help-block-error', 
+		focusInvalid : false, 
+		rules : {
+			'stationNamebootbox' : {required : true,maxlength : 50}// 必填项  最大长度为50
+		},
+		invalidHandler : function(event, validator) {  
+			requiredname.show();
+			App.scrollTo(requiredname, -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) {
+			// 隐藏错误提示
+			requiredname.hide();
+			// 表单序列化
+			var params = form.serializeJSON();
+			var stationName = params.stationNamebootbox;
+			// 获取新增站点方式
+			var baseRes = params.baseRes;
+			/** 设置新增站点对象站点名称属性值 @param：<stationName：站点名称）> */
+			stationObj.stationNamebootbox = stationName;
+			// 系统生成
+			if(baseRes == 0) {
+				/** 根据站点位置获取坐标 @parma：<stationName：站点名称；callback：返回函数> */
+				map_.localSearchFromAdreesToPoint(stationName,function(Points) {
+					if(Points) {
+						/**  设置新增站点集合对象站点中心点百度坐标属性值 @param：<bJwpoints：中心点百度坐标） */
+						stationObj.bJwpoints = Points;
+						/**  设置新增站点集合对象范围图形类型属性值 @param：<shapesType：范围图形类型） */
+						stationObj.shapesType = 'r';
+						/**  设置新增站点集合对象圆形半径属性值 @param：<radius：圆形半径） */
+						stationObj.radius = 100;
+						/**  设置新增站点集合对象图形百度坐标集合属性值 @param：<bPolygonGrid：图形百度坐标集合） */
+						stationObj.bPolygonGrid = '';
+						// 以藏站点新增方式mobal
+						$('#addstation_select_mobal').modal('hide');
+						//　加载add页面
+						$.get('addstation.html', function(m){
+							$(pjaxContainer).append(m);
+							$('#add_station_mobal').trigger('AddStationMobal.show', [map_,ajaxd_,stationObj,editRoute,fun]);
+						});
+					}else {
+						// 返回坐标为空
+						layer.confirm('【系统无法生成，请选择其他方式新增】', {btn : [ '返回' ],icon: 3, title:'提示' }, function(index){
+							layer.close(index);
+						});
+					}
+				});
+			}else if(baseRes==1) {
+				// 关闭按钮事件
+				fun.addAChangeCssAddDisabled();
+				map_.clearMarkAndOverlays();
+				// 以藏站点新增方式mobal
+				$('#addstation_select_mobal').modal('hide');
+				// 打开绘制工具
+				$('.leftUtils').removeClass('hidden');
+				drw.openPointDrawingManager(stationObj,'add');
+				drw.drawingManagerClose();
+				map_.localtionPoint(stationName);
+			}
+		}
+	});
+});
+</script>
 \ No newline at end of file
@@ -12,6 +12,17 @@ html,body{
 	overflow:hidden;
 }
+/* 绘画工具栏 */
+.leftUtils{
+	position: absolute;
+	padding-right: 100px;
+	width: 100%;
+	height: 40px;
+    z-index: 9999;
+    padding-top: 7px;
+    top: 40px;
+}
+
 .caption {
     color: white;
     font-size: 18px;  
@@ -4,7 +4,7 @@
 	<div class="modal-dialog">
-		<div class="modal-content">
+		<div class="modal-content"  >
 			<div class="modal-header">
 				<button type="button" class="close" data-dismiss="modal"
@@ -74,6 +74,7 @@
 			<div class="modal-footer">
 				<button type="button" class="btn default" data-dismiss="modal"
 					id="addMobalHiden">取消</button>
+<!-- 				<button type="button" class="btn btn-primary hidden" id="referenceCurrentVersion">引用当前版本</button> -->
 				<button type="button" class="btn btn-primary" id="templateSaveData">提交数据</button>
 			</div>
 		</div>
@@ -139,7 +140,7 @@ $(&#39;#edit_route_mobal&#39;).on(&#39;editRouteMobal.show&#39;, function(e,transGPS,editRoute,m
 		},
 		submitHandler : function(f) {
-			// 隐藏手动规划弹出层
+			// 隐藏弹出层
 			$('#edit_route_mobal').modal('hide');		
 			// 获取线路对象
 			var line = editRoute.getLineObj();		
@@ -151,6 +152,8 @@ $(&#39;#edit_route_mobal&#39;).on(&#39;editRouteMobal.show&#39;, function(e,transGPS,editRoute,m
 			// 路线方向
 			var directionData = $("input[name='dirCheck']:checked").val();
 			editRoute.setLineDir(directionData);
+			// 设置线路对象生成方式
+			editRoute.setLineGenerationType('uploadGPS');
 			// 弹出正在加载层
 			var i = layer.load(2);
 			// 表单序列化
@@ -256,6 +259,44 @@ $(&#39;#edit_route_mobal&#39;).on(&#39;editRouteMobal.show&#39;, function(e,transGPS,editRoute,m
 		return bdEn;
 	}
+	/** 引用当前版本站点和走向*/
+	/* $("#referenceCurrentVersion").on('click',function() {
+		// 获取线路对象
+		var line = editRoute.getLineObj();	
+		// 路线方向
+		var direction = $("input[name='dirCheck']:checked").val();
+		// 设置线路对象方向
+		editRoute.setLineDir(direction);
+		// 设置线路对象生成方式
+		editRoute.setLineGenerationType('cite');
+		$.post("/station/referenceCurrentVersion",{'lineId' : line.id , 'directions' : direction},function(rd){
+			// 隐藏弹出层
+			$('#edit_route_mobal').modal('hide');	
+			// 关闭弹出层
+			layer.closeAll();
+			if(rd.status='SUCCESS') {				
+				// 清除地图覆盖物
+				map.clearMarkAndOverlays();
+				// 查询路段信息
+				var params = {};
+				params.lineId=line.id;
+				params.dir = direction;
+				// 查询路段信息
+				$get('/sectionroute/findCacheSection',params,function(data) {
+					// 在地图上画出线路走向
+					fun.linePanlThree(line.id,data,direction);
+				});
+				$('#route_show').removeClass('hidden');
+				$('#generationRoute_div').addClass('hidden');
+				// 刷新路段列表
+				$('#section').click();
+				layer.msg('引用当前版本成功！');
+			}else { 
+				layer.msg('引用当前版本失败，请重新引用或选择其他方式！');
+			}
+		}) 
+	}); */
+	
 	function addSave(params,lineid,directionData) {
 		// 保存
 		$post("/station/cacheSave",params,function(rd) {
@@ -276,14 +317,20 @@ $(&#39;#edit_route_mobal&#39;).on(&#39;editRouteMobal.show&#39;, function(e,transGPS,editRoute,m
 				}
 				// 清除地图覆盖物
 				map.clearMarkAndOverlays();
+				var params = {};
+				params.lineId = lineid;
+				params.dir = directionData;
 				// 查询路段信息
-				$get('/sectionroute/findSectionCache',{'line.id_eq' : lineid , 'directions_eq' : directionData},function(data) {
+				$get('/sectionroute/findCacheSection',params,function(data) {
 					// 在地图上画出线路走向
 					fun.linePanlThree(lineid,data,directionData);
 				});
-				$('#upload_show').removeClass('hidden');
-				$('#upload').addClass('hidden');
-				layer.msg('请先编辑路段，并保存！！！');
+				$('#route_show').removeClass('hidden');
+				$('#generationRoute_div').addClass('hidden');
+				// 刷新路段列表
+				$('#section').click();
+				layer.open({title: '友情提示'
+					  ,content: '生成路线成功，生成的线路可能会有误差请先单击走向编辑路段，并保存！'});
 			}else { 
 				layer.msg('生成路线失败！');
 			}
@@ -156,8 +156,8 @@ $(&#39;#edit_section_mobal_cache&#39;).on(&#39;editSectionMobalCache_show&#39;, function(e, map_
 	var dir = Section.sectionrouteDirections;
 	var lineId = Section.sectionrouteLine;
 	// 获取路段号元素，并添加下拉属性值
-	ajaxd.getStation(lineId,dir,function(treeData) {
-		var array = treeData[0].children[1].children,paramsD =new Array();	
+	ajaxd.getSectionCacheList(lineId,dir,function(array) {
+		paramsD =new Array();
 		var eq_scetionRouteCode =  Section.sectionrouteCode;
 		paramsD.push({'id':'请选择...','text':'请选择...'});
 		// 遍历.
@@ -175,7 +175,7 @@ $(&#39;#edit_section_mobal_cache&#39;).on(&#39;editSectionMobalCache_show&#39;, function(e, map_
 		// 初始化上一个路段拼音检索下拉框.
 		initPinYinSelect2($('#sectionrouteCodeSelect'),paramsD,function(selector) {
 			$('#sectionDirSelect').val('');// 设值方向.
-			ajaxd.findUpSectionRouteCode(lineId,dir,eq_scetionRouteCode,function(str) {
+			ajaxd.findCacheUpSectionRouteCode(lineId,dir,eq_scetionRouteCode,function(str) {
 				if(str.length>0){
 					var upStationRouteCode = str[0].sectionrouteCode;
 					$('#sectionrouteCodeSelect').select2('val',upStationRouteCode);
@@ -196,10 +196,11 @@ $(&#39;#edit_section_mobal_cache&#39;).on(&#39;editSectionMobalCache_show&#39;, function(e, map_
 		map_.clearMarkAndOverlays();
 		/** 设置修改路段集合对象为空 */
 		section.setEitdSection({});
-		// fun.editAChangeCssRemoveDisabled();
-		$get('/sectionroute/findSectionCache',{'line.id_eq' : lineId , 'directions_eq' : dir},function(data) {
+		ajaxd.getSectionCacheList(lineId,dir,function(data) {
 			fun.linePanlThree(lineId,data,dir);
 		});	
+		// 刷新路段列表
+		$('#section').click();
 	}
 	// 编辑表单元素
@@ -249,7 +250,7 @@ $(&#39;#edit_section_mobal_cache&#39;).on(&#39;editSectionMobalCache_show&#39;, function(e, map_
 			$post('/section/sectionCacheUpdate',params,function(resuntDate) {
 				if(resuntDate.status=='SUCCESS') {
 					// 弹出添加成功提示消息
-					layer.msg('路段保存成功，将地图放到最大，用右击路段进行截取，确认截取完毕后提交！！！');
+					layer.msg('路段保存成功！');
 				}else {
 					// 弹出添加失败提示消息
 					layer.msg('路段保存失败，请重新编辑路段！！！');
@@ -193,7 +193,7 @@
 </div>
 <script type="text/javascript">
-$('#edit_station_mobal').on('editSelectMobal_show', function(e, map_,station,fun){
+$('#edit_station_mobal').on('editSelectMobal_show', function(e, map_,ajaxd,fun,station){
 	layer.closeAll();
 	fun.setFormValue(station);
 	var initzdlyP = {'lineId':station.stationRouteLine,'destroy':0,'direction':station.stationRouteDirections};
@@ -228,7 +228,7 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,station,fun
 			'zdmc' : { required : true,maxlength : 50,},// 站点名称 必填项
 			'stationName' : { required : true,maxlength : 50,},// 站点名称 必填项
 			'stationCod': {required : true,},// 站点编码 必填项
-			'directions' : {required : true,dirIs : true},// 站点方向 必填项 必填项
+			'directions' : {required : true,dirIs : true},// 站点方向 必填项 必填项 
 			'stationRouteCode' : {isStart : true},// 站点序号
 			'stationMark' : {required : true},// 站点类型 必填项
 			'bJwpoints' : {required : true},// 经纬度坐标点 必填项
@@ -265,8 +265,6 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,station,fun
 				if(resuntDate.status=='SUCCESS') {
 					// 弹出添加成功提示消息
 					layer.msg('修改成功...');
-					/** 通知更新缓存区 */
-					$.post('http://192.168.168.171:8800/transport_server/basic/refresh',function(rs){console.log(rs)})
 				}else {
 					// 弹出添加失败提示消息
 					layer.msg('修改失败...');
@@ -279,7 +277,6 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,station,fun
 	// 站点序号值改变事件
 	$('#stationrouteSelect').on('change',function() {
 		var stationRValue = $('#stationrouteSelect').val();
-		debugger
 		if(stationRValue=='请选择...') {
 			$('#stationMarkSelect').val('B');
 		}else {
@@ -292,7 +289,7 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,station,fun
 		}
 	});
 	function initSelect(p){
-		$get('/stationroute/cacheList',p,function(array) {
+		ajaxd.getzdlyInfo(p,function(array) {
 			// 定义路段路由长度、渲染拼音检索下拉框格式数据.
 			var len_ = array.length,paramsD = new Array();
 			if(len_>0) {
@@ -326,10 +323,14 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,station,fun
 		params.lineId = station.stationRouteLine;
 		params.direction = station.stationRouteDirections;
 		params.stationRouteCode = station.stationRouteStationRouteCode;
-		$get('/stationroute/findCacheUpStationRouteCode',params , function(str) {
-			debugger
+		ajaxd.findCacheUpStationRouteCode(params, function(str) {
 			if(str.length>0){
-				var upStationRouteCode = str[0].stationRouteCode + '_' + str[0].stationRouteMarke  + '_' + station.stationRouteDirections;
+				var upStationRouteCode;
+				if (station.stationRouteStationMark == 'E') {
+					upStationRouteCode = str[0].stationRouteCode + '_' + 'E'  + '_' + station.stationRouteDirections;
+				} else{
+					upStationRouteCode = str[0].stationRouteCode + '_' + str[0].stationRouteMarke  + '_' + station.stationRouteDirections;
+				}
 				$('#stationrouteSelect').select2('val',upStationRouteCode);
 			}else {
 				$('#stationrouteSelect').select2('val','请选择...');
@@ -47,7 +47,7 @@
 	</div>
 </div>
 <script type="text/javascript">
-$('#editstation_select_mobal').on('editStationSelectMobal_show', function(e, map_,drw,stationRoute){
+$('#editstation_select_mobal').on('editStationSelectMobal_show', function(e, map_,fun,drw,stationRoute){
 // 	var sel = fun.getCurrSelNode(dir_);
 // 	var Station = sel[0].original;
 	// 显示选择修改方式弹出层
@@ -112,20 +112,20 @@ $(&#39;#editstation_select_mobal&#39;).on(&#39;editStationSelectMobal_show&#39;, function(e, map
 			var params = form.serializeJSON();
 			// 站点名称
 			stationRoute.zdmc = params.stationNamebootbox;
-			
+			// 关闭按钮事件
+			fun.addAChangeCssAddDisabled();
 			if(params.editselect==0){
-				layer.confirm('重绘站点，会修改站点编码，影响已做好的排班和线路文件。请谨慎使用，谢谢！', {
-					btn: ['绘制','取消'] //按钮
-				}, function(index){
-					// 站点形状
-					stationRoute.stationShapesType = 'd';
-					
-					map_.clearMarkAndOverlays();
-					// 打开绘制工具
-					drw.openPointDrawingManager(stationRoute);
-					map_.localtionPoint(stationRoute.zdmc); 
-					layer.close(index);
-				});	
+				// 站点形状
+				stationRoute.stationShapesType = 'd';
+				
+				map_.clearMarkAndOverlays();
+				// 打开绘制工具
+				drw.openPointDrawingManager(stationRoute,'edit');
+				$('.leftUtils').removeClass('hidden');
+				$('.leftUtils').addClass('active');
+				drw.drawingManagerClose();
+				map_.localtionPoint(stationRoute.zdmc); 
+				layer.close(index);
 			}else if(params.editselect==1){
 				// 弹出添加失败提示消息,2秒关闭（如果不配置，默认是3秒）
 				var mindex = layer.msg('编辑完图形后,请双击图形区域保存',{ offset: '126px',
@@ -40,87 +40,97 @@ var DrawingManagerObj = function () {
 			},
-			openPointDrawingManager : function(objStation) {
+			openPointDrawingManager : function(objStation, type) {
 				// 打开鼠标绘画工具
-				drawingManager.open();
-				
-				// 设置属性
-				drawingManager.setDrawingMode(BMAP_DRAWING_POLYGON);
+				DrawingManagerObj.drawingManagerOpen();
 				// 添加绘画完成事件
 				drawingManager.addEventListener('polygoncomplete', function(e) {
-					
-					drawingManager.close;
+					// 关闭绘画
+					DrawingManagerObj.drawingManagerClose();
+					// 隐藏绘画工具栏
+					$('.leftUtils').addClass('hidden');
 					if (e.getPath().length <= 2) {
-						
 						WorldsBMapLine.clearMarkAndOverlays();
-						openPointDrawingManager();
 						// 弹出提示消息
-						layer.msg('坐标点不能小于等于两个,请重新绘画！');
-						
-						return;
-						 
-					 }else {						 
+						layer.msg('坐标点不能小于三个,请重新操作！');
+					}else {		 
 						// 获取编辑的多边形对象
-						 var edit_pointE = e;
+						 var pointE = e;
-						 var edit_bPloygonGrid = "";
+						 var bPloygonGrid = "";
-						 var editPolyGonLen_ = edit_pointE.getPath().length;
+						 var editPolyGonLen_ = pointE.getPath().length;
 						 for(var k =0;k<editPolyGonLen_;k++) {
 							 if(k==0) {
-								 edit_bPloygonGrid = edit_pointE.getPath()[k].lng + ' ' + edit_pointE.getPath()[k].lat;
+								 bPloygonGrid = pointE.getPath()[k].lng + ' ' + pointE.getPath()[k].lat;
 							 }else {
-								 edit_bPloygonGrid = edit_bPloygonGrid + ',' + edit_pointE.getPath()[k].lng + ' ' + edit_pointE.getPath()[k].lat;
+								 bPloygonGrid = bPloygonGrid + ',' + pointE.getPath()[k].lng + ' ' + pointE.getPath()[k].lat;
 							 }
 						 }
-						 edit_bPloygonGrid  = edit_bPloygonGrid + ',' + edit_pointE.getPath()[0].lng + ' ' + edit_pointE.getPath()[0].lat;
-						 
+						 bPloygonGrid  = bPloygonGrid + ',' + pointE.getPath()[0].lng + ' ' + pointE.getPath()[0].lat;
 						 // 多边形中心点
-						 var centre_points = edit_pointE.getBounds().getCenter().lng + ' ' + edit_pointE.getBounds().getCenter().lat;
-						 
-						 /**  设置修改站点集合对象站点中心点百度坐标属性值 @param：<bJwpoints：中心点百度坐标） */
-						 objStation.stationBJwpoints = centre_points;
-							
-						 /**  设置修改站点集合对象范围图形类型属性值 @param：<shapesType：范围图形类型） */
-						 objStation.stationShapesType = 'd';;
-							
-						 /**  设置修改站点集合对象圆形半径属性值 @param：<radius：圆形半径） */
-						 objStation.stationRadius = '';
-							
-						 /**  设置修改站点集合对象图形百度坐标集合属性值 @param：<bPolygonGrid：图形百度坐标集合） */
-						 objStation.stationBPolygonGrid = edit_bPloygonGrid;
-						 
-						 $.get('editstation.html', function(m){
-							 
-							 $(pjaxContainer).append(m);
-							 
-							 $('#edit_station_mobal').trigger('editSelectMobal_show', [WorldsBMapLine,objStation,PublicFunctions]);
-							 
-						 });
+						 var centre_points = pointE.getBounds().getCenter().lng + ' ' + pointE.getBounds().getCenter().lat;
+						 if(type == 'edit') {
+							 /**  设置修改站点集合对象站点中心点百度坐标属性值 @param：<bJwpoints：中心点百度坐标） */
+							 objStation.stationBJwpoints = centre_points;							 
+							 /**  设置修改站点集合对象范围图形类型属性值 @param：<shapesType：范围图形类型） */
+							 objStation.stationShapesType = 'd';;							 
+							 /**  设置修改站点集合对象圆形半径属性值 @param：<radius：圆形半径） */
+							 objStation.stationRadius = '';							 
+							 /**  设置修改站点集合对象图形百度坐标集合属性值 @param：<bPolygonGrid：图形百度坐标集合） */
+							 objStation.stationBPolygonGrid = bPloygonGrid;							 
+							 $.get('editstation.html', function(m){
+								 
+								 $(pjaxContainer).append(m);
+								 
+								 $('#edit_station_mobal').trigger('editSelectMobal_show', [WorldsBMapLine, MapGetAjaxData, PublicFunctions, objStation]);
+								 
+							 });
+						 } else if(type == 'add') {
+							/**  设置新增站点集合对象站点中心点百度坐标属性值 @param：<bJwpoints：中心点百度坐标） */
+							objStation.bJwpoints = centre_points;
+							/**  设置新增站点集合对象范围图形类型属性值 @param：<shapesType：范围图形类型） */
+							objStation.shapesType = 'd';
+							/**  设置新增站点集合对象圆形半径属性值 @param：<radius：圆形半径） */
+							objStation.radius = '';
+							/**  设置新增站点集合对象图形百度坐标集合属性值 @param：<bPolygonGrid：图形百度坐标集合） */
+							objStation.bPolygonGrid = bPloygonGrid;
+							//　加载add页面
+							$.get('addstation.html', function(m){
+								$(pjaxContainer).append(m);
+								$('#add_station_mobal').trigger('AddStationMobal.show', [WorldsBMapLine, MapGetAjaxData, objStation, EditRoute, PublicFunctions]);
+							});
+						 }
 					 }
-					 
+					// 打开按钮事件
+					PublicFunctions.editAChangeCssRemoveDisabled();
 				});
 			},
-			
-			closeDrawingManager : function() {
-				
+			// 打开绘画工具
+			drawingManagerOpen : function() {
+				// 打开鼠标绘画工具
+				drawingManager.open();
+				// 设置属性
+				drawingManager.setDrawingMode(BMAP_DRAWING_POLYGON);
+			},
+			drawingManagerClose : function() {
 				drawingManager.close();
-			}
+			},
 	}
 	return draMangerObj;
@@ -12,10 +12,23 @@ var EditRoute = function(){
 			setLineId : function(id) {
 				line.id = id;
 			},			
+			getLineId : function() {
+				return line.id;
+			},
 			setLineDir : function(dir) {
 				line.dir = dir;
 			},
+			getLineDir : function() {
+				
+				return line.dir;
+			},
+			setLineGenerationType : function(generationType) {// 生成类型(uploadGPS:上传gps/cite:引用当前版本)
+				line.generationType = generationType;
+			},
+			getLineGenerationType : function() {// 生成类型(uploadGPS:上传gps/cite:引用当前版本)
+				return line.generationType;
+			},
 	};
 	return editRoute;
@@ -246,7 +246,7 @@ $(function(){
 						if(result.status=='SUCCESS') {
 							// 弹出添加成功提示消息
-							layer.msg('添加成功...');
+							layer.msg('添加成功，并已自动为您生成线路原始版本，可以在线路版本信息下查看！', {time: 7000});
 						} else if(result.status=='ERROR') {
+/**
+ * MapGetAjaxData ：ajax异步请求
+ * 
+ * - - - - - -》 getSectionCacheList :获取路段列表
+ * 
+ * - - - - - -》 getzdlyInfo ：获取站点列表
+ * 
+ * - - - - - -》 getLikeStationName ：查询是否有已存在站点名称
+ * 
+ * - - - - - -》 getStationCode：查询站点编码
+ * 
+ * - - - - - -》 findCacheUpStationRouteCode：查询上一个缓存站点的序号
+ * 
+ * - - - - - -》 findCacheUpSectionRouteCode：查询上一个缓存路段的序号
+ * 
+ * - - - - - -》 stationCacheSave：新增缓存站点保存
+ * 
+ * - - - - - -》 stationCacheUpdate：站点缓存更新
+ * 
+ * - - - - - -》 sectionUpdate ： 编辑线路走向保存
+ * 
+ * - - - - - -》 getIdLineName：获取线路名称
+ */
+
+var MapGetAjaxData = function(){
+	 
+	var ajaxData = {
+			// 获取路段列表
+			getSectionCacheList : function(lineId,dir,callback) {
+				$get('/sectionroute/findCacheSection',{'lineId' : lineId , 'dir' : dir},function(resultdata) {
+					callback && callback(resultdata);
+				});
+			},
+			getzdlyInfo : function(params,callback) {
+				$get('/stationroute/cacheList',params,function(array) {
+					callback && callback(array);
+				});
+			},			
+			// 查询是否有已存在站点名称
+			getLikeStationName : function (stationName,callback) {
+				 $get('/station/all', {stationName_eq: stationName}, function(array){
+					 callback && callback(array);
+				 });
+			},			
+			// 查询站点编码
+			getStationCode : function(callback) {
+				$get('/station/getStationCode',null,function(stationCode) {
+					if(stationCode>0) {
+						callback && callback(stationCode);
+					}
+				});
+			},
+			findCacheUpStationRouteCode : function(params,callback) {
+				$get('/stationroute/findCacheUpStationRouteCode',params,function(result) {
+					callback && callback(result);
+				});
+			},			
+			findCacheUpSectionRouteCode : function(lineId,dir,sectionRouteCode,callback) {
+				$get('/sectionroute/findCacheUpSectionRouteCode',{'lineId' : lineId , 'direction' : dir, 'sectionRouteCode':sectionRouteCode},function(result) {
+					callback && callback(result);
+				});
+			},
+			// 新增缓存站点保存
+			stationCacheSave : function(station,callback) {
+				$post('/station/stationCacheSave',station,function(data) {
+					debugger
+					callback && callback(data);
+				});
+			},
+			// 缓存站点更新
+			stationCacheUpdate : function(station,callback) {
+				$post('/station/stationCacheUpdate',station,function(data) {
+					callback && callback(data);
+				});
+			},			
+			// 获取线路名称
+			getIdLineName : function (id,callback) {
+				
+				$get('/line/' + id ,null, function(result){
+					
+					callback && callback(result);
+					
+				});
+				
+			},
+	}	
+	return ajaxData;	
+}();
 \ No newline at end of file
@@ -3,7 +3,7 @@ var PublicFunctions = function () {
 			/** 初始化线路标题与ID */
 			setTiteText : function(lineId) {
 				// 根据线路ID获取线路名称
-				GetAjaxData.getIdLineName(lineId,function(data) {
+				MapGetAjaxData.getIdLineName(lineId,function(data) {
 					// 定义线路名称
 					var lineNameV = data.name;
 					$('.portlet-title .caption').text(lineNameV);
@@ -40,7 +40,7 @@ var PublicFunctions = function () {
 				// 版本号
 				$('#versionsInput').val(Section.versions);
 				// 是否撤销
-				$('#destroySelect').val(Section.destroy);
+				$('#destroySelect').val(0);
 				// 描述/说明
 				$('#descriptionsTextarea').val(Section.descriptions);
 			},
@@ -113,7 +113,6 @@ var PublicFunctions = function () {
 			  				/** 在地图上画点 @param：<point_center：中心坐标点> */
 			  				WorldsBMapLine.drawingUpStationPoint(point_center,stationName,s+1);
 			  			}
-			  			
 			  		}
 					// 路段数据长度
 					var dataLen = data.length;
@@ -44,6 +44,22 @@ var WorldsBMapLine = function () {
 				//启用键盘上下左右键移动地图
 				mapBValue.enableKeyboard();
+				var transit = new BMap.DrivingRoute(mapBValue, {
+					renderOptions: {
+						map: mapBValue,
+						panel: "r-result",
+						enableDragging : true //起终点可进行拖拽
+					},opts:{
+						onSearchComplete  (){
+							
+						}
+					}
+				});
+				transit.search("唐镇","唐陆路");
+				var a = transit.getResults();
+				debugger
+				var b = mapBValue.onSearchComplete();
+				
 				return mapBValue;
 			},
 			/** 获取第一个切路段的点  @return Point*/
@@ -206,7 +222,50 @@ var WorldsBMapLine = function () {
 				})();
 			},
-			// 在地图上画出上行线路走向
+			drawingSection: function(data){
+				/** 获取站点路由信息 @param:<Line.id：线路Id；0：上行> @return：<resultdata：站点路由数据> */
+				WorldsBMapLine.clearMarkAndOverlays();
+				// 编辑路段数据
+				if(data) {
+					// 地图折线坐标点集合
+					var polylineArray = [];
+					// 获取路段折线坐标字符串
+					var sectionBsectionVectorStr = data.sectionBsectionVector;
+					if(sectionBsectionVectorStr==null) {
+						return;
+					}
+					// 切割段折线坐标字符串
+					var tempStr = sectionBsectionVectorStr.substring(11,sectionBsectionVectorStr.length-1);
+					// 分割折线坐标字符串
+					var lineArray = tempStr.split(',');
+					for(var i = 0;i<lineArray.length;i++) {
+						polylineArray.push(new BMap.Point(lineArray[i].split(' ')[0],lineArray[i].split(' ')[1]));
+					}
+					var index = parseInt(polylineArray.length/2);
+					var center = polylineArray[index];
+					/** 在地图上画出线路走向 @param：<polylineArray：地图折线坐标点集合；resultdata：站点路由数据> */
+					WorldsBMapLine.drawingUpline(polylineArray,center);
+					/** 在地图上画点 @param：<point_center：中心坐标点> */
+					WorldsBMapLine.drawingUpStationPoint(center,data.sectionName,1);
+				}
+			},
+			// 在地图上画出上行线路走向（单路段）
+			drawingUpline : function (polylineArray,polyline_center,data) {
+				/*WorldsBMap.clearMarkAndOverlays();*/
+				polyUpline = '';
+				// 创建线路走向
+				polyUpline = new BMap.Polyline(polylineArray, {strokeColor : "blue",strokeWeight : 6,strokeOpacity : 0.5});
+				// polyUpline.data = data;
+				// 把折线添加到地图上
+				mapBValue.addOverlay(polyUpline);
+		  		var PanOptions_ ={noAnimation :true};
+		  		mapBValue.reset();
+		  		mapBValue.panTo(polyline_center,PanOptions_);
+		  		mapBValue.panBy(500,-510,PanOptions_);
+		  		mapBValue.setZoom(14);
+			},
+			
+			// 在地图上画出上行线路走向（多路段）
 			drawingUpline01 : function (polylineArray,polyline_center,data) {
 				var polyUpline01 = 'polyline' + '_' + data.sectionrouteId;
 				// 创建线路走向
@@ -252,7 +311,7 @@ var WorldsBMapLine = function () {
 					// 加载修改路段弹出层mobal页面
 					$.get('editsection.html', function(m){
 						$(pjaxContainer).append(m);
-						$('#edit_section_mobal_cache').trigger('editSectionMobalCache_show', [WorldsBMapLine,GetAjaxData,EditSectionObj,PublicFunctions]);
+						$('#edit_section_mobal_cache').trigger('editSectionMobalCache_show', [WorldsBMapLine,MapGetAjaxData,EditSectionObj,PublicFunctions]);
 					});
 					// 打开按钮事件
 					PublicFunctions.editAChangeCssRemoveDisabled();
@@ -300,9 +359,12 @@ var WorldsBMapLine = function () {
 					}
 					WorldsBMapLine.setIsCutSection(true);
 				}
-				var markerMenu=new BMap.ContextMenu();
-				markerMenu.addItem(new BMap.MenuItem('切路段',editSection.bind(polyUpline01)));
-				polyUpline01.addContextMenu(markerMenu);
+				// 路段生成类型位gps上传时才开启右击事件
+				if(EditRoute.getLineGenerationType() == 'uploadGPS') {
+					var markerMenu=new BMap.ContextMenu();
+					markerMenu.addItem(new BMap.MenuItem('切路段',editSection.bind(polyUpline01)));
+					polyUpline01.addContextMenu(markerMenu);
+				}
 		  		var PanOptions_ ={noAnimation :true};
@@ -387,7 +449,7 @@ var WorldsBMapLine = function () {
 		  		mapBValue.addOverlay(marker);
 			},
-			// 根据站点坐标匹配库中的公交站点（手动规划）
+			// 根据站点坐标匹配库中的公交站点
 			stationsPointsToLibraryPoint : function(arra,callback) {
 				// 获取长度
 				var len = arra.length;
@@ -710,9 +772,6 @@ var WorldsBMapLine = function () {
 			  	  		mapBValue.panTo(point,PanOptions_);
 			  	  		mapBValue.panBy(10,-200,PanOptions_);
-			  	  		
-			  	  		// 关闭按钮事件
-						PublicFunctions.addAChangeCssAddDisabled();
 						// 编辑圆监听事件
 						circle.addEventListener('dblclick',function() {
@@ -740,7 +799,7 @@ var WorldsBMapLine = function () {
 								$(pjaxContainer).append(m);
-								$('#edit_station_mobal').trigger('editSelectMobal_show', [WorldsBMapLine,objStation,PublicFunctions]);
+								$('#edit_station_mobal').trigger('editSelectMobal_show', [WorldsBMapLine,MapGetAjaxData,PublicFunctions,objStation]);
 							}); 
@@ -748,7 +807,7 @@ var WorldsBMapLine = function () {
 							PublicFunctions.editAChangeCssRemoveDisabled();
 						});
-					// 编辑多变行
+					// 编辑多边行
 					}else if(stationShapesType =='d') {
 						// 清除地图覆盖物
@@ -808,9 +867,6 @@ var WorldsBMapLine = function () {
 			  	  		// 将地图在水平位置上移动x像素，垂直位置上移动y像素。
 			  	  		mapBValue.panBy(10,-150,PanOptions_);
-			  	  		
-			  	  		// 关闭按钮事件(图形编辑中)
-						PublicFunctions.addAChangeCssAddDisabled();
 						// 添加多变行编辑事件
 						polygon.addEventListener('dblclick',function(e) {
@@ -857,14 +913,14 @@ var WorldsBMapLine = function () {
 								 $(pjaxContainer).append(m);
-								 $('#edit_station_mobal').trigger('editSelectMobal_show', [WorldsBMapLine,objStation,PublicFunctions]);
+								 $('#edit_station_mobal').trigger('editSelectMobal_show', [WorldsBMapLine,MapGetAjaxData,PublicFunctions,objStation]);
 							 });
+							 // 打开按钮事件
+							 PublicFunctions.editAChangeCssRemoveDisabled();
 						});
-						// 打开按钮事件
-						PublicFunctions.editAChangeCssRemoveDisabled();
 					}
 				}
 			},
@@ -244,7 +244,7 @@
 					闵行公司
 				{{/if}}
 			</td>
-<td>
+			<td>
 				{{if obj.company == '55'}}
 					{{if obj.brancheCompany == '1'}}
@@ -295,6 +295,8 @@
 						南汇维修公司
 					{{else if obj.brancheCompany == '5'}}
 						南汇公司
+					{{else if obj.brancheCompany == '6'}}
+						航头枢纽站
 					{{/if}}
 				{{/if}}
@@ -3,44 +3,75 @@
 <div class="portlet-body">
 	<!-- 地图 -->
 	<div id="bmap_basic" class="bmaps"></div>
+	<!-- 绘画工具栏 -->
+	<div class="leftUtils hidden">
+		<div class="btn-group" style="left: 100px;">
+		    <a class="btn btn-sm green-seagreen dropdown-toggle" style="width: 98px;" href="javascript:;" data-toggle="dropdown" aria-expanded="false"> 绘制工具
+		        <i class="fa fa-angle-down"></i>
+		    </a>
+		    <ul class="dropdown-menu pull-right" style="min-width:100px">
+		        <li>
+		            <a href="javascript:;" id="oppenDrawingManager"><i class="fa fa-pencil"></i> 打开 </a>
+		        </li>
+		        <li>
+		            <a href="javascript:;" id = "closeDrawingManager"> <i class="fa fa-reply"></i> 关闭 </a>
+		        </li>
+		    </ul>
+		</div>
+	</div>
 	<!-- 右边显示栏 -->
 	<div class="cut-section" id="scrllmouseEvent_div">
 		<div class="portlet-title">
 			<div class="caption">途径站点</div>
 		</div>
 		<div class="portlet-body">
-			<div class="table-toolbar" style="text-align: center;" id="upload">
-				<button class="btn btn-circle blue" id="uploadRoute">
+			<div class="table-toolbar" style="text-align: center;" id="generationRoute_div">
+				<button class="btn btn-circle blue" id="generationRoute">
 					<i class="fa fa-plus"></i> 生成路线
 				</button>
 			</div>
-			<div class="portlet-body hidden" id="upload_show">
+			<!-- 生成走向跳转的div -->
+			<div class="portlet-body hidden" id="route_show">
 				<div>
 					<ul class="nav nav-pills nav-justified steps">
 						<li class="active">
 							<a id="section"><span>路段</span></a>
 						</li>
 						<li>
-							<a id="station"><span>站点</span></a>
+							<a class="station" id="station"><span>站点</span></a>
 						</li>
 					</ul>
 				</div>
 				<div id="section_list_div" class="active" style="margin: 5px;">
-					<div class="defeat-scroll"
-						style="height: 400px; overflow-y: auto; ">
-						<table class="table table-bordered table-hover table-checkable "
-							id="section_table" style="color: white;">
-							<thead>
-								<tr role="row" class="heading">
-									<th>截取路段的名称</th>
-								</tr>
-							</thead>
-							<tbody></tbody>
-						</table>
+				<!-- 上传gps生成路段div -->
+					<div id="gpsSection">
+						<div class="defeat-scroll"
+							style="height: 400px; overflow-y: auto; ">
+							<table class="table table-bordered table-hover table-checkable "
+								id="section_table" style="color: white;">
+								<thead>
+									<tr role="row" class="heading">
+										<th>截取路段的名称</th>
+									</tr>
+								</thead>
+								<tbody></tbody>
+							</table>
+						</div>
+						<div class="table-toolbar">
+							<a class="btn btn-circle blue" id="Undo">撤销切点</a>
+							<a class="btn btn-circle blue" id="cutSection">提交选项</a>
+						</div>
 					</div>
-					<div class="table-toolbar">
-						<a class="btn btn-circle blue" id="Undo">撤销切点</a>
-						<a class="btn btn-circle blue" id="cutSection">提交选项</a>
+					<!-- 引用当前版本路段div -->
+					<div id="citeSection">
+						<div class="defeat-scroll"
+							style="height: 400px; overflow-y: auto; ">
+						</div>
+						<div class="table-toolbar">
+							<a class="btn btn-circle blue" id="findSection">查看路段</a>
+							<a class="btn btn-circle blue" id="addSection">添加路段</a>
+							<a class="btn btn-circle blue" id="submitOptions">提交选项</a>
+						</div>
 					</div>
 				</div>
 				<div id="station_list_div" class="hidden">
@@ -48,6 +79,7 @@
 						style="height: 400px; overflow-y: auto; ">
 					</div>
 					<div class="table-toolbar">
+						<a class="btn btn-circle blue" id="addStation">添加站点</a>
 						<a class="btn btn-circle blue" id="findStation">查看站点</a>
 						<a class="btn btn-circle blue" id="updateStation">修改站点</a>
 					</div>			
@@ -81,6 +113,8 @@ $(function(){
 	var direction = 0;
 	// 站点Map
 	var stationRouteMap = new Map();
+	// 路段Map
+	var sectionRouteMap = new Map();
 	// 如果线路ID不为空
 	if(id) {
 		var styleOptions = {
@@ -102,7 +136,7 @@ $(function(){
 			var map_ = WorldsBMapLine.init();
 			/** 初始化绘图工具类 @param：<map_：map对象；styleOptions：绘图样式对象> @return:DrawingManager对象 */
-// 			DrawingManagerObj.init(map_,styleOptions);
+			DrawingManagerObj.init(map_,styleOptions);
 			layer.msg('请生成路线！！！');
@@ -123,12 +157,12 @@ $(function(){
 	}
 	// 上传GPS坐标生成路线事件
-	$('#uploadRoute').on('click', function() {
+	$('#generationRoute').on('click', function() {
 		EditRoute.setLineId(id);
-		EditRoute.setLineDir(direction);
+// 		EditRoute.setLineDir(direction);
 		$.get('editRoute.html', function(m){
 			$(pjaxContainer).append(m);
-			$('#edit_route_mobal').trigger('editRouteMobal.show',[TransGPS,EditRoute,WorldsBMapLine,DrawingManagerObj,GetAjaxData,PublicFunctions]);
+			$('#edit_route_mobal').trigger('editRouteMobal.show',[TransGPS,EditRoute,WorldsBMapLine,DrawingManagerObj,MapGetAjaxData,PublicFunctions]);
 		});
 		// 更新section_table 和缓存中的切点
 		WorldsBMapLine.initCutSectionPoint();
@@ -144,10 +178,30 @@ $(function(){
 			var section = EditSectionObj.getEitdSection();
 			var josnSectionList = JSON.stringify(sectionList);
 			section.cutSectionList = josnSectionList;
-			$.get('submit_select.html', function(m){
-				$(pjaxContainer).append(m);
-				$('#submit_select_mobal').trigger('submitSelectMobal.show',[section,EditRoute]);
+			// 版本号
+			$.get('/lineVersions/findCurrentVersion',{'lineId':id},function(versions){
+				section.versions = versions;
+				debugger
+				layer.confirm('提交马上会把原有的站点和路段覆盖，您确定要提交吗？', {
+					btn: ['提交','取消'] //按钮
+				}, function(index){
+					layer.close(index);
+					$.post('/section/sectionCut', section, function(resuntDate){
+						if(resuntDate.status=='SUCCESS') {
+							// 弹出添加成功提示消息
+							layer.msg('提交成功，跳转到线路详情页面！');
+							window.location.href = "/pages/base/stationroute/list.html?no="+section.sectionrouteLine+","+section.sectionrouteDirections;
+						}else {
+							// 弹出添加失败提示消息
+							layer.msg('提交失败...');
+						}
+					});
+				});	
 			});
+// 			$.get('submit_select.html', function(m){
+// 				$(pjaxContainer).append(m);
+// 				$('#submit_select_mobal').trigger('submitSelectMobal.show',[section,EditRoute]);
+// 			});
 		} else {
 			layer.msg("请先截取路段！！！");
 		}
@@ -179,7 +233,47 @@ $(function(){
 		} else {
 			layer.msg("没有截取路段，不可以撤销！！！");
 		}
-	});	
+	});
+	
+	// 监听右侧悬浮框导航栏事件
+	$('#section').on('click',function(){
+		$('#station').parent().removeClass('active');
+		$('#section').parent().addClass('active');
+		$('#station_list_div').removeClass('active');
+		$('#station_list_div').addClass('hidden');
+		$('#section_list_div').removeClass('hidden');
+		$('#section_list_div').addClass('active');
+		var generationType = EditRoute.getLineGenerationType();
+		// 更具生成类型展示不同页面
+		if(generationType == 'cite'){
+			$('#gpsSection').addClass('hidden');
+			
+		} else if(generationType == 'uploadGPS') {
+			$('#citeSection').addClass('hidden');
+		}
+		// 清除地图覆盖物
+		WorldsBMapLine.clearMarkAndOverlays();
+		var params = {};
+		var line = EditRoute.getLineObj();
+		params.lineId=line.id;
+		params.dir = line.dir;
+		// 查询路段信息
+		$get('/sectionroute/findCacheSection',params,function(data) {
+			var section_radio_html = '<div id="section_radio">';
+			var cont = 1;
+			var check = 'checked="checked"';
+			$.each(data,function(){
+				sectionRouteMap[this.sectionrouteId] = this;
+				section_radio_html += '<div class="radio"><label class="radio_label section"><input name="sectionRadio" type="radio" class="radioclass" value="'+this.sectionrouteId+'" '+(cont==1?check:"")+' />'+this.sectionName+"</label></div>";
+				cont++;
+			});
+			section_radio_html +=  '</div>';
+			$("#section_list_div #citeSection .defeat-scroll").html(section_radio_html);
+			// 在地图上画出线路走向
+			PublicFunctions.linePanlThree(line.id,data,line.dir);
+		});
+	});
+	
 	// 监听右侧悬浮框导航栏事件
 	$('#station').on('click',function(){
 		$('#section').parent().removeClass('active');
@@ -196,12 +290,12 @@ $(function(){
 		params.lineId=line.id;
 		params.dir = line.dir;
 		$.get('/stationroute/findCachePoint',params,function(data){
-			var station_radio_html = '<div id="station_radio" >';
+			var station_radio_html = '<div id="station_radio">';
 			var cont = 1;
 			var check = 'checked="checked"';
 			$.each(data,function(){
 				stationRouteMap[this.stationRouteId] = this;
-				station_radio_html += '<div class="radio" ><label class="radio_label on"><input name="stationRadio" type="radio" class="radioclass" value="'+this.stationRouteId+'" '+(cont==1?check:"")+' />'+this.stationRouteStationName+"</label></div>";
+				station_radio_html += '<div class="radio"><label class="radio_label station"><input name="stationRadio" type="radio" class="radioclass" value="'+this.stationRouteId+'" '+(cont==1?check:"")+' />'+this.stationRouteStationName+"</label></div>";
 				cont++;
 			});
 			station_radio_html +=  '</div>';
@@ -209,33 +303,61 @@ $(function(){
 		});
 	});
+	// 查询路段
+	$('#findSection').on('click', function(){
+		var id = $(".section input[type='radio']:checked").val();
+		var sectionRoute = sectionRouteMap[id];
+		if(id && sectionRoute){
+			WorldsBMapLine.drawingSection(sectionRoute);
+		} else if(id && !sectionRoute){
+			layer.msg('您选择的路段不存在，请重新选择！');
+		}else{
+			layer.msg('请先选择要查看的路段！');
+		}		
+	});
+	
+	// 添加站点
+	$('#addStation').on('click', function(){
+		$.get('addstation_select.html', function(m){
+			$(pjaxContainer).append(m);
+			$('#addstation_select_mobal').trigger('AddSelectMobal.show', [WorldsBMapLine, DrawingManagerObj, MapGetAjaxData, EditRoute, PublicFunctions]);
+		});
+	});
+	
+	// 查询站点
 	$('#findStation').on('click', function(){
-		var id = $("input[type='radio']:checked").val();
+		var id = $(".station input[type='radio']:checked").val();
 		var stationRoute = stationRouteMap[id];
-		// 站点形状
-		var shapesType = stationRoute.stationShapesType;
-		// 如果是圆
-		if(shapesType =='r') {
-			
-			// 百度地图画圆
-			WorldsBMapLine.pointsCircle(stationRoute);
-		
-		// 如果是多变行
-		}else if(shapesType == 'd') {
-			
-			// 百度地图画多边形
-			WorldsBMapLine.pointsPolygon(stationRoute);
-		}
+		if(id && stationRoute){
+			// 站点形状
+			var shapesType = stationRoute.stationShapesType;
+			// 如果是圆
+			if(shapesType =='r') {
+				
+				// 百度地图画圆
+				WorldsBMapLine.pointsCircle(stationRoute);
+			// 如果是多变行
+			}else if(shapesType == 'd') {
+				
+				// 百度地图画多边形
+				WorldsBMapLine.pointsPolygon(stationRoute);
+			}
+		} else if(id && !stationRoute){
+			layer.msg('您选择的站点不存在，请重新选择！');
+		}else{
+			layer.msg('请先选择要查看的站点！');
+		}		
 	});
+	
+	// 修改站点
 	$('#updateStation').on('click', function(){
-		var id = $("input[type='radio']:checked").val();
+		var id = $(".station input[type='radio']:checked").val();
 		var stationRoute = stationRouteMap[id];
-		
 		if(id && stationRoute){
 			$.get('editstation_select.html', function(m){
 				$(pjaxContainer).append(m);
-				$('#editstation_select_mobal').trigger('editStationSelectMobal_show', [WorldsBMapLine, DrawingManagerObj, stationRoute]);
+				$('#editstation_select_mobal').trigger('editStationSelectMobal_show', [WorldsBMapLine, PublicFunctions, DrawingManagerObj, stationRoute]);
 			});
 		} else if(id && !stationRoute){
 			layer.msg('您选择的站点不存在，请重新选择！');
@@ -243,25 +365,16 @@ $(function(){
 			layer.msg('请先选择要编辑的站点！');
 		}
 	});
-	$('#section').on('click',function(){
-		$('#station').parent().removeClass('active');
-		$('#section').parent().addClass('active');
-		$('#section_list_div').removeClass('hidden');
-		$('#section_list_div').addClass('active');
-		$('#station_list_div').removeClass('active');
-		$('#station_list_div').addClass('hidden');
-		// 清除地图覆盖物
-		WorldsBMapLine.clearMarkAndOverlays();
-		
-		var line = EditRoute.getLineObj();
-		lineid=line.id;
-		directions = line.dir;
-		// 查询路段信息
-		$get('/sectionroute/findSectionCache',{'line.id_eq' : lineid , 'directions_eq' : directions},function(data) {
-			// 在地图上画出线路走向
-			PublicFunctions.linePanlThree(lineid,data,directions);
-		});
+	
+	// 监听打开鼠标绘制工具按钮事件.
+	$('#oppenDrawingManager').on('click',function() {
+		DrawingManagerObj.drawingManagerOpen();
+	});
+	// 监听关闭鼠标绘制工具按钮事件.
+	$('#closeDrawingManager').on('click',function() {
+		DrawingManagerObj.drawingManagerClose();
 	});
+	
 	// 滚动轴监听事件
 	$('#scrllmouseEvent_div').on('mousemove',function() {
 		$('.defeat-scroll').css('overflow','auto');
@@ -277,10 +390,12 @@ $(function(){
 <!-- 地图类 -->
 <script src="/pages/base/line/js/map.js"></script>
 <!-- 函数与方法 -->
-<script src="/pages/base/line/js/line-map-function.js"></script>
+<script src="/pages/base/line/js/map-function.js"></script>
 <!-- 修改路段对象类 -->
 <script src="/pages/base/stationroute/js/editsection.js"></script>
 <!-- 绘图类 -->
 <script src="/pages/base/line/js/drawingManager.js"></script>
 <!-- ajax请求类 -->
-<script src="/pages/base/stationroute/js/stationroute-ajax-getdata.js"></script>
 \ No newline at end of file
+<!-- <script src="/pages/base/stationroute/js/stationroute-ajax-getdata.js"></script> -->
+<!-- ajax请求类 -->
+<script src="/pages/base/line/js/map-ajax-getdata.js"></script>
 \ No newline at end of file
@@ -44,6 +44,7 @@
 			<div class="form-body">
 				<input type="hidden" name="lineId" id="lineIdInput" />
 				<input type="hidden" name="lineCode" id="lineCodeInput" />
+				<input type="hidden" name="lineCode" id="statusInput" />
                  <!-- 表单分组组件 form-group START -->
 				<div class="form-group">
@@ -100,7 +101,7 @@
                  </div>
                  <!-- 表单分组组件 form-group END -->
-                 <div class="form-group">
+                <!--  <div class="form-group">
 						<label class="control-label col-md-5"> 
 							<span class="required"> * </span>线路版本状态&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
 						</label>
@@ -112,7 +113,7 @@
 								<option value="0">历史版本</option>
 							</select>
 						</div>
-	              </div>
+	              </div> -->
                  <!-- 表单分组组件 form-group START -->
                  <div class="form-group">
@@ -44,6 +44,7 @@
 			<div class="form-body">
 				<input type="hidden" name="lineId" id="lineIdInput" />
 				<input type="hidden" name="lineCode" id="lineCodeInput" />
+				<input type="hidden" name="lineCode" id="statusInput" />
 				<!-- 表单分组组件 form-group START -->
 				<div class="form-group">
@@ -100,7 +101,7 @@
                  </div>
                  <!-- 表单分组组件 form-group END -->
-                 <div class="form-group">
+                <!--  <div class="form-group">
 						<label class="control-label col-md-5"> 
 							<span class="required"> * </span>线路版本状态&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
 						</label>
@@ -112,7 +113,7 @@
 								<option value="0">历史版本</option>
 							</select>
 						</div>
-	              </div>
+	              </div> -->
                  <!-- 表单分组组件 form-group START -->
                  <div class="form-group">
@@ -37,13 +37,14 @@
 		});
 	}
-	// 填充公司下拉框选择值
+	// 填充线路下拉框选择值
 	function lineAllInfo(){
 		getComp(function(params) {
 			$get('/line/all', params, function(array){
 				// get请求获取公司
 				$get('/business/all', {upCode_eq: '88'}, function(compD){
 					var len_ = array.length,paramsD = new Array();
+					paramsD.push({'id':'请选择...','text':'请选择...'});
 					if(len_>0) {
 						$.each(array, function(i, g){
 							if(g.name!='' || g.name != null) {
@@ -54,7 +55,7 @@
 						if($('span').hasClass('select2-selection'))
 							$('span .select2-selection').remove();
 						initPinYinSelect2($('#lineSelect'),paramsD,function(selector) {
-							selector.select2("val", splitxlName(window.localStorage.xlName_AgursData));
+							selector.select2("val", "请选择...");
 						});
 					}
 				});
@@ -65,16 +66,30 @@
 	// 监听线路名称下拉框值改变事件.
 	$('#lineSelect').on("change", function (e) { 
 		var lineSelectValue = $('#lineSelect').val();// 获取线路名称值.
-		if(lineSelectValue=='' || lineSelectValue==null) {
+		if(lineSelectValue=='' || lineSelectValue==null || lineSelectValue=="请选择...") {
 			$('#lineCodeInput').val('');// 设值线路编码.
 			$('#lineIdInput').val('');// 设值线路ID.
 		}else {
 			var lineSelectValueArray = lineSelectValue.split('_');// 切割线路名称值.
-			$.get('/lineVersions/findLineVersionsMax',{'lineId':lineSelectValueArray[1]}, function(lineVersionsMax){
-				$('#versionsInput').val(++lineVersionsMax.versions);// 设值线路编码.
-			});
-			$('#lineIdInput').val(lineSelectValueArray[0]);// 设值线路编码.
-			$('#lineCodeInput').val(lineSelectValueArray[1]);// 设值线路ID.
+			$.get('/lineVersions/findByLineId',{'lineId':lineSelectValueArray[1]}, function(array){
+				var type = true;
+				$.each(array, function(){
+					if(this.status == 2) {
+						type = false; 
+						return;
+					}
+				});
+				if(type) {
+					$.get('/lineVersions/findLineVersionsMax',{'lineId':lineSelectValueArray[1]}, function(lineVersionsMax){
+						$('#versionsInput').val(++lineVersionsMax.versions);// 设值线路编码.
+					});
+					$('#lineIdInput').val(lineSelectValueArray[0]);// 设值线路编码.
+					$('#lineCodeInput').val(lineSelectValueArray[1]);// 设值线路ID.
+				} else {
+					swal("每条线路只能有一个待更新版本，你选择的线路已有待更新版本，版本多了忙不过来，快去选择其他线路吧！");
+					$('#lineSelect').select2("val", "请选择...");
+				}
+			}); 
 		}
 	});
@@ -118,7 +133,7 @@
 			'startDate' : {required : true},// 启用时间 不为空.
 			'endDate' : {required : true},// 结束时间.
 			'versions' : {required : true, digits : true, maxlength: 10},// 版本号  必填项、数字、最大长度10.
-			'status' : {required : true, digits : true, maxlength: 10},// 版本状态 必填项、数字、最大长度10.
+//			'status' : {required : true, digits : true, maxlength: 10},// 版本状态 必填项、数字、最大长度10.
 		},
 		/**
@@ -37,7 +37,7 @@
 		});
 	}
-	// 填充公司下拉框选择值
+	// 填充线路下拉框选择值
 	function lineAllInfo(){
 		getComp(function(params) {
 			$get('/line/all', params, function(array){
@@ -4,7 +4,7 @@
  * @Description : TOOD(线路信息list.html页面js)
  */
-(function(){
+
 	// 关闭左侧栏
 	if (!$('body').hasClass('page-sidebar-closed')) {$('.menu-toggler.sidebar-toggler').click();}
 	// 定义 page : 当前页；initPag ； icheckOptions:选择框
@@ -269,6 +269,7 @@
 		return rsStr;
 	}
+	
 	/**  搜索按钮事件 */
 	$('tr.filter .filter-submit').on('click',function(){
 		var params =  getParams();
@@ -280,5 +281,54 @@
 		/** 表格数据分页加载 @param：<params：搜索参数；true：是否重新分页> */
 		loadTableDate(params,true);
 	});
-	
-})();
 \ No newline at end of file
+	 
+
+function updateVersionsRoute(obj){
+	var lineId = obj.dataset.lineid;
+	swal({
+		title: "操作须知",
+		text: "每周会更新数据，请在本周内做完线路走向并发布，不然您做的走向有可能会被覆盖！",
+		type: "warning",
+		showCancelButton: true,
+		confirmButtonColor: "#DD6B55",
+		confirmButtonText: "知道了！",
+		cancelButtonText: "不懂！",
+		closeOnConfirm: false },
+		function(isConfirm){
+			if(isConfirm){
+				var win1 = window.open("http://114.80.178.12:29088/login2.html","线路信息编辑","false");
+				setTimeout(function(){
+					window.open("http://114.80.178.12:29088/pages/base/stationroute/list.html?no="+lineId,"线路信息编辑","false");
+				},1500);
+				swal.close();
+			}
+		});
+}
+
+function issueBnt(id){
+	swal({
+		title: "发布说明",
+		text: "重复发布会覆盖已有的数据，请确认线路信息正确后发布，发布后需要几分钟后才能再次发布！",
+		type: "warning",
+		showCancelButton: true,
+		confirmButtonColor: "#DD6B55",
+		confirmButtonText: "确定发布！",
+		cancelButtonText: "取消发布！",
+		closeOnConfirm: false },
+		function(){
+			$.post('/lineVersions/issueVersion',{'id':id},function(result){
+				if(result.status=='SUCCESS') {
+					// 弹出添加成功提示消息
+					swal("发布！", "线路站点及走向已发布至历史库，待到版本启用时间自动更新。", "success"); 
+				} else if(result.status=='ERROR') {
+					// 弹出添加失败提示消息
+					swal("发布失败！", "您发布的信息可能有误，请检查！", "ERROR"); 
+				}
+//				loadPage('list.html');
+				// 发布后刷新页面
+				var pData = getParams();
+		    	pData['line.name_like'] = splitxlName(pData['line.name_like']);
+		    	loadTableDate(pData, false);
+			});
+		});
+}
 \ No newline at end of file
@@ -26,7 +26,7 @@
 				</div>
 				<div class="actions">
 					<div class="btn-group btn-group-devided" data-toggle="buttons">
-						<a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加线路版本</a>
+						<a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加待更新版本</a>
 					</div>
 				</div>
 			</div>
@@ -37,9 +37,9 @@
 							<tr role="row" class="heading">
 								<th width="4%">序号</th>
 								<th width="5%">线路编码</th>
-								<th width="8%">线路名称</th>
-								<th width="8%">所属公司</th>
-								<th width="9%">所属分公司</th>
+								<th width="6%">线路名称</th>
+								<th width="6%">所属公司</th>
+								<th width="6%">所属分公司</th>
 								<th width="8%">启用时间</th>
 								<th width="8%">终止时间</th>
 								<th width="6%">版本号</th>
@@ -181,6 +181,8 @@
 						南汇维修公司
 					{{else if obj.line.brancheCompany == '5'}}
 						南汇公司
+					{{else if obj.brancheCompany == '6'}}
+						航头枢纽站
 					{{/if}}
 				{{/if}}
@@ -208,6 +210,14 @@
 			</td>
 			<td>
 				<a href="edit.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 修改 </a>
+				{{if obj.status == '2'}}
+					<a class="btn default blue-stripe btn-sm" data-lineid="{{obj.line.id}}" onclick="updateVersionsRoute(this)" data-pjax> 编辑版本路线 </a>
+				{{/if}}
+				{{if obj.status == '2' && obj.isupdate!=1}}
+					<a class="btn btn-danger btn-sm" onclick = "issueBnt({{obj.id}})" data-pjax>发布</a>
+				{{else if obj.status == '2' && obj.isupdate==1}}
+					<a class="btn btn-danger btn-sm disabled">数据同步中</a>
+				{{/if}}
 			</td>
 		</tr>
 	{{/each}}
@@ -52,7 +52,7 @@
           						<span class="required"> * </span> 站点路由名称:
                     		</label>
 							<div class="col-md-6">
-								<input type="text" class="form-control" name="stationName" id="stationNameInput" placeholder="站点路由名称"> 
+								<input type="text" class="form-control" name="stationRouteName" id="stationRouteNameInput" placeholder="站点路由名称"> 
 							</div>
 						</div>
 					</div>
@@ -246,7 +246,7 @@ $(&#39;#editPoitsions_station_mobal&#39;).on(&#39;editStationMobal_show&#39;, function(e, map,fu
 		errorClass : 'help-block help-block-error', 
 		focusInvalid : false, 
 		rules : {
-			'stationName' : {required : true},// 站点路由名称 必填项
+			'stationRouteName' : {required : true},// 站点路由名称 必填项
 			'stationCod': {required : true,},// 站点编码 必填项
 			'directions' : {required : true,dirIs : true},// 站点方向 必填项 必填项
 			'stationRouteCode' : {isStart : true},// 站点序号
@@ -140,7 +140,7 @@ var StationPVmapWorlds = function() {
 				});
 			},
 			// 打开绘画工具
-			drawingManagerOpen : function(map) {
+			drawingManagerOpen : function() {
 				// 打开鼠标绘画工具
 				drawingManager.open();
 				// 设置属性
@@ -26,7 +26,7 @@ var PositionsPublicFunctions = function () {
 						// 中心坐标点
 						var point = new BMap.Point(BJwpoints[0], BJwpoints[1]);
 						var htm = 	'<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
-									'<span style="color:#DDD;font-size: 15px;">站点名称：' + r[0].stationName + '</span>' + 
+									'<span style="color:#DDD;font-size: 15px;">站点名称：' + r[0].zdmc + '</span>' + 
 									'<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + r[0].stationCode + '</span>' +
 									'<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + r[0].stationRouteCode + '</span>' +
 									'<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' +
@@ -47,7 +47,7 @@ var PositionsPublicFunctions = function () {
 									// 信息窗位置偏移值。
 									offset: new BMap.Size(500,80),
 									//标题
-									title : '<h4 style="color:#FFFFFF">'+r[0].stationName+'站详情</h4>',
+									title : '<h4 style="color:#FFFFFF">'+r[0].zdmc+'站详情</h4>',
 									//设置不允许信窗发送短息
 									enableMessage : false,
 									//是否开启点击地图关闭信息窗口
@@ -123,7 +123,7 @@ var PositionsPublicFunctions = function () {
 				// 获取站点名称元素设值
 				$('#zdmcInput').val(stationObj.zdmc);
 				// 获取站点名称元素设值
-				$('#stationNameInput').val(stationObj.stationName);
+				$('#stationRouteNameInput').val(stationObj.stationRouteName);
 				// 获取站点编码元素设值
 				$('#stationCodInput').val(stationObj.stationCode);
 				// 获取站点类型元素设值
@@ -183,7 +183,7 @@ var PositionsPublicFunctions = function () {
 				// 站点名称
 				$('#zdmcInput').val(stationObj.zdmc);
 				// 站点路由线路名称
-				$('#stationNameInput').val(stationObj.stationName);
+				$('#stationRouteNameInput').val(stationObj.stationRouteName);
 				// 获取站点类型元素设值
 				$('#stationMarkSelect').val(stationObj.stationRouteStationMark);
 				// 获取站点方向元素设值
@@ -136,11 +136,11 @@ var StationPositionsWorldsBMap = function () {
 							$('#editPoitsions_station_mobal').trigger('editStationMobal_show', [StationPositionsWorldsBMap,PositionsPublicFunctions,PositionsStationObj]);
 						}); 
 					});
-				// 编辑多变行
+				// 编辑多边行
 				}else if(stationShapesTypeV =='d') {
 					// 开启编辑功能(自 1.1 新增)
 					polygon.enableEditing();
-					// 添加多变行编辑事件
+					// 添加多边行编辑事件
 					polygon.addEventListener('dblclick',function(e) {
 						 // 获取编辑的多边形对象
 						 var edit_pointE = polygon;
@@ -278,7 +278,5 @@
 	<!-- 表单组件 END -->
 </div>
 <!-- 信息容器组件 END -->
-
-<script src="/pages/base/station/js/positionstation.js"></script>
 <script src="/pages/base/station/js/station-positions-function.js"></script>
 <script src="/pages/base/station/js/station-list-edit.js"></script>
 \ No newline at end of file
@@ -197,7 +197,6 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,ajaxd,stati
 	layer.closeAll();
  	var editStationParmasObj = station_.getEitdStation();
 	var addLine = Line_.getLineObj();
-	debugger
 	fun.setFormValue(editStationParmasObj);
 	var initzdlyP = {'lineCode_eq':editStationParmasObj.stationRouteLineCode,'destroy_eq':0,'directions_eq':editStationParmasObj.stationRouteDirections};
 	initSelect(initzdlyP);
@@ -336,8 +335,12 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,ajaxd,stati
 	function setZdlyValue() {
 		ajaxd.findUpStationRouteCode(editStationParmasObj.stationRouteLine,editStationParmasObj.stationRouteDirections,editStationParmasObj.stationRouteStationRouteCode,function(str) {
 			if(str.length>0){
-				/* var upStationRouteCode = str[0].stationRouteCode + '_' + str[0].stationRouteMarke  + '_' + editStationParmasObj.stationRouteDirections; */
-				var upStationRouteCode = str[0].stationRouteCode + '_' + editStationParmasObj.stationRouteStationMark  + '_' + editStationParmasObj.stationRouteDirections;
+				var upStationRouteCode;
+				if (editStationParmasObj.stationRouteStationMark == 'E') {
+					upStationRouteCode = str[0].stationRouteCode + '_' + 'E'  + '_' + editStationParmasObj.stationRouteDirections;
+				} else{
+					upStationRouteCode = str[0].stationRouteCode + '_' + str[0].stationRouteMarke  + '_' + editStationParmasObj.stationRouteDirections;
+				}
 				$('#stationrouteSelect').select2('val',upStationRouteCode);
 			}else {
 				$('#stationrouteSelect').select2('val','请选择...');
@@ -130,7 +130,7 @@ var GetAjaxData = function(){
 			},
-			// 查询路段信息
+			// 查询站点信息
 			getStationRouteInfo : function(lineId,direction,callback) {
 				$get('/stationroute/all',{'line.id_eq' : lineId , 'directions_eq' : direction},function(resultdata) {
 					callback && callback(resultdata);
@@ -83,10 +83,10 @@ $(function(){
     		$post('/stationroute/updSwitchDir?lineIds='+ Line.id,null,function(data) {
     			layer.close(index);
     			if(data.status=='SUCCESS') {
-    				// 弹出添加成功提示消息
+    				// 弹出操作成功提示消息
     				layer.msg('操作成功...');
     			}else {
-    				// 弹出添加失败提示消息
+    				// 弹出操作失败提示消息
     				layer.msg('操作成功...');
     			}
     			 WorldsBMap.clearMarkAndOverlays();
@@ -148,10 +148,10 @@ $(function(){
 		$post('/sectionroute/quoteSection',params,function(data) {
 			layer.close(index);
 			if(data.status=='SUCCESS') {
-				// 弹出添加成功提示消息
+				// 弹出操作成功提示消息
 				layer.msg('操作成功...');
 			}else {
-				// 弹出添加失败提示消息
+				// 弹出操作失败提示消息
 				layer.msg('操作成功...');
 			}
 			WorldsBMap.clearMarkAndOverlays();
@@ -254,10 +254,10 @@ $(function(){
 		var params = {lineId:lineIdEvents.id};
 		GetAjaxData.createUsingSingle(params,function(data) {
 			if(data.status=='SUCCESS') {
-				// 弹出添加成功提示消息
+				// 弹出生成成功提示消息
 				layer.msg('生成成功...');
 			}else {
-				// 弹出添加失败提示消息
+				// 弹出生成失败提示消息
 				layer.msg('生成失败...');
 			}
 		});
@@ -244,32 +244,41 @@ var PublicFunctions = function () {
 							params.shapesType = 'r';
 							// destroy：是否撤销
 							params.destroy = '0';
-							// versions：版本号
-							params.versions = '1';
+							
 							// 路段信息JSON字符串
 							params.sectionJSON = sectionJSON;
 							// 限速
 							params.speedLimit = '60';
 							params.baseRes = 'No';
-							// 保存
-							GetAjaxData.collectionSave(params,function(rd) {
-								if(rd.status='SUCCESS') {
-									// 关闭弹出层
-									layer.closeAll();
-									layer.msg('保存成功！');
-								}else {
-									// 保存失败
-									layer.msg('保存失败！');
-								}
-								// 刷新树
-								PublicFunctions.resjtreeDate(addLine.id,directionData);
-								/** 查询上行路段信息 @param:<Line.id：线路Id；0：上行> @return：data：路段数据 */
-								GetAjaxData.getSectionRouteInfo(addLine.id,directionData,function(data) {
-									/** 在地图上画出线路走向  @param:<Line.id：线路Id；0：上行；data：路段数据> */ 
-									PublicFunctions.linePanlThree(addLine.id,data,directionData);
-								});
+							// 获取版本号后提交添加
+							$.get('/lineVersions/findByLineId',{'lineId':addLine.id},function(lineVersions){
+								$.each(lineVersions,function(){
+									if (this.status == 1) {
+										// versions：版本号
+										params.versions = this.versions;
+										// 保存
+										GetAjaxData.collectionSave(params,function(rd) {
+											if(rd.status='SUCCESS') {
+												// 关闭弹出层
+												layer.closeAll();
+												layer.msg('保存成功！');
+											}else {
+												// 保存失败
+												layer.msg('保存失败！');
+											}
+											// 刷新树
+											PublicFunctions.resjtreeDate(addLine.id,directionData);
+											/** 查询上行路段信息 @param:<Line.id：线路Id；0：上行> @return：data：路段数据 */
+											GetAjaxData.getSectionRouteInfo(addLine.id,directionData,function(data) {
+												/** 在地图上画出线路走向  @param:<Line.id：线路Id；0：上行；data：路段数据> */ 
+												PublicFunctions.linePanlThree(addLine.id,data,directionData);
+											});
+										});
+									}
+								})
 							});
+							
 						});
 					}
 				});
@@ -13,7 +13,7 @@
 			</div>
 		</div>
 		<!-- 左边栏 -->
-		<div class="portlet-body" id="scrllmouseEvent"  style="border: 1px solid rgb(255, 255, 255); display: block;min-height: 380px;">
+		<div class="portlet-body" id="scrllmouseEvent"  style="border: 1px solid rgb(255, 255, 255); display: block;min-height: 420px;">
 			<div class="row">
 				<!-- 上下行栏 -->
 				<div class="col-md-3 col-sm-3 col-xs-3">