基础信息功能修订

李强
1 parent e706c519
Showing 21 changed files with 254 additions and 759 deletions
src/main/java/com/bsth/controller/BusinessController.java
src/main/java/com/bsth/controller/SectionController.java
src/main/java/com/bsth/controller/SectionRouteController.java
src/main/java/com/bsth/controller/StationController.java
src/main/java/com/bsth/controller/StationRouteController.java
src/main/java/com/bsth/entity/Business.java
src/main/java/com/bsth/entity/LineInformation.java
src/main/java/com/bsth/entity/SectionRoute.java
src/main/java/com/bsth/repository/BusinessRepository.java
src/main/java/com/bsth/repository/SectionRepository.java
src/main/java/com/bsth/repository/SectionRouteRepository.java
src/main/java/com/bsth/repository/StationRepository.java
src/main/java/com/bsth/service/BusinessService.java
src/main/java/com/bsth/service/StationRouteService.java
src/main/java/com/bsth/service/impl/BusinessServiceImpl.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
src/main/java/com/bsth/util/GetUIDAndCode.java
 package com.bsth.controller;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import com.bsth.entity.Business;
+import com.bsth.service.BusinessService;
+import com.bsth.util.GetUIDAndCode;
 /**
  * 
@@ -23,5 +27,11 @@ import com.bsth.entity.Business;
 @RestController
 @RequestMapping("business")
 public class BusinessController extends BaseController<Business, Integer> {
-
+	@Autowired
+	private BusinessService businessService;
+	
+	@RequestMapping(value = "getCompCode", method = RequestMethod.GET)
+	public long getLineCode() {
+		return businessService.getCompCode();
+	}
 }
@@ -48,13 +48,9 @@ public class SectionController extends BaseController&lt;Section, Integer&gt; {
 	 */
 	@RequestMapping(value="sectionSave" , method = RequestMethod.POST)
 	public Map<String, Object> sectionSave(@RequestParam Map<String, Object> map) {
-		
 		map.put("createBy", "");
-		
 		map.put("updateBy", "");
-		
 		return service.sectionSave(map);
-		
 	}
 	/**
@@ -57,7 +57,6 @@ public class SectionRouteController extends BaseController&lt;SectionRoute, Integer
 	 */
 	@RequestMapping(value = "/findSectionRouteInfoFormId",method = RequestMethod.GET)
 	public List<Map<String, Object>> findSectionRouteInfoFormId(@RequestParam Map<String, Object> map) {
-		
 		return routeService.findSectionRouteInfoFormId(map);
 	}
@@ -60,16 +60,12 @@ public class StationController extends BaseController&lt;Station, Integer&gt; {
 	 */
 	@RequestMapping(value="collectionSave" , method = RequestMethod.POST)
 	public Map<String, Object> collectionSave(@RequestParam Map<String, Object> map) {
-		
 		return service.systemSaveStations(map);
-		
 	}
 	@RequestMapping(value="manualSave" , method = RequestMethod.POST)
 	public Map<String, Object> manualSave(@RequestParam Map<String, Object> map) {
-		
 		return service.manualSave(map);
-		
 	}
 	/**
@@ -89,13 +85,9 @@ public class StationController extends BaseController&lt;Station, Integer&gt; {
 	 */
 	@RequestMapping(value="stationSave" , method = RequestMethod.POST)
 	public Map<String, Object> stationSave(@RequestParam Map<String, Object> map) {
-		
 		map.put("createBy", "");
-		
 		map.put("updateBy", "");
-		
 		return service.stationSaveMap(map);
-		
 	}
 	/**
@@ -36,6 +36,17 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
     @Autowired
     StationRouteRepository stationRouteRepository;
+    /**
+     * @param @param map
+     * @throws
+     * @Title: list
+     * @Description: TODO(多条件查询)
+     */
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    public Iterable<StationRoute> list(@RequestParam Map<String, Object> map) {
+        return service.list(map);
+    }
+    
 	/**
 	 * @Description :TODO(查询树站点与路段数据)
 	 * 
 package com.bsth.entity;
+import java.util.Date;
+
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
@@ -40,6 +43,29 @@ public class Business {
 	// 描述
 	private String descriptions;
+	
+	// 创建日期
+	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+	private Date createDate;
+			
+	// 修改日期
+	@Column(name = "update_date", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+	private Date updateDate;
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+
+	public Date getUpdateDate() {
+		return updateDate;
+	}
+
+	public void setUpdateDate(Date updateDate) {
+		this.updateDate = updateDate;
+	}
 	public Integer getId() {
 		return id;
@@ -64,6 +64,12 @@ public class LineInformation {
 	// 晚高峰结束时间 00:00
 	private String lateEndTime;
+	// 小夜高峰开始时间 00:00
+	private String xygfkssj;
+
+	// 小夜高峰结束时间 00:00
+	private String xygfjssj;
+	
 	// 早高峰上行行驶时间
 	private Double earlyUpTime;
@@ -91,15 +97,6 @@ public class LineInformation {
 	// 停车场
 	private String carPark;
-	// 进场时间
-	private Double  paradeTime;
-	
-	// 出场时间
-	private Double outTime;
-	
-	// 进场里程
-	private Double paradeMileage;
-	
 	// 上行进场时间
 	private Double upInTimer; 
@@ -123,7 +120,82 @@ public class LineInformation {
 	// 下行出场里程
 	private Double downOutMileage;
+
+	// 早高峰大间隔（分钟）老调度系统字段,暂时保留
+	private Double earlyIntervalLg;
+
+	// 晚高峰大间隔（分钟）老调度系统字段,暂时保留
+	private Double lateIntervalLg;
+
+	// 平时大间隔（分钟）老调度系统字段,暂时保留
+	private Double intervalLg;
+
+	// 限速（平时）老调度系统字段,暂时保留
+	private Double speedLimit;
+	
+	// 限速（雨天）老调度系统字段,暂时保留
+	private Double rainLimit;
+	
+	// 限速（大雾）老调度系统字段,暂时保留
+	private Double fogLimit;
+	// 限速（冰雪）老调度系统字段,暂时保留
+	private Double snowLimit;
+	
+	// 限速（节庆）老调度系统字段,暂时保留
+	private Double festivalSpeedLimit;
+	
+	// 滞站
+	private Integer lagStation;
+	
+	// 越站
+	private Integer skip;
+	
+	// 超速
+	private Integer speeding;
+	
+	// 串线
+	private Integer  crossedLine;
+	
+	// 越界
+	private Integer overflights;
+	
+	// 描述
+	private String descriptions;
+	
+	// 创建人
+	private Integer createBy;
+			
+	// 修改人
+	private Integer updateBy;
+	
+	// 创建日期
+	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+	private Date createDate;
+	
+	// 修改日期
+	@Column(name = "update_date", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+	private Date updateDate;
+
+	@ManyToOne
+	private Line line;
+	
+	public String getXygfkssj() {
+		return xygfkssj;
+	}
+
+	public void setXygfkssj(String xygfkssj) {
+		this.xygfkssj = xygfkssj;
+	}
+
+	public String getXygfjssj() {
+		return xygfjssj;
+	}
+
+	public void setXygfjssj(String xygfjssj) {
+		this.xygfjssj = xygfjssj;
+	}
+
 	public Double getUpInTimer() {
 		return upInTimer;
 	}
@@ -188,68 +260,6 @@ public class LineInformation {
 		this.downOutMileage = downOutMileage;
 	}
-	// 出场里程
-	private Double outMileage;
-
-	// 早高峰大间隔（分钟）
-	private Double earlyIntervalLg;
-
-	// 晚高峰大间隔（分钟）
-	private Double lateIntervalLg;
-
-	// 平时大间隔（分钟）
-	private Double intervalLg;
-
-	// 限速（平时）
-	private Double speedLimit;
-	
-	// 限速（雨天）
-	private Double rainLimit;
-	
-	// 限速（大雾）
-	private Double fogLimit;
-	
-	// 限速（冰雪）
-	private Double snowLimit;
-	
-	// 限速（节庆）
-	private Double festivalSpeedLimit;
-	
-	// 滞站
-	private Integer lagStation;
-	
-	// 越站
-	private Integer skip;
-	
-	// 超速
-	private Integer speeding;
-	
-	// 串线
-	private Integer  crossedLine;
-	
-	// 越界
-	private Integer overflights;
-	
-	// 描述
-	private String descriptions;
-	
-	// 创建人
-	private Integer createBy;
-			
-	// 修改人
-	private Integer updateBy;
-	
-	// 创建日期
-	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-	private Date createDate;
-	
-	// 修改日期
-	@Column(name = "update_date", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-	private Date updateDate;
-
-	@ManyToOne
-	private Line line;
-	
 	public Integer getId() {
 		return id;
 	}
@@ -416,39 +426,6 @@ public class LineInformation {
 	public void setCarPark(String carPark) {
 		this.carPark = carPark;
 	}
-
-	public Double getParadeTime() {
-		return paradeTime;
-	}
-
-	public void setParadeTime(Double paradeTime) {
-		this.paradeTime = paradeTime;
-	}
-
-	public Double getOutTime() {
-		return outTime;
-	}
-
-	public void setOutTime(Double outTime) {
-		this.outTime = outTime;
-	}
-
-	public Double getParadeMileage() {
-		return paradeMileage;
-	}
-
-	public void setParadeMileage(Double paradeMileage) {
-		this.paradeMileage = paradeMileage;
-	}
-
-	public Double getOutMileage() {
-		return outMileage;
-	}
-
-	public void setOutMileage(Double outMileage) {
-		this.outMileage = outMileage;
-	}
-
 	public Double getEarlyIntervalLg() {
 		return earlyIntervalLg;
 	}
@@ -52,7 +52,7 @@ public class SectionRoute {
 	// 是否撤销
 	private Integer destroy;
-	/** 是否有路段限速数据  <0：未分段；1：分段>*/
+	/** 是否有路段限速数据  <0：分段；1：未分段>*/
 	private Integer isRoadeSpeed;
 	// 描述
 package com.bsth.repository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import com.bsth.entity.Business;
@@ -28,5 +29,7 @@ public interface BusinessRepository extends BaseRepository&lt;Business, Integer&gt; {
     List<Business> findByBusinessCode(String code);
     List<Business> findByUpCodeAndBusinessCode(String c1, String c2);
-
+    
+    @Query(value = "SELECT IFNULL(num,0) as maxId from (SELECT MAX(id) as num FROM bsth_c_business) k" , nativeQuery=true)
+	long getMaxId();
 }
@@ -72,7 +72,6 @@ public interface SectionRepository extends BaseRepository&lt;Section, Integer&gt; {
 						   String descriptions, int versions,int id);
-	
 	/**
 	 * @Description :TODO(编辑线路走向)
 	 * 
@@ -121,7 +121,7 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 			"b.create_date AS sectionCreateDate," +
 			"b.update_by AS sectionUpdateBy," +
 			"b.update_date AS sectionUpdateDate," +
-			"b.versions AS sectionVersion FROM (" +
+			"b.versions AS sectionVersion , a.isRoadeSpeed  FROM (" +
 			" SELECT s.id AS sectionRouteId," +
 			"s.line_code AS sectionRouteLineCode," +
 			"s.sectionroute_code AS sectionRouteCode," +
@@ -134,7 +134,7 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 			"s.update_by AS sectionRouteUpdateBy," +
 			"s.update_date AS sectionRouteUpdateDate," +
 			"s.versions AS sectionRouteVersions," +
-			"s.destroy AS sectionRouteDestroy" +
+			"s.destroy AS sectionRouteDestroy,  s.is_roade_speed AS isRoadeSpeed " +
 			" FROM  bsth_c_sectionroute s where s.id =?1) a " +
 			" LEFT JOIN bsth_c_section b on a.sectionRouteSection = b.id", nativeQuery=true)
 	List<Object[]> findSectionRouteInfoFormId(int id);
@@ -171,6 +171,10 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 	@Query(value="UPDATE bsth_c_sectionroute set is_roade_speed = ?1  where line= ?2 and directions=?3 ",nativeQuery = true)
 	void isRoadSpeedUpd(Integer isR,Integer line,Integer directions);
+	@Modifying
+	@Query(value="UPDATE bsth_c_sectionroute set sectionroute_code = (sectionroute_code+10) where line = ?1  and directions = ?2 and sectionroute_code >=?3 and destroy = 0", nativeQuery=true)
+	public void sectionUpdSectionRouteCode(Integer line,Integer dir,Integer routeCod);
+	
     @Modifying
     @Query(value="update bsth_c_sectionroute set directions = case directions when 1 then 0 when 0 then 1 end where line_code = ?1   ", nativeQuery=true)
 	public void sectionRouteDir(Integer line);
@@ -37,7 +37,7 @@ public interface StationRepository extends BaseRepository&lt;Station, Integer&gt; {
 			, nativeQuery=true)
 	long stationMaxId();
-	@Query(value = "SELECT * FROM bsth_c_station s where s.station_name = ?1"
+	@Query(value = "SELECT s.b_jwpoints,s.id FROM bsth_c_station s where s.station_name like  ?1"
 			, nativeQuery=true)
 	List<Object[]> findStationName(String stationName);
@@ -18,5 +18,5 @@ import com.bsth.entity.Business;
  * 
  */
 public interface BusinessService extends BaseService<Business, Integer> {
-
+	long getCompCode();
 }
@@ -23,6 +23,14 @@ import com.bsth.entity.StationRoute;
 public interface StationRouteService extends BaseService<StationRoute, Integer> {
 	/**
+	 * 
+	 * @Title: list 
+	 * @Description: TODO(多条件查询) 
+	 * @throws
+	 */
+	Iterable<StationRoute> list(Map<String, Object> map);
+	
+	/**
 	 * @Description :TODO(查询树站点与路段数据)
 	 * 
 	 * @param map <line.id_eq:线路ID； directions_eq：方向>
 package com.bsth.service.impl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.bsth.entity.Business;
+import com.bsth.repository.BusinessRepository;
 import com.bsth.service.BusinessService;
 /**
@@ -23,5 +25,12 @@ import com.bsth.service.BusinessService;
 @Service
 public class BusinessServiceImpl extends BaseServiceImpl<Business, Integer> implements BusinessService{
+	@Autowired
+	private BusinessRepository businessRepository;
+	@Override
+	public long getCompCode() {
+		// TODO Auto-generated method stub
+		return businessRepository.getMaxId();
+	}
 }
@@ -16,6 +16,7 @@ import com.bsth.repository.LineRepository;
 import com.bsth.repository.SectionRepository;
 import com.bsth.repository.SectionRouteRepository;
 import com.bsth.service.SectionRouteService;
+import com.bsth.util.GetUIDAndCode;
 /**
  * 
@@ -185,6 +186,7 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 	    		tempM.put("sectionVersion", objects.get(i)[33]);
+	    		tempM.put("isRoadeSpeed", objects.get(i)[34]);
 	    		resultList.add(tempM);
 	    	}
@@ -203,32 +205,19 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 	 */
 	@Override
 	public List<Map<String, Object>> findUpSectionRouteCode(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 = repository.findUpSectionRouteCode(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>();
-				
 				System.out.println(reslutList.get(i));
-				
 				tempM.put("sectionrouteCode", reslutList.get(i));
-				
 				list.add(tempM);
-				
 			}
 		}
-		
 		return list;
 	}
@@ -243,8 +232,10 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 				List<Object[]> list = repository.getSectionRoute(line, dir);
 				int src = repository.sectionRouteCodeMaxId();
 				for(int i = 0 ; i<list.size() ; i++) {
-					int sectionId =  Integer.parseInt(String.valueOf(repository2.sectionMaxId())) + 1 ;
-					String sectionCode =  String.valueOf(sectionId);
+					/*int sectionId =  Integer.parseInt(String.valueOf(repository2.sectionMaxId())) + 1 ;*/
+					long sectionMaxId =  GetUIDAndCode.getSectionId();
+					String sectionCode =  String.valueOf(sectionMaxId);
+					int sectionId = (int)sectionMaxId;
 					String sectionName = list.get(i)[9] == null ? null : list.get(i)[9].toString(); 
 					String crosesRoad = list.get(i)[10] == null ? null : list.get(i)[10].toString(); 
 					String endNode = list.get(i)[11] == null ? null : list.get(i)[11].toString(); 
@@ -267,12 +258,12 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 							gsectionVector, bsectionVector, 
 							sectionType, csectionVector, roadCoding, 
 							sectionDistance, sectionTime, dbType, speedLimit, descriptions, versions, sectionId);
-					int sectionRouteId = Integer.parseInt(String.valueOf(repository.sectionRouteMaxId())) + 1 ;
+					// int sectionRouteId = Integer.parseInt(String.valueOf(repository.sectionRouteMaxId())) + 1 ;
 					SectionRoute sr = new SectionRoute();
 					Line lineObject = lineRepository.findOne(line);
 					Section section = repository2.findOne(sectionId);
 					Integer xh = (src ==  0 ? (toDir ==1? (list.size()-i)*10 : (list.size()+i)*10) : toDir==1? (src + (list.size()-i)*10) : (src + (list.size()+i)*10)) ;
-					sr.setId(sectionRouteId);
+					// sr.setId(sectionRouteId);
 					sr.setSectionrouteCode(xh);
 					sr.setLineCode(lineObject.getLineCode());
 					sr.setSectionCode(sectionCode);
@@ -294,5 +285,4 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 		}
 		return resultMap;
 	}
-	
-}
+}
 \ No newline at end of file
@@ -7,6 +7,7 @@ import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.common.ResponseCode;
@@ -57,210 +58,122 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 	 */
 	@Override
 	public Map<String, Object> sectionUpdate(Map<String, Object> map) {
-		
 		Map<String, Object> resultMap = new HashMap<String, Object>();
-		
 		try {
-			
 			String bsectionVector = map.get("bsectionVector").equals("") ? "" :map.get("bsectionVector").toString();
-			
 			// 原始线状图形坐标集合
 			String sectionsBpoints = "";
-			
 			// WGS线状图形坐标集合
 			String sectionsWJPpoints = "";
-			
 			if(!bsectionVector.equals("")) {
-				
 				// 转换成JSON数组
 				JSONArray sectionsArray = JSONArray.parseArray(bsectionVector);
-				
 				// 遍历
 				for(int s = 0 ;s<sectionsArray.size();s++) {
-					
 					String pointsLngStr = sectionsArray.getJSONObject(s).get("lng").toString();
-					
 					String pointsLatStr = sectionsArray.getJSONObject(s).get("lat").toString();
-					
 					/** to WGS坐标 */
 					Location resultPoint = FromBDPointToWGSPoint(pointsLngStr,pointsLatStr);
-					
 					String WGSLngStr = String.valueOf(resultPoint.getLng());
-					
 					String WGSLatStr = String.valueOf(resultPoint.getLat());
-					
 					if(s==0) {
-						
 						sectionsBpoints = pointsLngStr + " " + pointsLatStr;
-						
 						sectionsWJPpoints = WGSLngStr + " " + WGSLatStr;
-						
 					}else {
-						
 						sectionsBpoints = sectionsBpoints + "," +  pointsLngStr + " " + pointsLatStr;
-						
 						sectionsWJPpoints = sectionsWJPpoints + ","  +   WGSLngStr + " " + WGSLatStr;
-						
 					}
-					
-					
 				}
-				
 			}
-			
 			// 原坐标类型
 			String dbType = map.get("dbType").equals("") ? "" : map.get("dbType").toString();
-			
 			// 说明
 			String descriptions = map.get("descriptions").equals("") ? "" : map.get("descriptions").toString();
-			
 			// 是否撤销
 			Integer destroy = map.get("destroy").equals("") ? null : Integer.parseInt(map.get("destroy").toString());
-			
 			// 方向
 			Integer directions = map.get("directions").equals("") ? null : Integer.parseInt(map.get("directions").toString());
-			
 			// 线路ID
 			Integer sectionRouteLine = map.get("sectionRouteLine").equals("") ? null : Integer.parseInt(map.get("sectionRouteLine").toString());
-			
 			// 道路编码
 			String roadCoding = map.get("roadCoding").equals("") ? "" : map.get("roadCoding").toString();
-			
 			// 路段编码
 			String sectionCode = map.get("sectionCode").equals("") ? "" : map.get("sectionCode").toString();
-			
 			// 路段长度
 			Double sectionDistance = map.get("sectionDistance").equals("") ? null : Double.valueOf(map.get("sectionDistance").toString());
-			
 			// 路段ID
 			Integer sectionId = map.get("sectionId").equals("") ? 0 : Integer.parseInt(map.get("sectionId").toString());
-			
 			// 路段名称
 			String sectionName = map.get("sectionName").equals("") ? "" : map.get("sectionName").toString();
-			
 			// 路段路由Id
 			Integer sectionRouteId = map.get("sectionRouteId").equals("") ? null : Integer.valueOf(map.get("sectionRouteId").toString());
-			
 			// 线路编码
 			String lineCode =map.get("lineCode").equals("") ? "" : map.get("lineCode").toString();
-			
 			// 路段时长
 			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());
-			
 			SectionRoute resultS = routeRepository.findOne(sectionRouteId);
-			
 			int old_code = resultS.getSectionrouteCode();
-			
 			if(sectionrouteCode!=null) {
-				
 				int new_code = sectionrouteCode+100;
-				
 				if(new_code==old_code){
-					
 					sectionrouteCode = new_code;
-					
 				}else {
-					
 					sectionrouteCode = new_code-100+1;
-					
 				}
-				
 			 }else {
-				 
 				 sectionrouteCode = old_code;
-				 
 			 }
-			
 			// 限速
 			Double speedLimit = map.get("speedLimit").equals("") ? null : Double.valueOf(map.get("speedLimit").toString());
-			
 			// 版本
 			Integer version = map.get("versions").equals("") ? null : Integer.valueOf(map.get("versions").toString());
-			
 			// WGS坐标点集合
 			String gsectionVector = null;
 			if(!sectionsWJPpoints.equals(""))
 				gsectionVector = "LINESTRING(" + sectionsWJPpoints +")";
-			
 			// 原坐标点集合
 			String bsectionVectorS = null;
 			if(!sectionsBpoints.equals(""))
 				 bsectionVectorS = "LINESTRING(" + sectionsBpoints + ")";
-			
 			Integer createBy = map.get("createBy").equals("") ? null : Integer.valueOf(map.get("createBy").toString());
-			
 			String createDate = map.get("createDate").equals("") ? null : map.get("createDate").toString();
-			
 			Integer updateBy = map.get("updateBy").equals("") ?null : Integer.valueOf(map.get("updateBy").toString());
-			
+			Integer isRoadeSpeed = map.get("isRoadeSpeed").equals("") ? null : Integer.valueOf(map.get("isRoadeSpeed").toString());
 			SimpleDateFormat formatter = new SimpleDateFormat ("yyyy-MM-dd HH:mm:ss"); 
-			
 			Date date = new Date();
-			
 			// 修改日期
 			String updateDate = formatter.format(date);
-			
 			String crosesRoad="";
-			
 			String endNode="";
-			
 			String startNode="";
-			
 			String middleNode="";
-			
 			String sectionType="";
-			
-			// String csectionVector="";
-			
 			// 更新
-			/*repository.sectionUpdate(sectionId, gsectionVector, bsectionVectorS, sectionCode, sectionName, crosesRoad, endNode, startNode, middleNode, sectionType, csectionVector, roadCoding, sectionDistance, sectionTime, dbType, speedLimit, descriptions, version, createBy, createDate, updateBy, updateDate);*/
 			repository.sectionUpdate(sectionId, gsectionVector, bsectionVectorS, sectionCode, sectionName, crosesRoad, endNode, startNode, middleNode, sectionType, roadCoding, sectionDistance, sectionTime, dbType, speedLimit, descriptions, version, createBy, createDate, updateBy, updateDate);
-			
 			SectionRoute route = new SectionRoute();
-			
 			Line line = lineRepository.findOne(sectionRouteLine);
-			
 			Section section = repository.findOne(sectionId);
-			
 			route.setId(sectionRouteId);
-			
 			route.setSectionrouteCode(sectionrouteCode);
-			
 			route.setLineCode(lineCode);
-			
 			route.setSectionCode(sectionCode);
-			
 			route.setDirections(directions);
-			
 			route.setVersions(version);
-			
 			route.setDestroy(destroy);
-			
 			route.setDescriptions(descriptions);
-			
 			route.setCreateBy(createBy);
-			
 			route.setUpdateBy(updateBy);
-			
 			route.setLine(line);
-			
 			route.setSection(section);
-			
+			route.setIsRoadeSpeed(isRoadeSpeed);
 			routeRepository.save(route);
-			
 			resultMap.put("status", ResponseCode.SUCCESS);
-			
 		} catch (Exception e) {
-
 			resultMap.put("status", ResponseCode.ERROR);
-			
 			logger.error("save erro.", e);
-			
 		}
-		
 		return resultMap;
 	}
@@ -294,164 +207,105 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 	 * @return map<SUCCESS：成功；ERROR：异常>
 	 */
 	@Override
+	@Transactional
 	public Map<String, Object> sectionSave(Map<String, Object> map) {
-		
 		Map<String, Object> resultMap = new HashMap<String, Object>();
-		
 		try {
-			
-			/** 线路ID */
+			// 线路ID.
 			Integer lineId = map.get("lineId").equals("") ? null : Integer.valueOf(map.get("lineId").toString());
-			
-			/** 线路编码 */
+			// 线路编码.
 			String lineCode = map.get("lineCode").equals("") ? "" : map.get("lineCode").toString();
-			
+			// 路段名称.
 			String sectionName = map.get("sectionName").equals("") ? "" : map.get("sectionName").toString();
-			
+			// 路段编码.
 			String sectionCode = map.get("sectionCode").equals("") ? "" : map.get("sectionCode").toString();
-			
+			// 道路编码.
 			String roadCoding = map.get("roadCoding").equals("") ? "" : map.get("roadCoding").toString();
-			
+			// 原始坐标类型.
 			String dbType = map.get("dbType").equals("") ? "" :map.get("dbType").toString();
-			
+			// 路段几何图形坐标.
 			String sectionJSON = map.get("bsectionVector").equals("") ? "" : map.get("bsectionVector").toString();
-			
+			// 路段序号
 			String sectionrouteCode = map.get("sectionrouteCode").equals("") ? "" : map.get("sectionrouteCode").toString();
-			
-			Double sectionTime = map.get("sectionTime").equals("") ? null : Double.valueOf(map.get("sectionTime").toString());
-			
-			Double sectionDistance = map.get("sectionDistance").equals("") ? null : Double.valueOf(map.get("sectionDistance").toString());
-			
-			Double speedLimit = map.get("speedLimit").equals("") ? null : Double.valueOf(map.get("speedLimit").toString());
-			
-			Integer versions = map.get("versions").equals("") ? null : Integer.valueOf(map.get("versions").toString());
-			
-			Integer destroy = map.get("destroy").equals("") ? null : Integer.valueOf(map.get("destroy").toString());
-			
-			Integer directions = map.get("directions").equals("") ? null : Integer.valueOf(map.get("directions").toString());
-			
+			// 路段时长.
+			Double sectionTime = map.get("sectionTime").equals("") ? 0.0d : Double.valueOf(map.get("sectionTime").toString());
+			// 路段距离.
+			Double sectionDistance = map.get("sectionDistance").equals("") ? 0.0d : Double.valueOf(map.get("sectionDistance").toString());
+			// 路段限速.
+			Double speedLimit = map.get("speedLimit").equals("") ? 0.0d : Double.valueOf(map.get("speedLimit").toString());
+			// 版本.
+			Integer versions = map.get("versions").equals("") ? 1 : Integer.valueOf(map.get("versions").toString());
+			// 是否撤销.
+			Integer destroy = map.get("destroy").equals("") ? 0 : Integer.valueOf(map.get("destroy").toString());
+			// 路段方向.
+			Integer directions = map.get("directions").equals("") ? 0 : Integer.valueOf(map.get("directions").toString());
+			// 描述与说明.
 			String descriptions = map.get("descriptions").equals("")? "" : map.get("descriptions").toString();
-			
 			// 原始线状图形坐标集合
 			String sectionsBpoints = "";
-			
 			// WGS线状图形坐标集合
 			String sectionsWJPpoints = "";
-			
 			if(!sectionJSON.equals("")) {
-				
 				// 转换成JSON数组
 				JSONArray sectionsArray = JSONArray.parseArray(sectionJSON);
-				
 				// 遍历
 				for(int s = 0 ;s<sectionsArray.size();s++) {
-					
 					String pointsLngStr = sectionsArray.getJSONObject(s).get("lng").toString();
-					
 					String pointsLatStr = sectionsArray.getJSONObject(s).get("lat").toString();
-					
 					String WGSLngStr = "";
-					
 					String WGSLatStr = "";
-					
 					Location resultPoint = FromBDPointToWGSPoint(pointsLngStr,pointsLatStr);
-					
 					WGSLngStr = String.valueOf(resultPoint.getLng());
-					
 					WGSLatStr = String.valueOf(resultPoint.getLat());			
-					
 					if(s==0) {
-						
 						sectionsBpoints = pointsLngStr + " " + pointsLatStr;
-						
 						sectionsWJPpoints = WGSLngStr + " " + WGSLatStr;
-						
 					}else {
-						
 						sectionsBpoints = sectionsBpoints + "," +  pointsLngStr + " " + pointsLatStr;
-						
 						sectionsWJPpoints = sectionsWJPpoints + ","  +   WGSLngStr + " " + WGSLatStr;
-						
 					}
-					
 				}
-				
 			}
-			
 			// WGS坐标点集合
 			String gsectionVector = "LINESTRING(" + sectionsWJPpoints +")";
-			
 			// 原坐标点集合
 			String bsectionVector = "LINESTRING(" + sectionsBpoints + ")";
-			
 			String crosesRoad="";
-			
 			String endNode ="";
-			
 			String startNode="";
-			
 			String middleNode="";
-			
 			String sectionType="";
-			
 			String csectionVector=null;
-			
 			Integer id = Integer.valueOf(sectionCode);
-			
 			repository.systemSave(sectionCode, sectionName, crosesRoad, endNode, startNode, middleNode, gsectionVector, bsectionVector, sectionType, csectionVector, roadCoding, sectionDistance, sectionTime, dbType, speedLimit, descriptions, versions, id);
-			
 			Section section = repository.findOne(id);
-			
 			Line line = lineRepository.findOne(lineId);
-			
 			// 路段路由
 			SectionRoute sectionRoute = new SectionRoute();
-			
 			Integer routeCode = null;
-			
 			if(!sectionrouteCode.equals("")){
-				
 				String sectionrouteCodeArray[] =  sectionrouteCode.split("_");
-				
 				routeCode = Integer.valueOf(sectionrouteCodeArray[0])+1;
-				
 			}else {
-				
 				routeCode = 100;
-				
 			}	
-			
+			routeRepository.sectionUpdSectionRouteCode(lineId, directions,routeCode);
 			sectionRoute.setSectionrouteCode(routeCode);
-			
 			sectionRoute.setLineCode(lineCode);
-			
 			sectionRoute.setSection(section);
-			
 			sectionRoute.setSectionCode(sectionCode);
-			
 			sectionRoute.setDirections(directions);
-			
 			sectionRoute.setDescriptions(descriptions);
-			
 			sectionRoute.setDestroy(destroy);
-			
 			sectionRoute.setVersions(versions);
-			
 			sectionRoute.setLine(line);
-			
+			sectionRoute.setIsRoadeSpeed(0);
 			routeRepository.save(sectionRoute);
-			
 			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
@@ -4,6 +4,7 @@ import com.bsth.common.ResponseCode;
 import com.bsth.entity.Line;
 import com.bsth.entity.Station;
 import com.bsth.entity.StationRoute;
+import com.bsth.entity.search.CustomerSpecs;
 import com.bsth.repository.LineRepository;
 import com.bsth.repository.SectionRouteRepository;
 import com.bsth.repository.StationRepository;
@@ -16,6 +17,8 @@ import com.bsth.util.Geo.Point;
 import com.bsth.util.db.DBUtils_MS;
 import com.google.common.base.Splitter;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -56,6 +59,14 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 	@Autowired
 	private StationRepository stationRepository;
+	@Override
+	public Iterable<StationRoute> list(Map<String, Object> map) {
+		List<Sort.Order> orderList = new ArrayList<>();
+		orderList.add(new Sort.Order(Direction.ASC, "directions"));
+		orderList.add(new Sort.Order(Direction.ASC, "stationRouteCode"));
+		return repository.findAll(new CustomerSpecs<StationRoute>(map), new Sort(orderList));
+	}
+	
 	/**
 	 * @Description :TODO(查询树站点与路段数据)
 	 * 
@@ -31,6 +31,8 @@ import com.bsth.service.StationService;
 import com.bsth.util.GetUIDAndCode;
 import com.bsth.util.TransGPS;
 import com.bsth.util.TransGPS.Location;
+import com.bsth.util.Geo.GeoUtils;
+import com.bsth.util.Geo.Point;
 /**
  * 
@@ -82,62 +84,41 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 	 */
 	@Override
 	public Map<String, Object> systemSaveStations(Map<String, Object> map) {
-		
 		Map<String, Object> resultMap = new HashMap<String,Object>();
-		
 		try {
-			
 			// 站点信息字符传
 			String stationJSON = map.get("stationJSON").toString().equals("")  ? "" : map.get("stationJSON").toString();
-			
 			// 路段信息字符串
 			String sectionJSON = map.get("sectionJSON").toString().equals("")  ? "" : map.get("sectionJSON").toString();
-			
 			// 方向
 			int directions = Integer.parseInt(map.get("directions").toString());
-			
 			// 是否撤销
 			int destroy = map.get("destroy").equals("") ? 0 : Integer.parseInt(map.get("destroy").toString());
-			
 			// 版本
 			int versions = map.get("versions").equals("") ? 0 : Integer.parseInt(map.get("versions").toString());
-			
 			// 坐标类型
 			String dbType =  map.get("dbType").equals("") ? "" : map.get("dbType").toString();
-			
 			// 限速
 			String speedLimitStr = map.get("speedLimit").equals("") ? "" : map.get("speedLimit").toString();
-			
 			// 线路ID
 			int lineId = map.get("lineId").toString().equals("") ? 0 : Integer.parseInt(map.get("lineId").toString());
-			
 			// 半径
 			int radius =  map.get("radius").equals("") ? 0 : Integer.parseInt(map.get("radius").toString());
-			
 			// 图形类型
 			String shapesType = map.get("shapesType").equals("") ? "" : map.get("shapesType").toString();
-			
 			// 路段距离
 			Double sectionDistance = 0.0d;
-			
 			// 路段时长
 			Double sectionDuration = 0.0d;
-			
 			// 里程(上或者下)
 			double sumUpOrDownMileage = 0.0d;
-			
 			// 线路信息
 			Line resultLine = lineRepository.findOne(lineId);
-			
 			Map<String, Object> resultSaveMapm = new HashMap<String,Object>();
-			
 			String baseRes = map.get("baseRes").equals("") ? "" : map.get("baseRes").toString();
-			
 			if(!stationJSON.equals("")) {
-				
 				// 保存站点与站点路由信息
 				resultSaveMapm = savaStationAndStationRouteInfo( stationJSON, sectionDistance, sectionDuration, dbType,radius, shapesType, destroy, versions, sumUpOrDownMileage, directions, resultLine,baseRes);
-				
 			}
 			// 路段长度
@@ -259,275 +240,148 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 	 * @throws Exception
 	 */
 	public Map<String, Object> savaStationAndStationRouteInfo(String stationJSON,double sectionDistance,double sectionDuration,String dbType,
-			
 			int radius,String shapesType,int destroy,int versions,double sumUpOrDownMileage,int directions,Line resultLine,String baseRes) throws Exception{
-		
 		Map<String, Object> paramsMeleageAndDistncDura = new HashMap<String,Object>();
-		
 		JSONArray stationsArray = JSONArray.parseArray(stationJSON);
-		
 		if(stationsArray.size()>0) {
-			
 			for(int i = 0;i <stationsArray.size();i++) {
-				
 				// 站点名称
 				String stationName = stationsArray.getJSONObject(i).equals("") ? "" : stationsArray.getJSONObject(i).get("name").toString();
-				
 				Double distance = stationsArray.getJSONObject(i).get("distance").equals("") ? 0 : Double.parseDouble(stationsArray.getJSONObject(i).get("distance").toString());
-				
 				// 转成公里
 				distance = distance/1000;
-				
 				BigDecimal d = new BigDecimal(distance);
-				
 				distance = d.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-				
 				sectionDistance= distance + sectionDistance;
-				
 				Double duration = stationsArray.getJSONObject(i).get("duration").equals("") ? 0 : Double.parseDouble(stationsArray.getJSONObject(i).get("duration").toString());
-				
 				// 转成分钟
 				duration = duration/60;
-				
 				BigDecimal t = new BigDecimal(duration);
-				
 				duration = t.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-				
 				sectionDuration = duration + sectionDuration;
-				
 				// 百度经纬度坐标
 				String bJwpoints = "";
-				
 				// 百度坐标经度
 				String bLonx = JSONObject.parseObject(stationsArray.getJSONObject(i).get("potion").toString()).get("lng").toString();
-				
+				bLonx = bLonx==null || bLonx.equals("") ? "0" : bLonx;
 				// 百度坐标纬度
 				String bLatx = JSONObject.parseObject(stationsArray.getJSONObject(i).get("potion").toString()).get("lat").toString();
-				
+				bLatx = bLatx==null || bLatx.equals("") ? "0" : bLatx;
 				List<Object[]> stationNameList = repository.findStationName(stationName);
-				
-				boolean isHave = isHaveStationname(bJwpoints,stationNameList);
-				
+				Map<String, Object> isHaveMap = isHaveStationname(bLonx,bLatx,stationNameList);
 				// 初始化站点对象
 				Station arg0 =  new Station();
-				
-				// 站点编码
-				long stationCode = 0L;
-				
-				if(isHave) {
-					
-					Integer stationId = Integer.parseInt(stationNameList.get(0)[1].toString());
-					
+				if(Boolean.parseBoolean(isHaveMap.get("isHave").toString())) {
+					/*Integer stationId = Integer.parseInt(stationNameList.get(0)[1].toString());*/
+					Integer stationId = Integer.parseInt(isHaveMap.get("id").toString());
 					arg0 = repository.findOne(stationId);
-					
 				}else {
-					
-					stationCode = GetUIDAndCode.getStationId();
-					
+					// 站点编码
+					long stationCode = GetUIDAndCode.getStationId();
 					arg0.setStationCod(String.valueOf(stationCode));
-					
 					arg0.setId((int)stationCode);
-					
 					arg0.setStationName(stationName);
-					
 					// 原坐标类型
 					arg0.setDbType(dbType);
-					
-					
 					String gLonxStr = JSONObject.parseObject(stationsArray.getJSONObject(i).get("wgs").toString()).get("x").equals("") ? null : JSONObject.parseObject(stationsArray.getJSONObject(i).get("wgs").toString()).get("x").toString();
-					
 					String gLatyStr = JSONObject.parseObject(stationsArray.getJSONObject(i).get("wgs").toString()).get("y").equals("") ? null : JSONObject.parseObject(stationsArray.getJSONObject(i).get("wgs").toString()).get("y").toString();
-					
 					float gLonx = 0.0f;
-					
 					float gLaty = 0.0f;
-					
 					Location resultPoint = null;
-					
 					if(baseRes.equals("No")){
-						
 						/** BD to WGS坐标 */
 						resultPoint = FromBDPointToWGSPoint(bLonx,bLatx);
-						
 						if(gLonxStr==null) 
 							gLonx = (float)resultPoint.getLng();
 						else 
 							gLonx =  Float.valueOf(gLonxStr);
-						
 						if(gLatyStr==null)
 							gLaty = (float)resultPoint.getLat();
 						else 
 							gLaty =  Float.valueOf(gLatyStr);
-						
 						arg0.setgLonx(gLonx);
-						
 						arg0.setgLaty(gLaty);
-						
 						// 百度经纬度
 						bJwpoints = bLonx + " " + bLatx;
-						
 						arg0.setbJwpoints(bJwpoints);
-						
 					}else if(baseRes.equals("GCJ02")){
-						
 						Location bdLoc = TransGPS.LocationMake(Double.valueOf(gLonxStr), Double.valueOf(gLatyStr));
-						
 						Location location = TransGPS.bd_encrypt(bdLoc);
-						
 						String GCJLng = String.valueOf(location.getLng());
-						
 						String GCJLat = String.valueOf(location.getLat());
-						
 						resultPoint = FromBDPointToWGSPoint(GCJLng,GCJLat);
-						
 						bJwpoints = GCJLng + " "  +GCJLat;
-						
 						arg0.setgLonx((float)location.getLng());
-						
 						arg0.setgLaty((float)location.getLat());
-						
 						arg0.setbJwpoints(bJwpoints);
-						
-						
 					}else if(baseRes.equals("BD09")){
-						
 						resultPoint = FromBDPointToWGSPoint(gLonxStr, gLatyStr);
-						
 						bJwpoints = gLonxStr+ " " + gLatyStr;
-						
 						arg0.setgLonx((float)resultPoint.getLng());
-						
 						arg0.setgLaty((float)resultPoint.getLat());
-						
 					}else if(baseRes.equals("WGS84")){
-						
 						Location bdLoc = TransGPS.LocationMake(Double.valueOf(gLonxStr), Double.valueOf(gLatyStr));
-						
 						Location gcjLoc = TransGPS.transformFromWGSToGCJ(bdLoc);
-						
 						Location bdEn = TransGPS.bd_encrypt(gcjLoc);
-						
 						bJwpoints = String.valueOf(bdEn.getLng()) + " " + String.valueOf(bdEn.getLat()); 
-						
 						arg0.setbJwpoints(bJwpoints);
-						
 						arg0.setgLonx(Float.valueOf(gLonxStr));
-						
 						arg0.setgLaty(Float.valueOf(gLatyStr));
-						
 					}
-					
-					
-					
-				/*	if(gLonxStr==null) 
-						gLonx = (float)resultPoint.getLng();
-					else 
-						gLonx =  Float.valueOf(gLonxStr);
-					
-					if(gLatyStr==null)
-						gLaty = (float)resultPoint.getLat();
-					else 
-						gLaty =  Float.valueOf(gLatyStr);
-					
-					arg0.setgLonx(gLonx);
-					
-					arg0.setgLaty(gLaty);*/
-					
- 					// 站点地理位置WGS坐标经度
-					// String gLonx = JSONObject.parseObject(stationsArray.getJSONObject(i).get("WGSpotion").toString()).get("Lng").toString();
-					// arg0.setgLonx(Float.parseFloat(gLonx));
-					
-					// 站点地理位置WGS坐标纬度
-					// String gLaty = JSONObject.parseObject(stationsArray.getJSONObject(i).get("WGSpotion").toString()).get("Lat").toString();
-					// arg0.setgLaty(Float.parseFloat(gLaty));
-					
 					arg0.setRadius(radius);
-					
-					
 					arg0.setShapesType(shapesType);
-					
 					// 是否想撤销
 					arg0.setDestroy(destroy);
-					
 					// 版本号
 					arg0.setVersions(versions);
-					
 					/*arg0.setbJwpoints(bJwpoints);*/
-					
 					// 插入站点信息
 					repository.save(arg0);
 				}
-				
 				// 站点路由对象
 				StationRoute route = new StationRoute();
-				
 				// 站点名称
 				route.setStationName(stationName);
-				
 				route.setDistances(distance);
-				
 				sumUpOrDownMileage =  sumUpOrDownMileage + distance;
-				
 				route.setToTime(duration);
-				
-				
 				// 站点编码
 				route.setStationCode(arg0.getStationCod());
-				
 				// 站点序号
 				route.setStationRouteCode((i+1)*100);
-				
 				// 站点类型
 				if(i==0) {
-					
 					// 起始站
 					route.setStationMark("B");
-					
 				}else if(i==stationsArray.size()-1) {
-					
 					// 终点站
 					route.setStationMark("E");
-					
 				}else {
-					
 					// 中途站
 					route.setStationMark("Z");
-					
 				}
-				
 				// 版本号
 				route.setVersions(versions);
-				
 				// 站点ID
 				route.setStation(arg0);
-				
 				// 方向
 				route.setDirections(directions);
-				
 				// 线路ID
 				route.setLine(resultLine);
-				
 				// 线路编码
 				route.setLineCode(resultLine.getLineCode());
-				
 				route.setDestroy(destroy);
-				
 				// 插入站点路由信息 
 				routeRepository.save(route);
 			}
-			
 			paramsMeleageAndDistncDura.put("sumUpOrDownMileage", sumUpOrDownMileage);
-			
 			paramsMeleageAndDistncDura.put("sectionDistance", sectionDistance);
-			
 			paramsMeleageAndDistncDura.put("sectionDuration", sectionDuration);
-			
+			paramsMeleageAndDistncDura.put("stationdata",stationsArray);
 		}
-		
 		return paramsMeleageAndDistncDura;
-		
 	}
 	/**
@@ -784,68 +638,52 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 		Section section = sectionRepository.findOne(sectionid);
-		
 		// 路段路由
 		SectionRoute sectionRoute = new SectionRoute();
-		
 		// 路段序号
 		sectionRoute.setSectionrouteCode(100);
-		
 		// 线路编码
 		sectionRoute.setLineCode(resultLine.getLineCode());
-		
 		// 路段ID
 		sectionRoute.setSection(section);
-		
 		sectionRoute.setDestroy(destroy);
-		
 		// 线路ID
 		sectionRoute.setLine(resultLine);
-		
 		// 路段编码
 		sectionRoute.setSectionCode(sectionCode);
-		
 		// 版本
 		sectionRoute.setVersions(versions);
-		
 		// 方向
 		sectionRoute.setDirections(directions);
-		
 		// 路段路由保存
 		sectionRouteRepository.save(sectionRoute);
 	}
-	
-	public boolean isHaveStationname(String bJwpoints,List<Object[]> stationNameList) {
-		
-		boolean temp = true;
-		
+	public Map<String, Object> isHaveStationname(String jd,String wd,List<Object[]> stationNameList) {
+		Map<String, Object> rsM = new HashMap<String ,Object>();
+		boolean temp = false;
 		if(stationNameList.size()>0) {
-			
-			for(int k = 0 ; k <stationNameList.size();k++) {
-				
-				if(bJwpoints.equals(stationNameList.get(k)[0])){
-					
-					return temp; 
-					
-				}else {
-					
-					temp = false;
-					
+			if(jd.equals("0") || wd.equals("0")) {
+				rsM.put("id", stationNameList.get(0)[1]);
+				temp = true;
+			}else{
+				Point p1 =  new Point(Double.parseDouble(jd),Double.parseDouble(wd));
+				for(int k = 0 ; k <stationNameList.size();k++) {
+					String bJwpoints[] = stationNameList.get(k)[0].toString().split(" ");
+					Point p2 = new Point(Double.parseDouble(bJwpoints[0]),Double.parseDouble(bJwpoints[1]));
+					double jl = GeoUtils.getDistance(p1, p2);
+					if(jl<=120d) {
+						rsM.put("id", stationNameList.get(k)[1]);
+						temp = true;
+						break;
+					}
 				}
-				
 			}
-			
-		}else {
-			
-			temp = false;
-		}
-		
-		return temp;
+		} 
+		rsM.put("isHave", temp);
+		return rsM;
 	}
-	 
-	
 	/**
 	 * @Description :TODO(新增站点保存)
 	 * 
@@ -863,246 +701,134 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 	 */
 	@Override
 	public Map<String, Object> stationSaveMap(Map<String, Object> map) {
-		
 		Map<String, Object> resultMap = new HashMap<String, Object>();
-		
 		try {
-			
 			// 站点编码
 			String stationCod = map.get("stationCod").equals("") ? "" : map.get("stationCod").toString();
-			
 			// 站点ID
 			int stationId = Integer.valueOf(stationCod);
-			
 			// 站点名称
 			String stationName = map.get("stationName").equals("") ? "" : map.get("stationName").toString();
-			
 			// 道路编码
 			String roadCoding = map.get("roadCoding").equals("") ? "" : map.get("roadCoding").toString();
-			
 			// 原坐标类型
 			String dbType = map.get("dbType").equals("") ? "" : map.get("dbType").toString();
-			
 			// 原坐标点
 			String bJwpoints = map.get("bJwpoints").equals("") ? "" : map.get("bJwpoints").toString();
-			
 			String bJwpointsArray[] = null;
-			
 			if(bJwpoints!=null) {
-				
 				bJwpointsArray = bJwpoints.split(" ");
-				
 			}
-			
 			// 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();
-				
 			}
-			
-			/*// WGS经纬度
-			String gJwpoints = map.get("gJwpoints").equals("") ? null : map.get("gJwpoints").toString();
-			
-			String gJwpointsArray []= null;
-			
-			if(gJwpoints!=null) {
-				
-				gJwpointsArray = gJwpoints.split(" ");
-				
-			}*/
-			
 			// 方向
 			Integer directions = map.get("directions").equals("") ? null : Integer.parseInt(map.get("directions").toString());
-			
 			// 距离
 			Double distances =  map.get("distances").equals("") ? null : Double.parseDouble(map.get("distances").toString());
-			
 			// 时间
 			Double toTime = map.get("toTime").equals("") ? null : Double.parseDouble(map.get("toTime").toString());
-			
-			/*// WGS经纬度
-			Float gLonx = Float.parseFloat(gJwpointsArray[0]);
-			
-			// WGS纬度
-			Float gLaty = Float.parseFloat(gJwpointsArray[1]);*/
-			
 			// 城建坐标经度
 			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());
-			
-			// 多边形WGS坐标点集合
-			// String gPloygonGrid = map.get("gPolygonGrid").equals("") ? "" : map.get("gPolygonGrid").toString();
-			
 			// 多边形原坐标点集合
 			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());
-						 
 					 }
-					
 				}
-				
 			}
-			
-		/*	bPloygonGrid = "POLYGON(("  + bPloygonGrid +"))";
-			
-			gPloygonGrid = "POLYGON(("  + gPloygonGrid +"))";*/
-			
 			// 是否撤销
 			Integer destroy = map.get("destroy").equals("") ? null : Integer.parseInt(map.get("destroy").toString());
-			
 			// 圆半径
 			Integer radius = map.get("radius").equals("") ? null : Integer.parseInt(map.get("radius").toString());
-			
 			// 图形类型
 			String shapesType = map.get("shapesType").equals("") ? "" : map.get("shapesType").toString();
-			
 			// 版本
 			Integer versions = map.get("versions").equals("") ? null : Integer.parseInt(map.get("versions").toString());
-			
 			// 说明
 			String descriptions = map.get("descriptions").equals("") ? "" : map.get("descriptions").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());
-			
 			// 线路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;
-				
 			}
-			
 			if(bPloygonGrid.equals(""))
 				bPloygonGrid = null;
 			else
 				bPloygonGrid = "POLYGON(("  + bPloygonGrid +"))";
-				
 			if(gPloygonGrid.equals(""))
 				gPloygonGrid = null;
 			else
 				gPloygonGrid = "POLYGON(("  + gPloygonGrid +"))";
-			
 			// 保存站点
 			repository.stationSave(stationCod, stationName, roadCoding, dbType, bJwpoints, 
-						
 									gLonx, gLaty, x, y, gPloygonGrid,bPloygonGrid, destroy, radius, 
-								
 									shapesType, versions, descriptions, createBy, updateBy,stationId);
-									
-									
-			
-			
 			Station station = repository.findOne(stationId);
-			
 			StationRoute arg0 = new StationRoute();
-			
 			// 线路
 			arg0.setLine(resultLine);
-			
 			arg0.setLineCode(resultLine.getLineCode());
-			
 			// 站点
 			arg0.setStation(station);
-			
 			// 站点路由名称
 			arg0.setStationName(stationName);
-			
 			// 站点路由编码
 			arg0.setStationCode(stationCod);
-			
 			// 站点路由序号
 			arg0.setStationRouteCode(stationRouteCode);
-			
 			// 站点路由类型
 			arg0.setStationMark(stationMark);
-			
 			// 站点路由站点方向
 			arg0.setDirections(directions);
-			
 			// 站点路由到站距离
 			arg0.setDistances(distances);
-			
 			// 站点路由到站时间
 			arg0.setToTime(toTime);
-			
 			// 站点版本号
 			arg0.setVersions(versions);
-			
 			// 是否撤销
 			arg0.setDestroy(destroy);
-			
 			// 站点路由说明
 			arg0.setDescriptions(descriptions);
-			
 			routeRepository.save(arg0);
-			
 			resultMap.put("status", ResponseCode.SUCCESS);
-			
 		} catch (Exception e) {
-
 			resultMap.put("status", ResponseCode.ERROR);
-			
 			logger.error("save erro.", e);
-			
 		}
-		
 		return resultMap;
 	}
@@ -1373,101 +1099,64 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 	@Override
 	public Map<String, Object> manualSave(Map<String, Object> map) {
-		
 		Map<String, Object> resultMap = new HashMap<String,Object>();
-		
 		try {
-			
 			// 站点信息字符传
 		    String stationJSON = map.get("stationJSON").equals("")  ? "" : map.get("stationJSON").toString();
-						
 		    // 路段信息字符串
 		    String sectionJSON = map.get("sectionJSON").equals("")  ? "" : map.get("sectionJSON").toString();
-		   
 		    // 方向
 		    int directions = Integer.parseInt(map.get("directions").toString());
-					
 		    // 是否撤销
 		    int destroy = map.get("destroy").equals("") ? 0 : Integer.parseInt(map.get("destroy").toString());
-					
 		    // 版本
 		    int versions = map.get("versions").equals("") ? 0 : Integer.parseInt(map.get("versions").toString());
-					
 			// 坐标类型
 			String dbType =  map.get("dbType").equals("") ? "" : map.get("dbType").toString();
-					
 			// 限速
 			String speedLimitStr = map.get("speedLimit").equals("") ? "" : map.get("speedLimit").toString();
-			
 			// 线路ID
 			int lineId = map.get("lineId").equals("") ? 0 : Integer.parseInt(map.get("lineId").toString());
-			
 			// 半径
 			int radius =  map.get("radius").equals("") ? 0 : Integer.parseInt(map.get("radius").toString());
-			
 			// 图形类型
 			String shapesType = map.get("shapesType").equals("") ? "" : map.get("shapesType").toString();
-			
 			// 线路信息
 			Line resultLine = lineRepository.findOne(lineId);
-			
 			// 路段距离
 			Double sectionDistance = 0.0d;
-			
 			// 路段时长
 			Double sectionDuration = 0.0d;
-			
 			// 里程(上或者下)
 			double sumUpOrDownMileage = 0.0d;
-			
 			Map<String, Object> resultSaveMapm = new HashMap<String,Object>();
-			
 			String baseRes = map.get("baseRes").equals("") ? "" : map.get("baseRes").toString();
-			
 			if(!stationJSON.equals("")) {
-				
 				// 保存站点与站点路由信息
 				resultSaveMapm = savaStationAndStationRouteInfo( stationJSON, sectionDistance, sectionDuration, dbType,radius, shapesType, destroy, versions, sumUpOrDownMileage, directions, resultLine,baseRes);
-				
 			}
-			
 			// 路段长度
 			sectionDistance = Double.valueOf(resultSaveMapm.get("sectionDistance").toString());
-			
 			// 路段时长
 			sectionDuration = Double.valueOf(resultSaveMapm.get("sectionDuration").toString());
-			
 			// 如果路段信息JSON字符串不为空
 			if(!sectionJSON.equals("")) {
-				
 				manualSaveSectionAndSectionRoute(sectionJSON, speedLimitStr, sectionDistance, sectionDuration, dbType, versions, resultLine, destroy, directions);
-				
 			}
-			
 			// 里程
 			sumUpOrDownMileage = Double.valueOf(resultSaveMapm.get("sumUpOrDownMileage").toString());
-			
 			BigDecimal s = new BigDecimal(sumUpOrDownMileage);
-			
 			sumUpOrDownMileage = s.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-			
 			// 更新里程
 			// updateLineInfoUpOrDownMileage( resultLine , directions, sumUpOrDownMileage);
-			
 			if(directions==0) {
-				
 				// lineUpdateStationName(resultLine);
-				
 			}
-			
 			resultMap.put("status", ResponseCode.SUCCESS);
-			
+			resultMap.put("stationData", resultSaveMapm.get("stationdata"));
 		} catch (Exception e) {
-
 			resultMap.put("status", ResponseCode.ERROR);
-			
 			logger.error("save erro.", e);
-			
 		}
 		return resultMap;
@@ -1478,103 +1167,61 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 												 double sectionTime,String dbType,Integer versions,Line resultLine,
 												 Integer destroy,Integer directions) {
-		
 		// 转换成JSON数组
 		JSONArray sectionsArray = JSONArray.parseArray(sectionJSON);
-		
 		// 遍历
 		for(int s = 0 ;s<sectionsArray.size();s++) {
-			
 			// 站点名称
 			String sectionName = sectionsArray.getJSONObject(s).equals("") ? "" : sectionsArray.getJSONObject(s).get("sectionName").toString();
-			
 			String pointsStr = sectionsArray.getJSONObject(s).equals("") ? "" : sectionsArray.getJSONObject(s).get("points").toString();
-			
 			// 原始线状图形坐标集合
 			String sectionsBpoints = "";
-			
 			// WGS线状图形坐标集合
 			String sectionsWJPpoints = "";
-			
 			if(!pointsStr.equals("")){
-				
 				JSONArray pointsArray = JSONArray.parseArray(pointsStr);
-				
 				for(int p =0;p<pointsArray.size();p++){
-					
 					String pointsLngStr = pointsArray.getJSONObject(p).get("lng").toString();
-					
 					String pointsLatStr = pointsArray.getJSONObject(p).get("lat").toString();
-					
 					Location resultPoint = FromBDPointToWGSPoint(pointsLngStr,pointsLatStr);
-					
 					String WGSLngStr = String.valueOf(resultPoint.getLng());
-					
 					String WGSLatStr = String.valueOf(resultPoint.getLat());
-					
 					if(p==pointsArray.size()-1){
-						
 						sectionsBpoints = sectionsBpoints + pointsLngStr + " " + pointsLatStr;
-						
 						sectionsWJPpoints =  sectionsWJPpoints + WGSLngStr + " " + WGSLatStr;
-						
 						// sectionsWJPpoints = sectionsWJPpoints + pointsArray.getJSONObject(p).getJSONObject("WGSpotion").get("Lng") + " " +pointsArray.getJSONObject(p).getJSONObject("WGSpotion").get("Lat");
-						
 					}else {
-						
 						sectionsBpoints = sectionsBpoints + pointsArray.getJSONObject(p).get("lng").toString() + " " +pointsArray.getJSONObject(p).get("lat").toString()+",";
-						
 						sectionsWJPpoints =  sectionsWJPpoints + WGSLngStr + " " + WGSLatStr + ",";
-						
 						// sectionsWJPpoints = sectionsWJPpoints + pointsArray.getJSONObject(p).getJSONObject("WGSpotion").get("Lng") + " " +pointsArray.getJSONObject(p).getJSONObject("WGSpotion").get("Lat") +",";
-						
-						
 					}
-					
 				}
-				
 			}
-		 
 			long sectionMaxId = GetUIDAndCode.getSectionId();
-			
 			String sectionCode = String.valueOf(sectionMaxId);
-			
 			int sectionId = (int) (sectionMaxId);
-			
 			// 交出路
 			String crosesRoad = "";
-			
 			// 终止节点
 			String endNode = "";
-			
 			// 开始节点
 			String startNode = "";
-			
 			// 中间节点
 			String middleNode = "";
-			
 			// WGS坐标点集合
 			String gsectionVector = "LINESTRING(" + sectionsWJPpoints +")";
-			
 			// 原坐标点集合
 			String bsectionVector = "LINESTRING(" + sectionsBpoints + ")";
-			
 			// 城建坐标点集合
 			String csectionVector = "";
-			
 			// 路段类型
 			String sectionType = "";
-			
 			// 道路编码
 			String roadCoding = "";
-			
 			// 限速
 			double speedLimit = Double.parseDouble(speedLimitStr);
-			
 			// 说明
 			String descriptions = "";
-			
-			
 			sectionRepository.systemSave(sectionCode, sectionName, crosesRoad, endNode, startNode, 
 										 middleNode, gsectionVector, bsectionVector, sectionType, csectionVector, 
@@ -1582,37 +1229,24 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 										 roadCoding, sectionDistance, sectionTime, dbType, speedLimit, 
 										 descriptions, versions,sectionId);
-										 
-			
-			
 			Section section = sectionRepository.findOne(Integer.parseInt(sectionCode));
-			
 			// 路段路由
 			SectionRoute sectionRoute = new SectionRoute();
-			
 			// 路段序号
 			sectionRoute.setSectionrouteCode((s+1)*100);
-			
 			// 线路编码
 			sectionRoute.setLineCode(resultLine.getLineCode());
-			
 			// 路段ID
 			sectionRoute.setSection(section);
-			
 			// 线路ID
 			sectionRoute.setLine(resultLine);
-			
 			// 路段编码
 			sectionRoute.setSectionCode(sectionCode);
-			
 			// 版本
 			sectionRoute.setVersions(versions);
-			
 			sectionRoute.setDestroy(destroy);
-			
 			// 方向
 			sectionRoute.setDirections(directions);
-			
 			sectionRouteRepository.save(sectionRoute);
 		}
@@ -26,80 +26,47 @@ import com.bsth.repository.StationRepository;
  */
 @Component
 public class GetUIDAndCode  {
-	
 	@Autowired
 	private  LineRepository lineRepository;
-	
 	@Autowired
 	private StationRepository stationRepository;
-	
 	@Autowired
 	private SectionRepository sectionRepository;
-	
 	@Autowired
 	private CarParkRepository carParkRepository;
-	
 	/** 线路ID */
 	private static long lineId = 0L;
-	
 	/** 站点ID */
 	private static long stationId = 0L;
-	
 	/** 路段ID */
 	private static long sectionId = 0L;
-	
 	/** 停车长ID*/
 	private static long carParkId = 0L;
-	
 	public GetUIDAndCode() {
-		
 		new Timer().schedule(new TimerTask() {
-			
 			@Override
 			public void run() {
-			 
 				lineId = lineRepository.selectMaxIdToLineCode();
-				
 				stationId = stationRepository.stationMaxId();
-				
 				sectionId = sectionRepository.sectionMaxId();
-				
 				carParkId = carParkRepository.carParkMaxId();
-				
 			}
 		}, 1000 * 30);
-		
 	}
-	
 	public static synchronized long getLineId() {
-		
 		++lineId;
-		
 		return lineId;
-		
 	}
-	
 	public static synchronized long getStationId() {
-		
 		++stationId;
-		
 		return stationId;
 	}
-	
 	public static synchronized long getSectionId() {
-		
 		++sectionId;
-		
 		return sectionId;
-		
 	}
-	
 	public static synchronized long getCarParkId() {
-		
 		++carParkId;
-		
 		return carParkId;
-		
 	}
-
-}
+}
 \ No newline at end of file
@@ -68,13 +68,20 @@
 <!-- handsontable样式 -->
 <link rel="stylesheet"
 	href="/assets/bower_components/handsontable/dist/handsontable.full.css" />
-<!-- sweetalert样式 -->
-<link rel="stylesheet"
-    href="/assets/bower_components/sweetalert/dist/sweetalert.css" />
 <!-- schedule计划调度AngularJS模块主css -->
 <link rel="stylesheet" href="/pages/scheduleApp/module/common/main.css"
 	type="text/css" />
+<!-- CSS动画 -->
+<link
+	href="/metronic_v4.5.4/plugins/tipso/css/animate.css"
+	rel="stylesheet" type="text/css" />
+	
+<!-- 提示工具样式 -->
+<link
+	href="/metronic_v4.5.4/plugins/tipso/css/tipso.css"
+	rel="stylesheet" type="text/css" />
+
 <style type="text/css">
 .searchForm {
@@ -388,10 +395,11 @@ tr.row-active td {
 	<script src="/metronic_v4.5.4/plugins/bootstrap-tagsinput/bootstrap-tagsinput.min.js"></script>
 	<!-- 统计图控件 -->
 	<!--<script src="/assets/global/getEchart.js"></script>
-<script src="/assets/global/echarts.js"></script> -->
+	<script src="/assets/global/echarts.js"></script> -->
 	<script src="/assets/js/common.js"></script>
 	<script src="/assets/js/dictionary.js"></script>
-
+	<!-- tipso JS -->
+	<script src="/metronic_v4.5.4/plugins/tipso/js/tipso.js"></script>
 	<script data-exclude=1>
     //初始打开的片段地址
     var initFragment = "^_^initFragment^_^";
@@ -538,7 +546,7 @@ tr.row-active td {
 	<script src="/assets/js/d3.min.js" data-exclude=1></script>
 	<!-- webSocket JS -->
 	<script src="/assets/js/sockjs.min.js"></script>
-
+	
 	<!-- TODO：angularJS相关库 -->
 	<!-- angularJS相关库 -->
@@ -567,9 +575,6 @@ tr.row-active td {
 		src="/assets/bower_components/handsontable/dist/handsontable.full.js"></script>
 	<script
 		src="/assets/bower_components/ngHandsontable/dist/ngHandsontable.js"></script>
-    <!-- sweetalert相关js -->
-    <script src="/assets/bower_components/sweetalert/dist/sweetalert.min.js"></script>
-    <script src="/assets/bower_components/ng-sweet-alert/ng-sweet-alert.js"></script>
 	<!-- schedule计划调度AngularJS模块主JS -->
 	<script src="/pages/scheduleApp/module/common/main.js" data-exclude=1></script>