line 增加字段 ticket_price decimal 长度10 小数2

business 增加字段 phone_num varcar 长度20 stationroute ls_stationroute 增加字段 station_name_en 长度255

line 增加字段 ticket_price decimal 长度10 小数2
business 增加字段 phone_num varcar 长度20 stationroute ls_stationroute 增加字段 station_name_en 长度255
youxiw2000
1 parent 90970423
Showing 11 changed files with 2430 additions and 2211 deletions
src/main/java/com/bsth/entity/Business.java
src/main/java/com/bsth/entity/Line.java
src/main/java/com/bsth/entity/LsStationRoute.java
src/main/java/com/bsth/entity/StationRoute.java
src/main/java/com/bsth/repository/LineRepository.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/service/impl/LineServiceImpl.java
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
src/main/java/com/bsth/service/impl/StationServiceImpl.java
src/main/resources/static/pages/base/line/add.html
src/main/resources/static/pages/base/line/edit.html
@@ -43,6 +43,8 @@ public class Business {
  
 	// 描述
 	private String descriptions;
+	// 描述
+	private String phoneNum;
  
 	// 创建日期
 	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
@@ -106,4 +108,13 @@ public class Business {
 	public void setDescriptions(String descriptions) {
 		this.descriptions = descriptions;
 	}
+
+	public String getPhoneNum() {
+		return phoneNum;
+	}
+
+	public void setPhoneNum(String phoneNum) {
+		this.phoneNum = phoneNum;
+	}
+	
 }
-package com.bsth.entity;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import org.hibernate.annotations.Formula;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.util.Date;
-
-
-/**
- * 
- * @ClassName: Line(线路实体类)
- * 
- * @Description: TODO(线路)
- * 
- * @Author bsth@lq
- * 
- * @Date 2016-4-11 16:06:17
- *
- * @Version 公交调度系统BS版 0.1
- * 
- */
-
-@Entity
-@Table(name = "bsth_c_line")
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
-public class Line implements Serializable {
-	
-	@Id
-	/** 线路ID 主键(唯一标识符) int length(11) */
-	private Integer id;
-	
-	/** 线路名称  varchar length(50) 不能为空 */
-	private String name;
-	
-	/** 线路编码 varchar length(50) 不能为空 */ 
-	private String lineCode;
-
-	/** 英文名  varchar length(50)  */
-	private String es;
-
-	/** 简称 varchar length(50) */ 
-	private String shortName;
-	
-	/** 起始站名称 varchar length(50) 不能为空 
-	 *  该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的起点站。默认使用该字段填写值 */ 
-	private String  startStationName;
-	
-	/** 终点站名称 varchar length(50) 不能为空 
-	 *  该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的起点站。默认使用该字段填写值 */
-	private String endStationName;
-	
-	/** 起始站首班车时间 00:00 上海公交APP中某个接口所需要的字段值 varchar length(50) 不能为空 */
-	private String startStationFirstTime;
-	
-	/** 起始站末班车时间 00:00 上海公交APP中某个接口所需要的字段值 varchar length(50) 不能为空 */
-	private String startStationEndTime;
-	
-	/** 终点站首班时间 00:00 上海公交APP中某个接口所需要的字段值 varchar length(50) 不能为空*/
-	private String endStationFirstTime;
-		
-	/** 终点站末班时间 00:00 上海公交APP中某个接口所需要的字段值 */
-	private String endStationEndTime;
-	
-	/** 所属公司 varchar length(50) */ 
-	private String company;
-
-	/** 分公司  varchar length(50)*/
-	private String brancheCompany;
-
-    /** 组合公司分公司编码 */
-    @Formula(" concat(company, '_', branche_company) ")
-    private String cgsbm;
-
-	/** 性质(线路类型) varchar length(50) */
-	private String nature;
-
-	/** 线路等级 varchar length(50) */
-	private String level;
-	
-	/** 线路长度 */ 
-	private double length;
-	
-	/** 线路负责人 varchar length(50) */ 
-	private String chargeName;
-	
-	/** 负责人电话 varchar length(50) */ 
-	private String telephone;
-	
-	/** 是否撤销 <1:是;0:否> bit length(50) */ 
-	private Integer destroy;
-
-	/** 是否夜宵线   <1:是;0:否> bit length(50)*/ 
-	private Integer supperLine;
-	
-	/** 是否营运   <1:是;0:否> bit length(50)*/ 
-	private Integer sfyy;
-
-	/** 线路区域 <0：区内，1：区外> bit length(1)*/
-	private Integer region;
-
-	/** 起始调度电话 varchar length(50) */
-	private String startPhone;
-
-	/** 终点调度电话  varchar length(50) */
-	private String endPhone;
-
-	/** 开辟日期 date*/
-	@DateTimeFormat(pattern ="yyyy-MM-dd")
-	private Date openDate;
-	
-	/** 大间隔等级 */
-	private Integer spacGrade;
-
-	/** 线路沿革 varchar length(50) */
-	private String history;
-	
-	/** 上海市线路编码 varchar length(50) */
-	private String shanghaiLinecode;
-	
-	/** 设备线路编码 varchar length(50) */
-	private String eqLinecode;
-	
-	/** 配置车辆总数   老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 int length(11)*/
-	private Integer carSumNumber;
-	
-	/** 空调车辆数量   老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 int length(11) */
-	private Integer hvacCarNumber;
-	
-	/** 普通车辆数量   老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 int length(11) */
-	private Integer ordCarNumber;
-	
-	/** 权证车辆数量  报表需要的字段值 */
-	private Integer warrantCar;
-	
-	/** 权证配车启用日期  报表需要的字段值 */
-	private Integer warrantDate;
-	
-	/** 停车场编码   老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 int length(11) */
-	private String carParkCode;
-	
-	/** 线路规划类型 <0:双向;1:环线> int length(11) 运管处接口需要的字段 不能为空 */
-	private Integer linePlayType; 
-	
-	/** 描述 varchar length(255) */
-	private String descriptions;
-	
-	/** 创建人 int length(11) */
-	private Integer createBy;
-		
-	/** 修改人 int length(11) */
-	private Integer updateBy;
-	
-	/** 创建日期 timestamp  */
-	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-	private Date createDate;
-	
-	/** 修改日期 timestamp */
-	@Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-	private Date updateDate;
-
-	/** 是否在使用 <1:是;0:否> bit length(50) */
-	private Integer inUse;
-
-	/**
-	 * 逻辑删除标记 为 1：标识已删除
-	 */
-	private Integer remove = 0;
-	
-	public Integer getSpacGrade() {
-		return spacGrade;
-	}
-
-	public void setSpacGrade(Integer spacGrade) {
-		this.spacGrade = spacGrade;
-	}
-
-	public Integer getWarrantCar() {
-		return warrantCar;
-	}
-
-	public void setWarrantCar(Integer warrantCar) {
-		this.warrantCar = warrantCar;
-	}
-
-	public Integer getWarrantDate() {
-		return warrantDate;
-	}
-
-	public void setWarrantDate(Integer warrantDate) {
-		this.warrantDate = warrantDate;
-	}
-
-	public Integer getLinePlayType() {
-		return linePlayType;
-	}
-
-	public void setLinePlayType(Integer linePlayType) {
-		this.linePlayType = linePlayType;
-	}
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public String getLineCode() {
-		return lineCode;
-	}
-
-	public void setLineCode(String lineCode) {
-		this.lineCode = lineCode;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getEs() {
-		return es;
-	}
-
-	public void setEs(String es) {
-		this.es = es;
-	}
-
-	public String getShortName() {
-		return shortName;
-	}
-
-	public void setShortName(String shortName) {
-		this.shortName = shortName;
-	}
-
-	public Integer getCarSumNumber() {
-		return carSumNumber;
-	}
-
-	public void setCarSumNumber(Integer carSumNumber) {
-		this.carSumNumber = carSumNumber;
-	}
-
-	public Integer getHvacCarNumber() {
-		return hvacCarNumber;
-	}
-
-	public void setHvacCarNumber(Integer hvacCarNumber) {
-		this.hvacCarNumber = hvacCarNumber;
-	}
-
-	public Integer getOrdCarNumber() {
-		return ordCarNumber;
-	}
-
-	public void setOrdCarNumber(Integer ordCarNumber) {
-		this.ordCarNumber = ordCarNumber;
-	}
-
-	public String getCarParkCode() {
-		return carParkCode;
-	}
-
-	public void setCarParkCode(String carParkCode) {
-		this.carParkCode = carParkCode;
-	}
-
-	public String getStartStationName() {
-		return startStationName;
-	}
-
-	public void setStartStationName(String startStationName) {
-		this.startStationName = startStationName;
-	}
-
-	public String getStartStationFirstTime() {
-		return startStationFirstTime;
-	}
-
-	public void setStartStationFirstTime(String startStationFirstTime) {
-		this.startStationFirstTime = startStationFirstTime;
-	}
-
-	public String getStartStationEndTime() {
-		return startStationEndTime;
-	}
-
-	public void setStartStationEndTime(String startStationEndTime) {
-		this.startStationEndTime = startStationEndTime;
-	}
-
-	public String getEndStationName() {
-		return endStationName;
-	}
-
-	public void setEndStationName(String endStationName) {
-		this.endStationName = endStationName;
-	}
-
-	public String getEndStationFirstTime() {
-		return endStationFirstTime;
-	}
-
-	public void setEndStationFirstTime(String endStationFirstTime) {
-		this.endStationFirstTime = endStationFirstTime;
-	}
-
-	public String getEndStationEndTime() {
-		return endStationEndTime;
-	}
-
-	public void setEndStationEndTime(String endStationEndTime) {
-		this.endStationEndTime = endStationEndTime;
-	}
-
-	public String getCompany() {
-		return company;
-	}
-
-	public void setCompany(String company) {
-		this.company = company;
-	}
-
-	public String getBrancheCompany() {
-		return brancheCompany;
-	}
-
-	public void setBrancheCompany(String brancheCompany) {
-		this.brancheCompany = brancheCompany;
-	}
-
-	public String getNature() {
-		return nature;
-	}
-
-	public void setNature(String nature) {
-		this.nature = nature;
-	}
-
-	public String getLevel() {
-		return level;
-	}
-
-	public void setLevel(String level) {
-		this.level = level;
-	}
-
-	public double getLength() {
-		return length;
-	}
-
-	public void setLength(double length) {
-		this.length = length;
-	}
-
-	public String getChargeName() {
-		return chargeName;
-	}
-
-	public void setChargeName(String chargeName) {
-		this.chargeName = chargeName;
-	}
-
-	public String getTelephone() {
-		return telephone;
-	}
-
-	public void setTelephone(String telephone) {
-		this.telephone = telephone;
-	}
-
-	public Integer getDestroy() {
-		return destroy;
-	}
-
-	public void setDestroy(Integer destroy) {
-		this.destroy = destroy;
-	}
-
-	public Integer getSupperLine() {
-		return supperLine;
-	}
-
-	public void setSupperLine(Integer supperLine) {
-		this.supperLine = supperLine;
-	}
-
-	public String getStartPhone() {
-		return startPhone;
-	}
-
-	public void setStartPhone(String startPhone) {
-		this.startPhone = startPhone;
-	}
-
-	public String getEndPhone() {
-		return endPhone;
-	}
-
-	public void setEndPhone(String endPhone) {
-		this.endPhone = endPhone;
-	}
-
-	public Date getOpenDate() {
-		return openDate;
-	}
-
-	public void setOpenDate(Date openDate) {
-		this.openDate = openDate;
-	}
-
-	public String getHistory() {
-		return history;
-	}
-
-	public void setHistory(String history) {
-		this.history = history;
-	}
-
-	public String getShanghaiLinecode() {
-		return shanghaiLinecode;
-	}
-
-	public void setShanghaiLinecode(String shanghaiLinecode) {
-		this.shanghaiLinecode = shanghaiLinecode;
-	}
-
-	public String getEqLinecode() {
-		return eqLinecode;
-	}
-
-	public void setEqLinecode(String eqLinecode) {
-		this.eqLinecode = eqLinecode;
-	}
-
-	public String getDescriptions() {
-		return descriptions;
-	}
-
-	public void setDescriptions(String descriptions) {
-		this.descriptions = descriptions;
-	}
-
-	public Integer getCreateBy() {
-		return createBy;
-	}
-
-	public void setCreateBy(Integer createBy) {
-		this.createBy = createBy;
-	}
-
-	public Integer getUpdateBy() {
-		return updateBy;
-	}
-
-	public void setUpdateBy(Integer updateBy) {
-		this.updateBy = updateBy;
-	}
-
-	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 getInUse() { return inUse; }
-
-	public void setInUse(Integer inUse) { this.inUse = inUse; }
-
-    public String getCgsbm() {
-        return cgsbm;
-    }
-
-    public void setCgsbm(String cgsbm) {
-        this.cgsbm = cgsbm;
-    }
-
-	public Integer getSfyy() {
-		return sfyy;
-	}
-
-	public void setSfyy(Integer sfyy) {
-		this.sfyy = sfyy;
-	}
-
-	public Integer getRegion() {
-		return region;
-	}
-
-	public void setRegion(Integer region) {
-		this.region = region;
-	}
-
-	public Integer getRemove() {
-		return remove;
-	}
-
-	public void setRemove(Integer remove) {
-		this.remove = remove;
-	}
-}
+package com.bsth.entity;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import org.hibernate.annotations.Formula;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 
+ * @ClassName: Line(线路实体类)
+ * 
+ * @Description: TODO(线路)
+ * 
+ * @Author bsth@lq
+ * 
+ * @Date 2016-4-11 16:06:17
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Entity
+@Table(name = "bsth_c_line")
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
+public class Line implements Serializable {
+	
+	@Id
+	/** 线路ID 主键(唯一标识符) int length(11) */
+	private Integer id;
+	
+	/** 线路名称  varchar length(50) 不能为空 */
+	private String name;
+	
+	/** 线路编码 varchar length(50) 不能为空 */ 
+	private String lineCode;
+
+	/** 英文名  varchar length(50)  */
+	private String es;
+
+	/** 简称 varchar length(50) */ 
+	private String shortName;
+	
+	/** 起始站名称 varchar length(50) 不能为空 
+	 *  该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的起点站。默认使用该字段填写值 */ 
+	private String  startStationName;
+	
+	/** 终点站名称 varchar length(50) 不能为空 
+	 *  该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的起点站。默认使用该字段填写值 */
+	private String endStationName;
+	
+	/** 起始站首班车时间 00:00 上海公交APP中某个接口所需要的字段值 varchar length(50) 不能为空 */
+	private String startStationFirstTime;
+	
+	/** 起始站末班车时间 00:00 上海公交APP中某个接口所需要的字段值 varchar length(50) 不能为空 */
+	private String startStationEndTime;
+	
+	/** 终点站首班时间 00:00 上海公交APP中某个接口所需要的字段值 varchar length(50) 不能为空*/
+	private String endStationFirstTime;
+		
+	/** 终点站末班时间 00:00 上海公交APP中某个接口所需要的字段值 */
+	private String endStationEndTime;
+	
+	/** 所属公司 varchar length(50) */ 
+	private String company;
+
+	/** 分公司  varchar length(50)*/
+	private String brancheCompany;
+
+    /** 组合公司分公司编码 */
+    @Formula(" concat(company, '_', branche_company) ")
+    private String cgsbm;
+
+	/** 性质(线路类型) varchar length(50) */
+	private String nature;
+
+	/** 线路等级 varchar length(50) */
+	private String level;
+	
+	/** 线路长度 */ 
+	private double length;
+	
+	/** 线路负责人 varchar length(50) */ 
+	private String chargeName;
+	
+	/** 负责人电话 varchar length(50) */ 
+	private String telephone;
+	
+	/** 是否撤销 <1:是;0:否> bit length(50) */ 
+	private Integer destroy;
+
+	/** 是否夜宵线   <1:是;0:否> bit length(50)*/ 
+	private Integer supperLine;
+	
+	/** 是否营运   <1:是;0:否> bit length(50)*/ 
+	private Integer sfyy;
+
+	/** 线路区域 <0：区内，1：区外> bit length(1)*/
+	private Integer region;
+
+	/** 起始调度电话 varchar length(50) */
+	private String startPhone;
+
+	/** 终点调度电话  varchar length(50) */
+	private String endPhone;
+
+	/** 开辟日期 date*/
+	@DateTimeFormat(pattern ="yyyy-MM-dd")
+	private Date openDate;
+	
+	/** 大间隔等级 */
+	private Integer spacGrade;
+
+	/** 线路沿革 varchar length(50) */
+	private String history;
+	
+	/** 上海市线路编码 varchar length(50) */
+	private String shanghaiLinecode;
+	
+	/** 设备线路编码 varchar length(50) */
+	private String eqLinecode;
+	
+	/** 配置车辆总数   老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 int length(11)*/
+	private Integer carSumNumber;
+	
+	/** 空调车辆数量   老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 int length(11) */
+	private Integer hvacCarNumber;
+	
+	/** 普通车辆数量   老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 int length(11) */
+	private Integer ordCarNumber;
+	
+	/** 权证车辆数量  报表需要的字段值 */
+	private Integer warrantCar;
+	
+	/** 权证配车启用日期  报表需要的字段值 */
+	private Integer warrantDate;
+	
+	/** 停车场编码   老版本系统字段， 新版本系统业务需求暂时没用到该字段 ，这里暂时留着 int length(11) */
+	private String carParkCode;
+	
+	/** 线路规划类型 <0:双向;1:环线> int length(11) 运管处接口需要的字段 不能为空 */
+	private Integer linePlayType; 
+	
+	/** 描述 varchar length(255) */
+	private String descriptions;
+	
+	/** 创建人 int length(11) */
+	private Integer createBy;
+		
+	/** 修改人 int length(11) */
+	private Integer updateBy;
+	
+	/** 创建日期 timestamp  */
+	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+	private Date createDate;
+	
+	/** 修改日期 timestamp */
+	@Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+	private Date updateDate;
+
+	/** 是否在使用 <1:是;0:否> bit length(50) */
+	private Integer inUse;
+	
+	private Double ticketPrice;
+
+	/**
+	 * 逻辑删除标记 为 1：标识已删除
+	 */
+	private Integer remove = 0;
+	
+	public Integer getSpacGrade() {
+		return spacGrade;
+	}
+
+	public void setSpacGrade(Integer spacGrade) {
+		this.spacGrade = spacGrade;
+	}
+
+	public Integer getWarrantCar() {
+		return warrantCar;
+	}
+
+	public void setWarrantCar(Integer warrantCar) {
+		this.warrantCar = warrantCar;
+	}
+
+	public Integer getWarrantDate() {
+		return warrantDate;
+	}
+
+	public void setWarrantDate(Integer warrantDate) {
+		this.warrantDate = warrantDate;
+	}
+
+	public Integer getLinePlayType() {
+		return linePlayType;
+	}
+
+	public void setLinePlayType(Integer linePlayType) {
+		this.linePlayType = linePlayType;
+	}
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getLineCode() {
+		return lineCode;
+	}
+
+	public void setLineCode(String lineCode) {
+		this.lineCode = lineCode;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getEs() {
+		return es;
+	}
+
+	public void setEs(String es) {
+		this.es = es;
+	}
+
+	public String getShortName() {
+		return shortName;
+	}
+
+	public void setShortName(String shortName) {
+		this.shortName = shortName;
+	}
+
+	public Integer getCarSumNumber() {
+		return carSumNumber;
+	}
+
+	public void setCarSumNumber(Integer carSumNumber) {
+		this.carSumNumber = carSumNumber;
+	}
+
+	public Integer getHvacCarNumber() {
+		return hvacCarNumber;
+	}
+
+	public void setHvacCarNumber(Integer hvacCarNumber) {
+		this.hvacCarNumber = hvacCarNumber;
+	}
+
+	public Integer getOrdCarNumber() {
+		return ordCarNumber;
+	}
+
+	public void setOrdCarNumber(Integer ordCarNumber) {
+		this.ordCarNumber = ordCarNumber;
+	}
+
+	public String getCarParkCode() {
+		return carParkCode;
+	}
+
+	public void setCarParkCode(String carParkCode) {
+		this.carParkCode = carParkCode;
+	}
+
+	public String getStartStationName() {
+		return startStationName;
+	}
+
+	public void setStartStationName(String startStationName) {
+		this.startStationName = startStationName;
+	}
+
+	public String getStartStationFirstTime() {
+		return startStationFirstTime;
+	}
+
+	public void setStartStationFirstTime(String startStationFirstTime) {
+		this.startStationFirstTime = startStationFirstTime;
+	}
+
+	public String getStartStationEndTime() {
+		return startStationEndTime;
+	}
+
+	public void setStartStationEndTime(String startStationEndTime) {
+		this.startStationEndTime = startStationEndTime;
+	}
+
+	public String getEndStationName() {
+		return endStationName;
+	}
+
+	public void setEndStationName(String endStationName) {
+		this.endStationName = endStationName;
+	}
+
+	public String getEndStationFirstTime() {
+		return endStationFirstTime;
+	}
+
+	public void setEndStationFirstTime(String endStationFirstTime) {
+		this.endStationFirstTime = endStationFirstTime;
+	}
+
+	public String getEndStationEndTime() {
+		return endStationEndTime;
+	}
+
+	public void setEndStationEndTime(String endStationEndTime) {
+		this.endStationEndTime = endStationEndTime;
+	}
+
+	public String getCompany() {
+		return company;
+	}
+
+	public void setCompany(String company) {
+		this.company = company;
+	}
+
+	public String getBrancheCompany() {
+		return brancheCompany;
+	}
+
+	public void setBrancheCompany(String brancheCompany) {
+		this.brancheCompany = brancheCompany;
+	}
+
+	public String getNature() {
+		return nature;
+	}
+
+	public void setNature(String nature) {
+		this.nature = nature;
+	}
+
+	public String getLevel() {
+		return level;
+	}
+
+	public void setLevel(String level) {
+		this.level = level;
+	}
+
+	public double getLength() {
+		return length;
+	}
+
+	public void setLength(double length) {
+		this.length = length;
+	}
+
+	public String getChargeName() {
+		return chargeName;
+	}
+
+	public void setChargeName(String chargeName) {
+		this.chargeName = chargeName;
+	}
+
+	public String getTelephone() {
+		return telephone;
+	}
+
+	public void setTelephone(String telephone) {
+		this.telephone = telephone;
+	}
+
+	public Integer getDestroy() {
+		return destroy;
+	}
+
+	public void setDestroy(Integer destroy) {
+		this.destroy = destroy;
+	}
+
+	public Integer getSupperLine() {
+		return supperLine;
+	}
+
+	public void setSupperLine(Integer supperLine) {
+		this.supperLine = supperLine;
+	}
+
+	public String getStartPhone() {
+		return startPhone;
+	}
+
+	public void setStartPhone(String startPhone) {
+		this.startPhone = startPhone;
+	}
+
+	public String getEndPhone() {
+		return endPhone;
+	}
+
+	public void setEndPhone(String endPhone) {
+		this.endPhone = endPhone;
+	}
+
+	public Date getOpenDate() {
+		return openDate;
+	}
+
+	public void setOpenDate(Date openDate) {
+		this.openDate = openDate;
+	}
+
+	public String getHistory() {
+		return history;
+	}
+
+	public void setHistory(String history) {
+		this.history = history;
+	}
+
+	public String getShanghaiLinecode() {
+		return shanghaiLinecode;
+	}
+
+	public void setShanghaiLinecode(String shanghaiLinecode) {
+		this.shanghaiLinecode = shanghaiLinecode;
+	}
+
+	public String getEqLinecode() {
+		return eqLinecode;
+	}
+
+	public void setEqLinecode(String eqLinecode) {
+		this.eqLinecode = eqLinecode;
+	}
+
+	public String getDescriptions() {
+		return descriptions;
+	}
+
+	public void setDescriptions(String descriptions) {
+		this.descriptions = descriptions;
+	}
+
+	public Integer getCreateBy() {
+		return createBy;
+	}
+
+	public void setCreateBy(Integer createBy) {
+		this.createBy = createBy;
+	}
+
+	public Integer getUpdateBy() {
+		return updateBy;
+	}
+
+	public void setUpdateBy(Integer updateBy) {
+		this.updateBy = updateBy;
+	}
+
+	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 getInUse() { return inUse; }
+
+	public void setInUse(Integer inUse) { this.inUse = inUse; }
+
+    public String getCgsbm() {
+        return cgsbm;
+    }
+
+    public void setCgsbm(String cgsbm) {
+        this.cgsbm = cgsbm;
+    }
+
+	public Integer getSfyy() {
+		return sfyy;
+	}
+
+	public void setSfyy(Integer sfyy) {
+		this.sfyy = sfyy;
+	}
+
+	public Integer getRegion() {
+		return region;
+	}
+
+	public void setRegion(Integer region) {
+		this.region = region;
+	}
+
+	public Integer getRemove() {
+		return remove;
+	}
+
+	public void setRemove(Integer remove) {
+		this.remove = remove;
+	}
+
+	public Double getTicketPrice() {
+		return ticketPrice;
+	}
+
+	public void setTicketPrice(Double ticketPrice) {
+		this.ticketPrice = ticketPrice;
+	}
+	
+}
@@ -37,7 +37,9 @@ public class LsStationRoute {
 	private String stationCode;
  
 	// 站点名称
-	private String stationName;
+	private String stationName;	
+	// 站点名称
+	private String stationNameEn;
  
 	// 线路编码
 	private String lineCode;
@@ -282,4 +284,13 @@ public class LsStationRoute {
 	public void setLine(Line line) {
 		this.line = line;
 	}
+
+	public String getStationNameEn() {
+		return stationNameEn;
+	}
+
+	public void setStationNameEn(String stationNameEn) {
+		this.stationNameEn = stationNameEn;
+	}
+	
 }
 \ No newline at end of file
@@ -40,7 +40,9 @@ public class StationRoute {
  
 	// 站点名称
 	private String stationName;
-	
+
+	// 站点名称
+	private String stationNameEn;
 	// 线路编码
 	private String lineCode;
  
@@ -285,4 +287,13 @@ public class StationRoute {
 	public void setLine(Line line) {
 		this.line = line;
 	}
+
+	public String getStationNameEn() {
+		return stationNameEn;
+	}
+
+	public void setStationNameEn(String stationNameEn) {
+		this.stationNameEn = stationNameEn;
+	}
+	
 }
 \ No newline at end of file
-package com.bsth.repository;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.bsth.entity.Line;
-
-/**
- * 
- * @Interface: LineRepository(线路Repository数据持久层接口)
- * 
- * @Extends : BaseRepository
- * 
- * @Description: TODO(线路Repository数据持久层接口)
- * 
- * @Author bsth@lq
- * 
- * @Date 2016年4月28日 上午9:21:17
- *
- * @Version 公交调度系统BS版 0.1
- * 
- */
-@Repository
-public interface LineRepository extends BaseRepository<Line, Integer> {
-
-	/**
-	 * 获取线路编码
-	 * 
-	 * @return int <lineCode：线路编码>
-	 */
-	@Query(value = "  SELECT IFNULL(num,0) as maxId from (SELECT MAX(id) as num FROM bsth_c_line) k ", nativeQuery = true)
-	public long selectMaxIdToLineCode();
-
-	@Query(value = "  SELECT l FROM Line l where l.name like ?1")
-	List<Line> findLine(String line);
-	
-	@Query(value = "  SELECT l FROM Line l where l.lineCode = ?1")
-	List<Line> findLineByCode(String lineCode);
-
-	public Line findByLineCode(String string);
-
-	@Query(value = "  SELECT l FROM Line l where l.company like ?1 and l.brancheCompany like ?2 and l.lineCode like ?3")
-	public List<Line> findLineBygsBm(String gsBm, String fgsBm, String line);
-
-	@Query("SELECT L FROM Line L where L.destroy=0 and L.remove !=1")
-	List<Line> findAllService();
-	
-	@Query("SELECT L FROM Line L")
-	List<Line> findAll();
-
-	@Modifying
-	@Query(value = "UPDATE Line l set l.name=?1 , l.company=?2, l.brancheCompany=?3, "
-			+ "l.level=?4, l.nature=?5, l.startStationName=?6, l.endStationName=?7, l.startStationFirstTime=?8, "
-			+ "l.startStationEndTime=?9, l.endStationFirstTime=?10, l.endStationEndTime=?11, l.linePlayType=?12, "
-			+ "l.openDate=?13, l.es=?14, l.shortName=?15, l.shanghaiLinecode=?16, l.eqLinecode=?17, l.startPhone=?18, "
-			+ "l.endPhone=?19, l.carSumNumber=?20, l.hvacCarNumber=?21, l.ordCarNumber=?22, l.history=?23, "
-			+ "l.descriptions=?24, l.destroy=?25, l.supperLine=?26, l.spacGrade=?27, l.warrantCar=?28, l.region=?30 , l.inUse=?31 where "
-			+ "l.lineCode=?29")
-	int update(String name, String company, String brancheCompany, String level, String nature,
-			String startStationName, String endStationName, String startStationFirstTime, String startStationEndTime,
-			String endStationFirstTime, String endStationEndTime, Integer linePlayType, Date openDate, String es,
-			String shortName, String shanghaiLinecode, String eqLinecode, String startPhone, String endPhone,
-			Integer carSumNumber, Integer hvacCarNumber, Integer ordCarNumber, String history, String descriptions,
-			Integer destroy, Integer supperLine, Integer spacGrade, Integer warrantCar, String lineCode, Integer region, Integer inUser);
-
-	/**
-	 * 查询线路版本文件
-	 * @param lineId
-	 * @return
-	 */
-	@Query(value = "SELECT version_count FROM bsth_c_line_file_version where line = ?1", nativeQuery = true)
-	Integer findfileVersions(Integer lineId);
-
-	/**
-	 *  添加线路文件版本
-	 * @param lineId
-	 * @param line_code
-	 */
-	@Transactional
-	@Modifying
-	@Query(value = "INSERT INTO bsth_c_line_file_version (line,line_code,version_count) VALUES (?1,?2,1)", nativeQuery = true)
-	public void addFileVersions(Integer lineId, String line_code);
-
-	/**
-	 *  线路文件版本修改
-	 * @param lineId
-	 * @param version_count
-	 */
-	@Transactional
-	@Modifying
-	@Query(value = "UPDATE bsth_c_line_file_version set version_count=?2 WHERE line = ?1", nativeQuery = true)
-	public void editFileVersions(Integer lineId, Integer version_count);
-
-}
+package com.bsth.repository;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.bsth.entity.Line;
+
+/**
+ * 
+ * @Interface: LineRepository(线路Repository数据持久层接口)
+ * 
+ * @Extends : BaseRepository
+ * 
+ * @Description: TODO(线路Repository数据持久层接口)
+ * 
+ * @Author bsth@lq
+ * 
+ * @Date 2016年4月28日 上午9:21:17
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+@Repository
+public interface LineRepository extends BaseRepository<Line, Integer> {
+
+	/**
+	 * 获取线路编码
+	 * 
+	 * @return int <lineCode：线路编码>
+	 */
+	@Query(value = "  SELECT IFNULL(num,0) as maxId from (SELECT MAX(id) as num FROM bsth_c_line) k ", nativeQuery = true)
+	public long selectMaxIdToLineCode();
+
+	@Query(value = "  SELECT l FROM Line l where l.name like ?1")
+	List<Line> findLine(String line);
+	
+	@Query(value = "  SELECT l FROM Line l where l.lineCode = ?1")
+	List<Line> findLineByCode(String lineCode);
+
+	public Line findByLineCode(String string);
+
+	@Query(value = "  SELECT l FROM Line l where l.company like ?1 and l.brancheCompany like ?2 and l.lineCode like ?3")
+	public List<Line> findLineBygsBm(String gsBm, String fgsBm, String line);
+
+	@Query("SELECT L FROM Line L where L.destroy=0 and L.remove !=1")
+	List<Line> findAllService();
+	
+	@Query("SELECT L FROM Line L")
+	List<Line> findAll();
+
+	@Modifying
+	@Query(value = "UPDATE Line l set l.name=?1 , l.company=?2, l.brancheCompany=?3, "
+			+ "l.level=?4, l.nature=?5, l.startStationName=?6, l.endStationName=?7, l.startStationFirstTime=?8, "
+			+ "l.startStationEndTime=?9, l.endStationFirstTime=?10, l.endStationEndTime=?11, l.linePlayType=?12, "
+			+ "l.openDate=?13, l.es=?14, l.shortName=?15, l.shanghaiLinecode=?16, l.eqLinecode=?17, l.startPhone=?18, "
+			+ "l.endPhone=?19, l.carSumNumber=?20, l.hvacCarNumber=?21, l.ordCarNumber=?22, l.history=?23, "
+			+ "l.descriptions=?24, l.destroy=?25, l.supperLine=?26, l.spacGrade=?27, l.warrantCar=?28, l.region=?30 , l.inUse=?31 , l.ticketPrice=?32 where "
+			+ "l.lineCode=?29")
+	int update(String name, String company, String brancheCompany, String level, String nature,
+			String startStationName, String endStationName, String startStationFirstTime, String startStationEndTime,
+			String endStationFirstTime, String endStationEndTime, Integer linePlayType, Date openDate, String es,
+			String shortName, String shanghaiLinecode, String eqLinecode, String startPhone, String endPhone,
+			Integer carSumNumber, Integer hvacCarNumber, Integer ordCarNumber, String history, String descriptions,
+			Integer destroy, Integer supperLine, Integer spacGrade, Integer warrantCar, String lineCode, Integer region, Integer inUser, Double ticketPrice);
+
+	/**
+	 * 查询线路版本文件
+	 * @param lineId
+	 * @return
+	 */
+	@Query(value = "SELECT version_count FROM bsth_c_line_file_version where line = ?1", nativeQuery = true)
+	Integer findfileVersions(Integer lineId);
+
+	/**
+	 *  添加线路文件版本
+	 * @param lineId
+	 * @param line_code
+	 */
+	@Transactional
+	@Modifying
+	@Query(value = "INSERT INTO bsth_c_line_file_version (line,line_code,version_count) VALUES (?1,?2,1)", nativeQuery = true)
+	public void addFileVersions(Integer lineId, String line_code);
+
+	/**
+	 *  线路文件版本修改
+	 * @param lineId
+	 * @param version_count
+	 */
+	@Transactional
+	@Modifying
+	@Query(value = "UPDATE bsth_c_line_file_version set version_count=?2 WHERE line = ?1", nativeQuery = true)
+	public void editFileVersions(Integer lineId, Integer version_count);
+
+}
-package com.bsth.repository;
-
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-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 org.springframework.transaction.annotation.Transactional;
-
-import com.bsth.entity.Line;
-import com.bsth.entity.StationRoute;
-
-/**
- * 
- * @Interface: StationRouteRepository(站点路由Repository数据持久层接口)
- * 
- * @Extends : BaseRepository
- * 
- * @Description: TODO(站点路由Repository数据持久层接口)
- * 
- * @Author bsth@lq
- * 
- * @Date 2016年5月03日 上午9:21:17
- *
- * @Version 公交调度系统BS版 0.1
- * 
- */
-
-@Repository
-public interface StationRouteRepository extends BaseRepository<StationRoute, Integer> {
-	
-	@Query(value = "SELECT  a.`stationRoute.id`," +
-						    "a.`stationRoute.line`," +
-						    "a.`stationRoute.station`," +
-							"a.`stationRoute.stationName`," +
-							"a.`stationRoute.stationRouteCode`," +
-							"a.`stationRoute.lineCode`," +
-							"a.`stationRoute.stationMark`," +
-							"a.`stationRoute.outStationNmber`," +
-							"a.`stationRoute.directions`," +
-							"a.`stationRoute.distances`," +
-							"a.`stationRoute.toTime`," +
-							"a.`stationRoute.firstTime`," +
-							"a.`stationRoute.endTime`," +
-							"a.`stationRoute.descriptions`," +
-							"a.`stationRoute.versions`," +
-							"b.id AS 'station.id'," +
-							"b.station_cod AS 'station.stationCod'," +
-							"b.station_name AS 'station.stationName'," +
-							"b.road_coding AS 'station.roadCoding'," +
-							"b.db_type AS 'station.dbType'," +
-							"b.b_jwpoints AS 'station.bJwpoints'," +
-							"b.g_lonx AS 'station.gLonx'," +
-							"b.g_lonx AS 'station.gLaty'," +
-							"b.x AS 'station.x'," +
-							"b.y AS 'station.y'," +
-							"b.shapes_type AS 'station.shapesType'," +
-							"b.radius AS 'station.radius'," +
-							"ST_AsText(b.g_polygon_grid) AS 'station.gPolygonGrid'," +
-							"ST_AsText(b.b_polygon_grid) AS 'station.bPolygonGrid'," +
-							"b.destroy AS 'station.destroy'," +
-							"b.versions AS 'station.versions'," +
-							"b.descriptions AS 'station.descriptions', " +
-							"a.`stationRoute.industryCode` " +
-							" FROM (" +
-								"SELECT r.id AS 'stationRoute.id'," +
-								" r.line AS 'stationRoute.line'," +
-								"r.station AS 'stationRoute.station'," +
-								"r.station_name AS 'stationRoute.stationName'," +
-								"r.station_route_code as 'stationRoute.stationRouteCode'," +
-								"r.line_code AS 'stationRoute.lineCode'," +
-								"r.station_mark AS 'stationRoute.stationMark'," +
-								"r.out_station_nmber AS 'stationRoute.outStationNmber'," +
-								"r.directions AS 'stationRoute.directions'," +
-								"r.distances AS 'stationRoute.distances'," +
-								"r.to_time AS 'stationRoute.toTime'," +
-								"r.first_time AS 'stationRoute.firstTime'," +
-								"r.end_time AS 'stationRoute.endTime'," +
-								"r.descriptions AS 'stationRoute.descriptions'," +
-								"r.versions AS 'stationRoute.versions', " +
-								"r.industry_code AS 'stationRoute.industryCode' " +
-							" FROM bsth_c_stationroute r  WHERE  r.line = ?1 and r.directions = ?2 and r.destroy=0) a " +
-							"LEFT JOIN bsth_c_station b " +
-							"ON a.`stationRoute.station` = b.id ORDER BY a.`stationRoute.stationRouteCode` ASC", nativeQuery=true)
-	List<Object[]> findPoints(int line,int directions);
-	
-	@Query("select r from StationRoute r where r.line.id=?1 and r.destroy=0 order by r.directions ASC ,r.stationRouteCode ASC")
-	// @Query(value = "SELECT * from bsth_c_stationroute line = ?1 and destroy=0 bsth_c_station ORDER BY directions ASC, stationRouteCode ASC", nativeQuery=true)
-	List<StationRoute> findStationExport(int line);
-	
-	/**
-	 * @Description :TODO(查询线路某方向下的站点序号与类型)
-	 * 
-	 * @param map <lineId:线路ID； direction：方向；stationRouteCode：站点编码>
-	 * 
-	 * @return List<Map<String, Object>> 
-	 */
-	@Query(value = "select t.station_route_code,t.station_mark from bsth_c_stationroute t where " +
-			" t.station_route_code =(" +
-				"select  MAX(station_route_code) as stationRouteCode   from bsth_c_stationroute r  WHERE  " +
-					"r.line=?1 and r.directions =?2 and station_route_code< ?3 and r.destroy = 0  ) and t.line=?1 and t.directions = ?2 AND t.destroy = 0", nativeQuery=true)
-	List<Object[]> findUpStationRouteCode(Integer lineId,Integer direction,Integer stationRouteCode);
-
-	/**
-	 * @param version 
-	 * @Description :TODO(查询下个站点)
-	 *
-	 * @param map <lineId:线路ID； direction：方向；stationRouteCode：站点编码>
-	 *
-	 * @return List<Map<String, Object>>
-	 */
-	@Query(value = "SELECT a.stationRouteLine," +
-			" a.stationRouteStation," +
-			" a.stationRouteCode," +
-			" a.stationRouteLIneCode," +
-			" a.stationRouteStationMark," +
-			" a.stationOutStationNmber," +
-			" a.stationRoutedirections," +
-			" a.stationRouteDistances," +
-			" a.stationRouteToTime," +
-			" a.staitonRouteFirstTime," +
-			" a.stationRouteEndTime," +
-			" a.stationRouteDescriptions," +
-			" a.stationRouteDestroy," +
-			" a.stationRouteVersions," +
-			" a.stationRouteCreateBy," +
-			" a.stationRouteCreateDate," +
-			" a.stationRouteUpdateBy," +
-			" a.stationRouteUpdateDate," +
-			" b.id AS stationId," +
-			" b.station_cod AS stationCode," +
-			" a.stationRouteName," +
-			" b.road_coding AS stationRoadCoding," +
-			" b.db_type AS stationDbType," +
-			" b.b_jwpoints AS stationJwpoints," +
-			" b.g_lonx AS stationGlonx," +
-			" b.g_laty AS stationGlaty," +
-			" b.x AS stationX," +
-			" b.y AS stationY," +
-			" ST_AsText(b.b_polygon_grid) as stationBPolyonGrid," +
-			" ST_AsText(b.g_polygon_grid) AS stationGPloyonGrid, " +
-			" b.destroy AS stationDestroy," +
-			" b.radius AS stationRadius," +
-			" b.shapes_type AS stationShapesType," +
-			" b.versions AS stationVersions," +
-			" b.descriptions AS sttationDescriptions," +
-			" b.create_by AS stationCreateBy," +
-			" b.create_date AS stationCreateDate," +
-			" b.update_by AS stationUpdateBy," +
-			" b.update_date AS stationUpdateDate," +
-			" a.stationRouteId, " +
-			" b.station_name as zdmc, " +
-			" a.industryCode"+
-			" 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.industry_code as industryCode," +
-				" s.line_code AS stationRouteLIneCode," +
-				" s.station_mark AS stationRouteStationMark," +
-				" s.out_station_nmber AS stationOutStationNmber," +
-				" s.directions AS stationRoutedirections," +
-				" s.distances AS stationRouteDistances," +
-				" s.to_time AS stationRouteToTime," +
-				" s.first_time AS staitonRouteFirstTime," +
-				" s.end_time AS stationRouteEndTime," +
-				" s.descriptions AS stationRouteDescriptions," +
-				" s.destroy AS stationRouteDestroy," +
-				" s.versions AS stationRouteVersions," +
-				" s.create_by AS stationRouteCreateBy," +
-				" s.create_date AS stationRouteCreateDate," +
-				" s.update_by AS stationRouteUpdateBy," +
-				" s.update_date AS stationRouteUpdateDate FROM bsth_c_ls_stationroute s WHERE s.versions = ?4 and s.station_route_code =(" +
-				"select  MIN(station_route_code) as stationRouteCode   from bsth_c_ls_stationroute r  WHERE  " +
-				"r.line=?1 and r.directions =?2 and station_route_code > ?3 and r.destroy = 0 and versions = ?4 ) and s.line=?1 and s.directions = ?2 AND s.destroy = 0) a " +
-			" LEFT JOIN  bsth_c_station b ON a.stationRouteStation = b.id", nativeQuery=true)
-	List<Object[]> findDownStationRoute(Integer id,Integer direction,Integer stationRouteCode, Integer version);
-
-	/**
-	 * @Description :TODO(站点中心点坐标查询)
-	 * 
-	 * @param map <lineId:线路ID； direction：方向>
-	 * 
-	 * @return List<Object[]>
-	 */
-	/*@Query(value = "SELECT s.b_jwpoints,s.station_name FROM (" +
-						"SELECT b.station FROM bsth_c_stationroute b where b.line =?1 and b.directions = ?2 and b.destroy=0) r " +
-				   "LEFT JOIN bsth_c_station s on r.station = s.id", nativeQuery=true)*/
-	@Query(value = "SELECT s.b_jwpoints,r.station_name,r.station_route_code FROM (" +
-			"SELECT b.station,b.station_route_code,b.station_name FROM bsth_c_stationroute b where b.line =?1 and b.directions = ?2 and b.destroy=0) r " +
-	   "LEFT JOIN bsth_c_station s on r.station = s.id order by r.station_route_code asc", nativeQuery=true)
-	List<Object[]> getSelectStationRouteCenterPoints(Integer lineId,Integer direction);
-	
-	/**
-	 * @Description :TODO(撤销站点)
-	 * 
-	 * @param map <lineId:线路ID； destroy：是否撤销（0：否；1：是）>
-	 * 
-	 */
-	@Transactional
-    @Modifying
-	@Query(value="UPDATE bsth_c_stationroute SET " +
-				"destroy = ?2 WHERE id = ?1", nativeQuery=true)
-	void stationRouteIsDestroyUpd(Integer stationRouteId, Integer destroy);
-	
-	
-	/**
-	 * @Description : TODO(根据线路ID生成行单)
-	 * 
-	 * @param  lineId:线路ID 
-	 * 
-	 * @return List<Object[]>：{[0]：g_lonx（GPS经度）；[1]：g_laty（GPS纬度）；[2]：b_jwpoints（百度经纬度坐标）
-	 * 							
-	 * 							[3]：station_mark（站点类型）；[4]：station_route_code（站点序号）；[5]：station_cod（站点编码）；
-	 * 
-	 * 							[6]：distances（站点距离）；[7]：station_name（站点名称）；[8]：directions（方向）}
-	 */
-	@Query(value = "SELECT * FROM ("+
-				   "SELECT b.g_lonx," +
-				   "b.g_laty,b.b_jwpoints," +
-				   "a.station_mark," +
-				   "a.station_route_code," +
-				   "b.station_cod," +
-				   "a.distances,"+
-				   "a.station_name," +
-				   "a.directions FROM (SELECT " +
-				   "s.station_mark," +
-				   "s.station_route_code," +
-				   "s.directions," +
-				   "s.distances,"+
-				   "s.station_name,"+
-				   "s.station FROM bsth_c_stationroute s where  s.line = ?1 and s.destroy=0) a " +
-				   "LEFT JOIN bsth_c_station b " +
-				   " on a.station = b.id ORDER BY a.directions ASC ) k ORDER BY k.directions,k.station_route_code ASC", nativeQuery=true)
-	List<Object[]> usingSingle(Integer lineId);
-	
-	/**
-	 * @Description : TODO(根据站点路由Id查询详情)
-	 * 
-	 * @param  id:站点路由ID 
-	 * 
-	 * @return List<Object[]>
-	 */
-	@Query(value = "SELECT a.stationRouteLine," +
-			" a.stationRouteStation," +
-			" a.stationRouteCode," +
-			" a.stationRouteLIneCode," +
-			" a.stationRouteStationMark," +
-			" a.stationOutStationNmber," +
-			" a.stationRoutedirections," +
-			" a.stationRouteDistances," +
-			" a.stationRouteToTime," +
-			" a.staitonRouteFirstTime," +
-			" a.stationRouteEndTime," +
-			" a.stationRouteDescriptions," +
-			" a.stationRouteDestroy," +
-			" a.stationRouteVersions," +
-			" a.stationRouteCreateBy," +
-			" a.stationRouteCreateDate," +
-			" a.stationRouteUpdateBy," +
-			" a.stationRouteUpdateDate," +
-			" b.id AS stationId," +
-			" b.station_cod AS stationCode," +
-			" a.stationRouteName," +
-			" b.road_coding AS stationRoadCoding," +
-			" b.db_type AS stationDbType," +
-			" b.b_jwpoints AS stationJwpoints," +
-			" b.g_lonx AS stationGlonx," +
-			" b.g_laty AS stationGlaty," +
-			" b.x AS stationX," +
-			" b.y AS stationY," +
-			" ST_AsText(b.b_polygon_grid) as stationBPolyonGrid," +
-			" ST_AsText(b.g_polygon_grid) AS stationGPloyonGrid, " +
-			" b.destroy AS stationDestroy," +
-			" b.radius AS stationRadius," +
-			" b.shapes_type AS stationShapesType," +
-			" b.versions AS stationVersions," +
-			" b.descriptions AS sttationDescriptions," +
-			" b.create_by AS stationCreateBy," +
-			" b.create_date AS stationCreateDate," +
-			" b.update_by AS stationUpdateBy," +
-			" b.update_date AS stationUpdateDate," +
-			" a.stationRouteId,b.station_name as zdmc, " +
-			" a.industryCode "+
-			" 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.industry_code as industryCode," +
-				" s.line_code AS stationRouteLIneCode," +
-				" s.station_mark AS stationRouteStationMark," +
-				" s.out_station_nmber AS stationOutStationNmber," +
-				" s.directions AS stationRoutedirections," +
-				" s.distances AS stationRouteDistances," +
-				" s.to_time AS stationRouteToTime," +
-				" s.first_time AS staitonRouteFirstTime," +
-				" s.end_time AS stationRouteEndTime," +
-				" s.descriptions AS stationRouteDescriptions," +
-				" s.destroy AS stationRouteDestroy," +
-				" s.versions AS stationRouteVersions," +
-				" s.create_by AS stationRouteCreateBy," +
-				" s.create_date AS stationRouteCreateDate," +
-				" s.update_by AS stationRouteUpdateBy," +
-				" s.update_date AS stationRouteUpdateDate FROM bsth_c_stationroute s WHERE s.id = ?1 ) a " +
-			" LEFT JOIN  bsth_c_station b ON a.stationRouteStation = b.id", nativeQuery=true)
-	List<Object[]> findStationRouteInfo(Integer id);
-
-	/**
-	 * @Description : TODO(根据站点路由Id查询详情)
-	 *
-	 * @param  id:站点路由ID
-	 *
-	 * @return List<Object[]>
-	 */
-	@Query(value = "SELECT a.stationRouteLine," +
-			" a.stationRouteStation," +
-			" a.stationRouteCode," +
-			" a.stationRouteLIneCode," +
-			" a.stationRouteStationMark," +
-			" a.stationOutStationNmber," +
-			" a.stationRoutedirections," +
-			" a.stationRouteDistances," +
-			" a.stationRouteToTime," +
-			" a.staitonRouteFirstTime," +
-			" a.stationRouteEndTime," +
-			" a.stationRouteDescriptions," +
-			" a.stationRouteDestroy," +
-			" a.stationRouteVersions," +
-			" a.stationRouteCreateBy," +
-			" a.stationRouteCreateDate," +
-			" a.stationRouteUpdateBy," +
-			" a.stationRouteUpdateDate," +
-			" b.id AS stationId," +
-			" b.station_cod AS stationCode," +
-			" a.stationRouteName," +
-			" b.road_coding AS stationRoadCoding," +
-			" b.db_type AS stationDbType," +
-			" b.b_jwpoints AS stationJwpoints," +
-			" b.g_lonx AS stationGlonx," +
-			" b.g_laty AS stationGlaty," +
-			" b.x AS stationX," +
-			" b.y AS stationY," +
-			" ST_AsText(b.b_polygon_grid) as stationBPolyonGrid," +
-			" ST_AsText(b.g_polygon_grid) AS stationGPloyonGrid, " +
-			" b.destroy AS stationDestroy," +
-			" b.radius AS stationRadius," +
-			" b.shapes_type AS stationShapesType," +
-			" b.versions AS stationVersions," +
-			" b.descriptions AS sttationDescriptions," +
-			" b.create_by AS stationCreateBy," +
-			" b.create_date AS stationCreateDate," +
-			" b.update_by AS stationUpdateBy," +
-			" b.update_date AS stationUpdateDate," +
-			" a.stationRouteId," +
-			"b.station_name as zdmc, "+
-			"a.industryCode "+
-			" 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.industry_code as industryCode," +
-				" s.line_code AS stationRouteLIneCode," +
-				" s.station_mark AS stationRouteStationMark," +
-				" s.out_station_nmber AS stationOutStationNmber," +
-				" s.directions AS stationRoutedirections," +
-				" s.distances AS stationRouteDistances," +
-				" s.to_time AS stationRouteToTime," +
-				" s.first_time AS staitonRouteFirstTime," +
-				" s.end_time AS stationRouteEndTime," +
-				" s.descriptions AS stationRouteDescriptions," +
-				" s.destroy AS stationRouteDestroy," +
-				" s.versions AS stationRouteVersions," +
-				" s.create_by AS stationRouteCreateBy," +
-				" s.create_date AS stationRouteCreateDate," +
-				" s.update_by AS stationRouteUpdateBy," +
-				" s.update_date AS stationRouteUpdateDate FROM bsth_c_stationroute s WHERE s.line = ?1 and s.directions = ?2 and s.destroy = 0) a " +
-			" LEFT JOIN  bsth_c_station b ON a.stationRouteStation = b.id order by a.stationRouteCode", nativeQuery=true)
-	List<Object[]> getStationRouteList(Integer lineId, Integer dir);
-
-	List<StationRoute> findByLine(Line line);
-	
-	@EntityGraph(value = "stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
-	@Query("select s from StationRoute s where s.destroy=0")
-	List<StationRoute> findAllEffective();
-
-	@EntityGraph(value = "stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
-    @Override
-	Page<StationRoute> findAll(Specification<StationRoute> spec, Pageable pageable);
-
-	@EntityGraph(value = "stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
-	@Override
-	List<StationRoute> findAll(Specification<StationRoute> spec);
-
-	@EntityGraph(value = "stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
-	@Override
-	List<StationRoute> findAll(Specification<StationRoute> spec, Sort sort);
-
-	@EntityGraph(value = "stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
-	@Override
-	@Query(value = "select r from StationRoute r where r.destroy=0")
-	List<StationRoute> findAll();
-
-	@Query("select new map(sr.station.id as stationid, sr.stationName as stationname) from StationRoute sr where sr.line.id=?1 and sr.directions=?2")
-    List<Map<String, Object>> findStations(Integer xlid, Integer xldir);
-    
-	@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);
-	
-	@Query("select r from StationRoute r where r.lineCode=?1 and r.directions=?2 and versions is not null order by r.destroy, r.stationRouteCode")
-	List<StationRoute> findAllByLine(String lineCode, int updown);
-	
-	@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);
-
-	@Query("SELECT new map(" +
-			"lineCode as lineCode,directions as directions,stationName as stationName,stationCode as stationCode," +
-			"line.linePlayType as linePlayType,s.stationMark as stationMark) " +
-			"FROM " +
-			"StationRoute s " +
-			"WHERE " +
-			"s.destroy = 0 " +
-			"and s.lineCode in(select lineCode from Line where inUse = 1) " +
-			"ORDER BY " +
-			"lineCode,directions,stationRouteCode")
-	List<Map<String, String>> findLineWithYgcAndInuse();
-
-	@Query("SELECT new map(" +
-			"lineCode as lineCode,directions as directions,stationName as stationName,stationCode as stationCode," +
-			"line.linePlayType as linePlayType,s.stationMark as stationMark) " +
-			"FROM " +
-			"StationRoute s " +
-			"WHERE " +
-			"s.destroy = 0 " +
-			"ORDER BY " +
-			"lineCode,directions,stationRouteCode")
-	List<Map<String, String>> findAllLineWithYgc();
-
-	@Query("SELECT new map(" +
-			"lineCode as lineCode,directions as directions,stationName as stationName,stationCode as stationCode," +
-			"line.linePlayType as linePlayType,s.stationMark as stationMark) " +
-			"FROM " +
-			"StationRoute s " +
-			"WHERE " +
-			"s.destroy = 0 and s.lineCode = ?1 " +
-			"ORDER BY " +
-			"lineCode,directions,stationRouteCode")
-	List<Map<String, String>> findLineWithYgcByLine(String lineCode);
-	
-    @Modifying
-    @Query(value="update bsth_c_stationroute set directions = case directions when 1 then 0 when 0 then 1 end where line = ?1 ", nativeQuery=true)
-	void stationRouteDir(Integer line);
-    
-    @Modifying
-    @Query(value="update bsth_c_stationroute set distances =?2 where id = ?1 ", nativeQuery=true)
-	void upddis(Integer id,Double dis);
-    
-    @Modifying
-	@Query(value="UPDATE bsth_c_stationroute  set station_route_code = (station_route_code+10) where line = ?1  and directions = ?2 and station_route_code >=?3 and destroy = 0", nativeQuery=true)
-	void stationUpdStationRouteCode(Integer line,Integer dir,Integer routeCod);
-    
-    /**
-     * 更新路线前撤销线路原有站点
-     * 
-     * @param line
-     * @param dir
-     */
-    @Modifying
-    @Query(value="UPDATE bsth_c_stationroute  set destroy = 1 where line = ?1  and directions = ?2", nativeQuery=true)
-    void stationRouteUpdDestroy(Integer line,Integer dir);
-    
-    @Modifying
-   	@Query(value="UPDATE bsth_c_stationroute set destroy = 1 where id = ?1", nativeQuery=true)
-   	void stationRouteIsDestroyUpdBatch(Integer ids);
-    
-    /**
-     * 
-     * 
-     * @param line
-     * @param dir
-     */
-    @Modifying
-    @Query(value="insert into (select * from bsth_c_stationroute_cache where line = ?1  and directions = ?2) bsth_c_stationroute", nativeQuery=true)
-    void stationRouteUpdate(Integer line,Integer dir);
-
-    // 更具线路批量撤销
-    @Modifying
-    @Query(value="UPDATE StationRoute sr set sr.destroy = 1 where sr.line.id = ?1  and sr.lineCode = ?2")
-	void batchUpdate(Integer lineId, String lineCode);
-
-    // 批量删除    
-    @Modifying
-    @Query(value="delete from StationRoute sr where sr.line.id = ?1  and sr.lineCode = ?2")
-	void batchDelete(Integer lineId, String lineCode);
-
-
-    // 批量修改站点行业编码
-	@Modifying
-	@Query(value="update bsth_c_stationroute set industry_code =?2 where id = ?1 ", nativeQuery=true)
-	void updIndustryCode(Integer id,String IndustryCode);
-}
+package com.bsth.repository;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+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 org.springframework.transaction.annotation.Transactional;
+
+import com.bsth.entity.Line;
+import com.bsth.entity.StationRoute;
+
+/**
+ * 
+ * @Interface: StationRouteRepository(站点路由Repository数据持久层接口)
+ * 
+ * @Extends : BaseRepository
+ * 
+ * @Description: TODO(站点路由Repository数据持久层接口)
+ * 
+ * @Author bsth@lq
+ * 
+ * @Date 2016年5月03日 上午9:21:17
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Repository
+public interface StationRouteRepository extends BaseRepository<StationRoute, Integer> {
+	
+	@Query(value = "SELECT  a.`stationRoute.id`," +
+						    "a.`stationRoute.line`," +
+						    "a.`stationRoute.station`," +
+							"a.`stationRoute.stationName`," +
+							"a.`stationRoute.stationRouteCode`," +
+							"a.`stationRoute.lineCode`," +
+							"a.`stationRoute.stationMark`," +
+							"a.`stationRoute.outStationNmber`," +
+							"a.`stationRoute.directions`," +
+							"a.`stationRoute.distances`," +
+							"a.`stationRoute.toTime`," +
+							"a.`stationRoute.firstTime`," +
+							"a.`stationRoute.endTime`," +
+							"a.`stationRoute.descriptions`," +
+							"a.`stationRoute.versions`," +
+							"b.id AS 'station.id'," +
+							"b.station_cod AS 'station.stationCod'," +
+							"b.station_name AS 'station.stationName'," +
+							"b.road_coding AS 'station.roadCoding'," +
+							"b.db_type AS 'station.dbType'," +
+							"b.b_jwpoints AS 'station.bJwpoints'," +
+							"b.g_lonx AS 'station.gLonx'," +
+							"b.g_lonx AS 'station.gLaty'," +
+							"b.x AS 'station.x'," +
+							"b.y AS 'station.y'," +
+							"b.shapes_type AS 'station.shapesType'," +
+							"b.radius AS 'station.radius'," +
+							"ST_AsText(b.g_polygon_grid) AS 'station.gPolygonGrid'," +
+							"ST_AsText(b.b_polygon_grid) AS 'station.bPolygonGrid'," +
+							"b.destroy AS 'station.destroy'," +
+							"b.versions AS 'station.versions'," +
+							"b.descriptions AS 'station.descriptions', " +
+							"a.`stationRoute.industryCode` " +
+							" FROM (" +
+								"SELECT r.id AS 'stationRoute.id'," +
+								" r.line AS 'stationRoute.line'," +
+								"r.station AS 'stationRoute.station'," +
+								"r.station_name AS 'stationRoute.stationName'," +
+								"r.station_route_code as 'stationRoute.stationRouteCode'," +
+								"r.line_code AS 'stationRoute.lineCode'," +
+								"r.station_mark AS 'stationRoute.stationMark'," +
+								"r.out_station_nmber AS 'stationRoute.outStationNmber'," +
+								"r.directions AS 'stationRoute.directions'," +
+								"r.distances AS 'stationRoute.distances'," +
+								"r.to_time AS 'stationRoute.toTime'," +
+								"r.first_time AS 'stationRoute.firstTime'," +
+								"r.end_time AS 'stationRoute.endTime'," +
+								"r.descriptions AS 'stationRoute.descriptions'," +
+								"r.versions AS 'stationRoute.versions', " +
+								"r.industry_code AS 'stationRoute.industryCode' " +
+							" FROM bsth_c_stationroute r  WHERE  r.line = ?1 and r.directions = ?2 and r.destroy=0) a " +
+							"LEFT JOIN bsth_c_station b " +
+							"ON a.`stationRoute.station` = b.id ORDER BY a.`stationRoute.stationRouteCode` ASC", nativeQuery=true)
+	List<Object[]> findPoints(int line,int directions);
+	
+	@Query("select r from StationRoute r where r.line.id=?1 and r.destroy=0 order by r.directions ASC ,r.stationRouteCode ASC")
+	// @Query(value = "SELECT * from bsth_c_stationroute line = ?1 and destroy=0 bsth_c_station ORDER BY directions ASC, stationRouteCode ASC", nativeQuery=true)
+	List<StationRoute> findStationExport(int line);
+	
+	/**
+	 * @Description :TODO(查询线路某方向下的站点序号与类型)
+	 * 
+	 * @param map <lineId:线路ID； direction：方向；stationRouteCode：站点编码>
+	 * 
+	 * @return List<Map<String, Object>> 
+	 */
+	@Query(value = "select t.station_route_code,t.station_mark from bsth_c_stationroute t where " +
+			" t.station_route_code =(" +
+				"select  MAX(station_route_code) as stationRouteCode   from bsth_c_stationroute r  WHERE  " +
+					"r.line=?1 and r.directions =?2 and station_route_code< ?3 and r.destroy = 0  ) and t.line=?1 and t.directions = ?2 AND t.destroy = 0", nativeQuery=true)
+	List<Object[]> findUpStationRouteCode(Integer lineId,Integer direction,Integer stationRouteCode);
+
+	/**
+	 * @param version 
+	 * @Description :TODO(查询下个站点)
+	 *
+	 * @param map <lineId:线路ID； direction：方向；stationRouteCode：站点编码>
+	 *
+	 * @return List<Map<String, Object>>
+	 */
+	@Query(value = "SELECT a.stationRouteLine," +
+			" a.stationRouteStation," +
+			" a.stationRouteCode," +
+			" a.stationRouteLIneCode," +
+			" a.stationRouteStationMark," +
+			" a.stationOutStationNmber," +
+			" a.stationRoutedirections," +
+			" a.stationRouteDistances," +
+			" a.stationRouteToTime," +
+			" a.staitonRouteFirstTime," +
+			" a.stationRouteEndTime," +
+			" a.stationRouteDescriptions," +
+			" a.stationRouteDestroy," +
+			" a.stationRouteVersions," +
+			" a.stationRouteCreateBy," +
+			" a.stationRouteCreateDate," +
+			" a.stationRouteUpdateBy," +
+			" a.stationRouteUpdateDate," +
+			" b.id AS stationId," +
+			" b.station_cod AS stationCode," +
+			" a.stationRouteName," +
+			" b.road_coding AS stationRoadCoding," +
+			" b.db_type AS stationDbType," +
+			" b.b_jwpoints AS stationJwpoints," +
+			" b.g_lonx AS stationGlonx," +
+			" b.g_laty AS stationGlaty," +
+			" b.x AS stationX," +
+			" b.y AS stationY," +
+			" ST_AsText(b.b_polygon_grid) as stationBPolyonGrid," +
+			" ST_AsText(b.g_polygon_grid) AS stationGPloyonGrid, " +
+			" b.destroy AS stationDestroy," +
+			" b.radius AS stationRadius," +
+			" b.shapes_type AS stationShapesType," +
+			" b.versions AS stationVersions," +
+			" b.descriptions AS sttationDescriptions," +
+			" b.create_by AS stationCreateBy," +
+			" b.create_date AS stationCreateDate," +
+			" b.update_by AS stationUpdateBy," +
+			" b.update_date AS stationUpdateDate," +
+			" a.stationRouteId, " +
+			" b.station_name as zdmc, " +
+			" a.industryCode"+
+			" 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.industry_code as industryCode," +
+				" s.line_code AS stationRouteLIneCode," +
+				" s.station_mark AS stationRouteStationMark," +
+				" s.out_station_nmber AS stationOutStationNmber," +
+				" s.directions AS stationRoutedirections," +
+				" s.distances AS stationRouteDistances," +
+				" s.to_time AS stationRouteToTime," +
+				" s.first_time AS staitonRouteFirstTime," +
+				" s.end_time AS stationRouteEndTime," +
+				" s.descriptions AS stationRouteDescriptions," +
+				" s.destroy AS stationRouteDestroy," +
+				" s.versions AS stationRouteVersions," +
+				" s.create_by AS stationRouteCreateBy," +
+				" s.create_date AS stationRouteCreateDate," +
+				" s.update_by AS stationRouteUpdateBy," +
+				" s.update_date AS stationRouteUpdateDate FROM bsth_c_ls_stationroute s WHERE s.versions = ?4 and s.station_route_code =(" +
+				"select  MIN(station_route_code) as stationRouteCode   from bsth_c_ls_stationroute r  WHERE  " +
+				"r.line=?1 and r.directions =?2 and station_route_code > ?3 and r.destroy = 0 and versions = ?4 ) and s.line=?1 and s.directions = ?2 AND s.destroy = 0) a " +
+			" LEFT JOIN  bsth_c_station b ON a.stationRouteStation = b.id", nativeQuery=true)
+	List<Object[]> findDownStationRoute(Integer id,Integer direction,Integer stationRouteCode, Integer version);
+
+	/**
+	 * @Description :TODO(站点中心点坐标查询)
+	 * 
+	 * @param map <lineId:线路ID； direction：方向>
+	 * 
+	 * @return List<Object[]>
+	 */
+	/*@Query(value = "SELECT s.b_jwpoints,s.station_name FROM (" +
+						"SELECT b.station FROM bsth_c_stationroute b where b.line =?1 and b.directions = ?2 and b.destroy=0) r " +
+				   "LEFT JOIN bsth_c_station s on r.station = s.id", nativeQuery=true)*/
+	@Query(value = "SELECT s.b_jwpoints,r.station_name,r.station_route_code FROM (" +
+			"SELECT b.station,b.station_route_code,b.station_name FROM bsth_c_stationroute b where b.line =?1 and b.directions = ?2 and b.destroy=0) r " +
+	   "LEFT JOIN bsth_c_station s on r.station = s.id order by r.station_route_code asc", nativeQuery=true)
+	List<Object[]> getSelectStationRouteCenterPoints(Integer lineId,Integer direction);
+	
+	/**
+	 * @Description :TODO(撤销站点)
+	 * 
+	 * @param map <lineId:线路ID； destroy：是否撤销（0：否；1：是）>
+	 * 
+	 */
+	@Transactional
+    @Modifying
+	@Query(value="UPDATE bsth_c_stationroute SET " +
+				"destroy = ?2 WHERE id = ?1", nativeQuery=true)
+	void stationRouteIsDestroyUpd(Integer stationRouteId, Integer destroy);
+	
+	
+	/**
+	 * @Description : TODO(根据线路ID生成行单)
+	 * 
+	 * @param  lineId:线路ID 
+	 * 
+	 * @return List<Object[]>：{[0]：g_lonx（GPS经度）；[1]：g_laty（GPS纬度）；[2]：b_jwpoints（百度经纬度坐标）
+	 * 							
+	 * 							[3]：station_mark（站点类型）；[4]：station_route_code（站点序号）；[5]：station_cod（站点编码）；
+	 * 
+	 * 							[6]：distances（站点距离）；[7]：station_name（站点名称）；[8]：directions（方向）}
+	 */
+	@Query(value = "SELECT * FROM ("+
+				   "SELECT b.g_lonx," +
+				   "b.g_laty,b.b_jwpoints," +
+				   "a.station_mark," +
+				   "a.station_route_code," +
+				   "b.station_cod," +
+				   "a.distances,"+
+				   "a.station_name," +
+				   "a.directions," + 
+				   "a.station_name_en FROM (SELECT " +
+				   "s.station_mark," +
+				   "s.station_route_code," +
+				   "s.directions," +
+				   "s.distances,"+
+				   "s.station_name,"+
+				   "s.station_name_en,"+
+				   "s.station FROM bsth_c_stationroute s where s.line = ?1 and s.destroy=0) a " +
+				   "LEFT JOIN bsth_c_station b " +
+				   " on a.station = b.id ORDER BY a.directions ASC ) k ORDER BY k.directions,k.station_route_code ASC", nativeQuery=true)
+	List<Object[]> usingSingle(Integer lineId);
+	
+	/**
+	 * @Description : TODO(根据站点路由Id查询详情)
+	 * 
+	 * @param  id:站点路由ID 
+	 * 
+	 * @return List<Object[]>
+	 */
+	@Query(value = "SELECT a.stationRouteLine," +
+			" a.stationRouteStation," +
+			" a.stationRouteCode," +
+			" a.stationRouteLIneCode," +
+			" a.stationRouteStationMark," +
+			" a.stationOutStationNmber," +
+			" a.stationRoutedirections," +
+			" a.stationRouteDistances," +
+			" a.stationRouteToTime," +
+			" a.staitonRouteFirstTime," +
+			" a.stationRouteEndTime," +
+			" a.stationRouteDescriptions," +
+			" a.stationRouteDestroy," +
+			" a.stationRouteVersions," +
+			" a.stationRouteCreateBy," +
+			" a.stationRouteCreateDate," +
+			" a.stationRouteUpdateBy," +
+			" a.stationRouteUpdateDate," +
+			" b.id AS stationId," +
+			" b.station_cod AS stationCode," +
+			" a.stationRouteName," +
+			" b.road_coding AS stationRoadCoding," +
+			" b.db_type AS stationDbType," +
+			" b.b_jwpoints AS stationJwpoints," +
+			" b.g_lonx AS stationGlonx," +
+			" b.g_laty AS stationGlaty," +
+			" b.x AS stationX," +
+			" b.y AS stationY," +
+			" ST_AsText(b.b_polygon_grid) as stationBPolyonGrid," +
+			" ST_AsText(b.g_polygon_grid) AS stationGPloyonGrid, " +
+			" b.destroy AS stationDestroy," +
+			" b.radius AS stationRadius," +
+			" b.shapes_type AS stationShapesType," +
+			" b.versions AS stationVersions," +
+			" b.descriptions AS sttationDescriptions," +
+			" b.create_by AS stationCreateBy," +
+			" b.create_date AS stationCreateDate," +
+			" b.update_by AS stationUpdateBy," +
+			" b.update_date AS stationUpdateDate," +
+			" a.stationRouteId,b.station_name as zdmc, " +
+			" a.industryCode "+
+			" 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.industry_code as industryCode," +
+				" s.line_code AS stationRouteLIneCode," +
+				" s.station_mark AS stationRouteStationMark," +
+				" s.out_station_nmber AS stationOutStationNmber," +
+				" s.directions AS stationRoutedirections," +
+				" s.distances AS stationRouteDistances," +
+				" s.to_time AS stationRouteToTime," +
+				" s.first_time AS staitonRouteFirstTime," +
+				" s.end_time AS stationRouteEndTime," +
+				" s.descriptions AS stationRouteDescriptions," +
+				" s.destroy AS stationRouteDestroy," +
+				" s.versions AS stationRouteVersions," +
+				" s.create_by AS stationRouteCreateBy," +
+				" s.create_date AS stationRouteCreateDate," +
+				" s.update_by AS stationRouteUpdateBy," +
+				" s.update_date AS stationRouteUpdateDate FROM bsth_c_stationroute s WHERE s.id = ?1 ) a " +
+			" LEFT JOIN  bsth_c_station b ON a.stationRouteStation = b.id", nativeQuery=true)
+	List<Object[]> findStationRouteInfo(Integer id);
+
+	/**
+	 * @Description : TODO(根据站点路由Id查询详情)
+	 *
+	 * @param  id:站点路由ID
+	 *
+	 * @return List<Object[]>
+	 */
+	@Query(value = "SELECT a.stationRouteLine," +
+			" a.stationRouteStation," +
+			" a.stationRouteCode," +
+			" a.stationRouteLIneCode," +
+			" a.stationRouteStationMark," +
+			" a.stationOutStationNmber," +
+			" a.stationRoutedirections," +
+			" a.stationRouteDistances," +
+			" a.stationRouteToTime," +
+			" a.staitonRouteFirstTime," +
+			" a.stationRouteEndTime," +
+			" a.stationRouteDescriptions," +
+			" a.stationRouteDestroy," +
+			" a.stationRouteVersions," +
+			" a.stationRouteCreateBy," +
+			" a.stationRouteCreateDate," +
+			" a.stationRouteUpdateBy," +
+			" a.stationRouteUpdateDate," +
+			" b.id AS stationId," +
+			" b.station_cod AS stationCode," +
+			" a.stationRouteName," +
+			" b.road_coding AS stationRoadCoding," +
+			" b.db_type AS stationDbType," +
+			" b.b_jwpoints AS stationJwpoints," +
+			" b.g_lonx AS stationGlonx," +
+			" b.g_laty AS stationGlaty," +
+			" b.x AS stationX," +
+			" b.y AS stationY," +
+			" ST_AsText(b.b_polygon_grid) as stationBPolyonGrid," +
+			" ST_AsText(b.g_polygon_grid) AS stationGPloyonGrid, " +
+			" b.destroy AS stationDestroy," +
+			" b.radius AS stationRadius," +
+			" b.shapes_type AS stationShapesType," +
+			" b.versions AS stationVersions," +
+			" b.descriptions AS sttationDescriptions," +
+			" b.create_by AS stationCreateBy," +
+			" b.create_date AS stationCreateDate," +
+			" b.update_by AS stationUpdateBy," +
+			" b.update_date AS stationUpdateDate," +
+			" a.stationRouteId," +
+			"b.station_name as zdmc, "+
+			"a.industryCode "+
+			" 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.industry_code as industryCode," +
+				" s.line_code AS stationRouteLIneCode," +
+				" s.station_mark AS stationRouteStationMark," +
+				" s.out_station_nmber AS stationOutStationNmber," +
+				" s.directions AS stationRoutedirections," +
+				" s.distances AS stationRouteDistances," +
+				" s.to_time AS stationRouteToTime," +
+				" s.first_time AS staitonRouteFirstTime," +
+				" s.end_time AS stationRouteEndTime," +
+				" s.descriptions AS stationRouteDescriptions," +
+				" s.destroy AS stationRouteDestroy," +
+				" s.versions AS stationRouteVersions," +
+				" s.create_by AS stationRouteCreateBy," +
+				" s.create_date AS stationRouteCreateDate," +
+				" s.update_by AS stationRouteUpdateBy," +
+				" s.update_date AS stationRouteUpdateDate FROM bsth_c_stationroute s WHERE s.line = ?1 and s.directions = ?2 and s.destroy = 0) a " +
+			" LEFT JOIN  bsth_c_station b ON a.stationRouteStation = b.id order by a.stationRouteCode", nativeQuery=true)
+	List<Object[]> getStationRouteList(Integer lineId, Integer dir);
+
+	List<StationRoute> findByLine(Line line);
+	
+	@EntityGraph(value = "stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
+	@Query("select s from StationRoute s where s.destroy=0")
+	List<StationRoute> findAllEffective();
+
+	@EntityGraph(value = "stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
+    @Override
+	Page<StationRoute> findAll(Specification<StationRoute> spec, Pageable pageable);
+
+	@EntityGraph(value = "stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
+	@Override
+	List<StationRoute> findAll(Specification<StationRoute> spec);
+
+	@EntityGraph(value = "stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
+	@Override
+	List<StationRoute> findAll(Specification<StationRoute> spec, Sort sort);
+
+	@EntityGraph(value = "stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
+	@Override
+	@Query(value = "select r from StationRoute r where r.destroy=0")
+	List<StationRoute> findAll();
+
+	@Query("select new map(sr.station.id as stationid, sr.stationName as stationname) from StationRoute sr where sr.line.id=?1 and sr.directions=?2")
+    List<Map<String, Object>> findStations(Integer xlid, Integer xldir);
+    
+	@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);
+	
+	@Query("select r from StationRoute r where r.lineCode=?1 and r.directions=?2 and versions is not null order by r.destroy, r.stationRouteCode")
+	List<StationRoute> findAllByLine(String lineCode, int updown);
+	
+	@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);
+
+	@Query("SELECT new map(" +
+			"lineCode as lineCode,directions as directions,stationName as stationName,stationCode as stationCode," +
+			"line.linePlayType as linePlayType,s.stationMark as stationMark) " +
+			"FROM " +
+			"StationRoute s " +
+			"WHERE " +
+			"s.destroy = 0 " +
+			"and s.lineCode in(select lineCode from Line where inUse = 1) " +
+			"ORDER BY " +
+			"lineCode,directions,stationRouteCode")
+	List<Map<String, String>> findLineWithYgcAndInuse();
+
+	@Query("SELECT new map(" +
+			"lineCode as lineCode,directions as directions,stationName as stationName,stationCode as stationCode," +
+			"line.linePlayType as linePlayType,s.stationMark as stationMark) " +
+			"FROM " +
+			"StationRoute s " +
+			"WHERE " +
+			"s.destroy = 0 " +
+			"ORDER BY " +
+			"lineCode,directions,stationRouteCode")
+	List<Map<String, String>> findAllLineWithYgc();
+
+	@Query("SELECT new map(" +
+			"lineCode as lineCode,directions as directions,stationName as stationName,stationCode as stationCode," +
+			"line.linePlayType as linePlayType,s.stationMark as stationMark) " +
+			"FROM " +
+			"StationRoute s " +
+			"WHERE " +
+			"s.destroy = 0 and s.lineCode = ?1 " +
+			"ORDER BY " +
+			"lineCode,directions,stationRouteCode")
+	List<Map<String, String>> findLineWithYgcByLine(String lineCode);
+	
+    @Modifying
+    @Query(value="update bsth_c_stationroute set directions = case directions when 1 then 0 when 0 then 1 end where line = ?1 ", nativeQuery=true)
+	void stationRouteDir(Integer line);
+    
+    @Modifying
+    @Query(value="update bsth_c_stationroute set distances =?2 where id = ?1 ", nativeQuery=true)
+	void upddis(Integer id,Double dis);
+    
+    @Modifying
+	@Query(value="UPDATE bsth_c_stationroute  set station_route_code = (station_route_code+10) where line = ?1  and directions = ?2 and station_route_code >=?3 and destroy = 0", nativeQuery=true)
+	void stationUpdStationRouteCode(Integer line,Integer dir,Integer routeCod);
+    
+    /**
+     * 更新路线前撤销线路原有站点
+     * 
+     * @param line
+     * @param dir
+     */
+    @Modifying
+    @Query(value="UPDATE bsth_c_stationroute  set destroy = 1 where line = ?1  and directions = ?2", nativeQuery=true)
+    void stationRouteUpdDestroy(Integer line,Integer dir);
+    
+    @Modifying
+   	@Query(value="UPDATE bsth_c_stationroute set destroy = 1 where id = ?1", nativeQuery=true)
+   	void stationRouteIsDestroyUpdBatch(Integer ids);
+    
+    /**
+     * 
+     * 
+     * @param line
+     * @param dir
+     */
+    @Modifying
+    @Query(value="insert into (select * from bsth_c_stationroute_cache where line = ?1  and directions = ?2) bsth_c_stationroute", nativeQuery=true)
+    void stationRouteUpdate(Integer line,Integer dir);
+
+    // 更具线路批量撤销
+    @Modifying
+    @Query(value="UPDATE StationRoute sr set sr.destroy = 1 where sr.line.id = ?1  and sr.lineCode = ?2")
+	void batchUpdate(Integer lineId, String lineCode);
+
+    // 批量删除    
+    @Modifying
+    @Query(value="delete from StationRoute sr where sr.line.id = ?1  and sr.lineCode = ?2")
+	void batchDelete(Integer lineId, String lineCode);
+
+
+    // 批量修改站点行业编码
+	@Modifying
+	@Query(value="update bsth_c_stationroute set industry_code =?2 where id = ?1 ", nativeQuery=true)
+	void updIndustryCode(Integer id,String IndustryCode);
+}
@@ -94,7 +94,7 @@ public class LineServiceImpl extends BaseServiceImpl&lt;Line, Integer&gt; implements L
 				l.getOpenDate(), l.getEs(), l.getShortName(), l.getShanghaiLinecode(), l.getEqLinecode(),
 				l.getStartPhone(), l.getEndPhone(), l.getCarSumNumber(), l.getHvacCarNumber(), l.getOrdCarNumber(),
 				l.getHistory(), l.getDescriptions(), l.getDestroy(), l.getSupperLine(), l.getSpacGrade(),
-				l.getWarrantCar(), l.getLineCode(), l.getRegion(),l.getInUse());
+				l.getWarrantCar(), l.getLineCode(), l.getRegion(),l.getInUse(),l.getTicketPrice());
 		if (status==1) {
 			map.put("status", ResponseCode.SUCCESS);
 		} else {
 package com.bsth.service.impl;
  
 import com.bsth.common.ResponseCode;
+import com.bsth.entity.Business;
 import com.bsth.entity.Line;
 import com.bsth.entity.LsStationRoute;
 import com.bsth.entity.Station;
@@ -8,6 +9,7 @@ import com.bsth.entity.StationMatchData;
 import com.bsth.entity.StationRoute;
 import com.bsth.entity.StationRouteCache;
 import com.bsth.entity.search.CustomerSpecs;
+import com.bsth.repository.BusinessRepository;
 import com.bsth.repository.LineRepository;
 import com.bsth.repository.LsSectionRouteRepository;
 import com.bsth.repository.LsStationRouteRepository;
@@ -88,6 +90,9 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 	@Autowired
 	private StationRepository stationRepository;
  
+	@Autowired
+	private BusinessRepository businessRepository;
+
     @Autowired
     private LsStationRouteRepository lsStationRouteRepository;
  
@@ -851,6 +856,10 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 			Integer lineId = map.get("lineId").equals("") ? 0 : Integer.parseInt(map.get("lineId").toString());
 			/** 查询线路信息 @param：<lineId：线路ID> */
 			Line line = lineRepository.findById(lineId).get();
+			
+			
+			Business company = businessRepository.findByBusinessCode(line.getBrancheCompany()).get(0);
+			
 			Integer fileVersions = lineRepository.findfileVersions(lineId);
 			if(fileVersions == null) {
 				lineRepository.addFileVersions(line.getId(), line.getLineCode());
@@ -884,6 +893,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				/** 如果已存在相同行单文件名则先删除 */
 				clientUtils.deleteFtpFile(url, port, username, password, remotePath, odlGzFileName);
 				clientUtils.deleteFtpFile(url, port, username, password, remotePath, textFileName);
+				clientUtils.deleteFtpFile(url, port, username, password, remotePath + "/voice/", textFileName);
 				String textStr = "";
 //				boolean tempTag = ishxType(objects);
 				Integer linePlayType = line.getLinePlayType() == null ? -1:line.getLinePlayType();
@@ -893,7 +903,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 					textStr = newTextFileToFTP(objects,lineId);/** 双向行单文件内容 @param：<objects：站点路由；lineId：线路ID>*/
 				else
 					resultMap.put("status","NOLinePlayType");// 线路无线路规划类型
-				textStr = line.getName() + " " + fileVersions + "\r" + textStr;
+				
+				textStr = line.getName() + " " + fileVersions + "\r\n" + textStr;
 				InputStream input = new ByteArrayInputStream(textStr.getBytes("gbk"));
 				/** 生成txt文件，上传ftp */
 				clientUtils.uploadFile(url, port, username, password, remotePath, textFileName, input);
@@ -908,6 +919,21 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				// 删除文件
 				textFile.delete();
 				targetFile.delete();
+				
+
+				textStr = newTextVoiceFileToFTP(objects,lineId);
+				
+				String head = line.getName() + " " + fileVersions + " " + line.getStartStationFirstTime() + "-" + line.getStartStationEndTime() + " " + line.getEndStationFirstTime() + "-" + line.getEndStationEndTime() + " " + (line.getTicketPrice() == null ? "-" : line.getTicketPrice()) +  " " + company.getBusinessName() + " " + (company.getPhoneNum()== null ? "-" : company.getPhoneNum());
+				
+				textStr =  head +"\r\n" + textStr;
+
+				input = new ByteArrayInputStream(textStr.getBytes("gbk"));
+				
+				clientUtils.uploadFile(url, port, username, password, remotePath + "/voice/", textFileName, input);
+
+//				textFile.delete();
+				
+				
 				resultMap.put("status", ResponseCode.SUCCESS);
 			}else {
 				resultMap.put("status","NOTDATA");
@@ -959,9 +985,9 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		// 返回值String
 		String stationRStr = "";
 		// windows下的文本文件换行符
-		//String enterStr = "\r\n";
+		String enterStr = "\r\n";
 		// linux/unix下的文本文件换行符
-		String enterStr = "\r";
+//		String enterStr = "\r";
 		int defaultZdxh = 0;
 		if(objects.size()>0) {
 			for(int i = 0; i<objects.size();i++) {
@@ -1064,12 +1090,129 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
  
 	}
  
+	public String  newTextVoiceFileToFTP(List<Object[]> objects,Integer lineId) {
+
+		// 返回值String
+		String stationRStr = "";
+		// windows下的文本文件换行符
+		String enterStr = "\r\n";
+		// linux/unix下的文本文件换行符
+//		String enterStr = "\r";
+		int defaultZdxh = 0;
+		if(objects.size()>0) {
+			for(int i = 0; i<objects.size();i++) {
+				defaultZdxh ++ ;
+				// 经度
+				String lng = objects.get(i)[0].equals("") ? "0" : objects.get(i)[0].toString();
+				
+				// 纬度
+				String lat = objects.get(i)[1].equals("") ? "0" : objects.get(i)[1].toString();
+				
+				Point point = new Point(Double.valueOf(lng), Double.valueOf(lat));
+				
+				lat = "\t" +  lat;
+				
+				// 站点类型
+				String stationMakeStr =  objects.get(i)[3].equals("") ? "" : objects.get(i)[3].toString();
+				
+				String stationMake = "";
+				
+				if(stationMakeStr.equals("E")) {
+					stationMake = "\t2";
+				}else {
+					stationMake ="\t1";
+				}
+				
+				// 站点序号 
+				// String stationNo =  objects.get(i)[4].equals("") ? "" : objects.get(i)[4].toString();
+				String stationNo =  String.valueOf(defaultZdxh);
+				
+				stationNo = "\t" + stationNo;
+				
+				// 站点编码
+				String stationCode = objects.get(i)[5].equals("") ? "" : objects.get(i)[5].toString();
+				
+				int len = stationCode.length();
+				if(len<8) {
+					int dx = 8 - len;
+					String addStr = "";
+					for(int p =0;p<dx;p++) {
+						addStr  = addStr + "0";
+					}
+					stationCode = addStr + stationCode;
+				}else if(len>8){
+					stationCode = stationCode.substring(8);
+				}
+				
+				stationCode =  "\t" +stationCode;
+				
+				double dis = objects.get(i)[6]==null  ? 0.0 : Double.parseDouble(objects.get(i)[6].toString())*1000;
+				
+				String tempDistc = String.valueOf((int) dis);
+				
+				// 站点距离
+				String staitondistance = "\t" + tempDistc;
+				
+				// 站点名称
+				String stationName =  objects.get(i)[7].equals("") ? "" : objects.get(i)[7].toString();
+				
+				String stationNameEn = " ";
+				if(objects.get(i)[9] != null){
+					stationNameEn =  objects.get(i)[9].equals("") ? "" : objects.get(i)[9].toString();
+				}
+				
+				
+				stationName = "\t" +stationName;
+				stationNameEn = "\t" +stationNameEn;
+				
+				// 限速
+				// String sleepStr = " " + "60";
+				
+				// 限速
+				String sleepStr = "";
+				// 方向
+				int directions = objects.get(i)[8]==null ? null : Integer.valueOf(objects.get(i)[8].toString());
+				/** 获取路段路由信息 @pararm：<lineId：线路ID；directions：方向> */
+				List<Object[]> sobje = routeRepository.sectionRouteVector(lineId,directions);
+				if(sobje.size()==1) {
+					double dsleepStrt = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(0)[2].toString());
+					sleepStr =  "\t" +  new DecimalFormat("0").format(dsleepStrt);
+//					int dsleepStr = sobje.get(0)[2] == null || sobje.get(0)[2].equals("") ? 60 : Integer.valueOf(sobje.get(0)[2].toString());
+//					sleepStr =  "\t" +  String.valueOf(dsleepStr);
+				}else if(sobje.size()>1){
+					for(int j =0;j<sobje.size();j++) {
+						double dsleepStrt = sobje.get(j)[2] == null || sobje.get(j)[2].equals("") ? 60d : Double.valueOf(sobje.get(j)[2].toString());
+						String pointsStr = sobje.get(j)[1]==null || sobje.get(j)[1].equals("") ? null : sobje.get(j)[1].toString();
+						pointsStr = pointsStr.substring(11, pointsStr.length()-1);
+						List<Point> ps = new ArrayList<>();
+						String[] pArray = pointsStr.split(",");
+						for(int a = 0; a <pArray.length; a++) {
+							String[] tmepA = pArray[a].split(" ");
+							Point temp = new Point(Double.valueOf(tmepA[0]), Double.valueOf(tmepA[1]));
+							ps.add(temp);
+						}
+						if(GeoUtils.isInSection(ps, point)) {
+							sleepStr = "\t" + String.valueOf((int)dsleepStrt);
+							break;
+						}
+					}
+				}
+				if(sleepStr.equals("")) 
+					sleepStr  =  "\t" + "60";
+				stationRStr = stationRStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + stationName + stationNameEn + enterStr;
+			}
+			
+		}
+		return stationRStr;
+	
+	}
+	
 	public String hxTextFileToFtp(List<Object[]> objects,Integer lineId) {
 		String restStr = "";
 		// windows下的文本文件换行符
-		//String enterStr = "\r\n";
+		String enterStr = "\r\n";
 		// linux/unix下的文本文件换行符
-		String enterStr = "\r";
+//		String enterStr = "\r";
 		int xh = 1 ;
 		for(int x =0;x<2;x++) {
 			for(int i = 0; i<objects.size();i++) {
@@ -843,6 +843,9 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			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 stationNameEn = map.get("stationNameEn").equals("") ? null : map.get("stationNameEn").toString();
+			
 			// 说明
 			String descriptions = map.get("descriptions").equals("") ? "" : map.get("descriptions").toString();
 			// 站点编码
@@ -935,6 +938,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 				arg0.setLine(resultLine);
 				arg0.setLineCode(resultLine.getLineCode());
 				arg0.setIndustryCode(industryCode);
+				arg0.setStationNameEn(stationNameEn);
 				// 站点
 				arg0.setStation(station);
 				// 站点路由名称
@@ -968,6 +972,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 				Double toTime = map.get("toTime").equals("") ? 0.0d : Double.parseDouble(map.get("toTime").toString());
 				// 站点路由名称
 				String stationName = map.get("stationName").equals("") ? "" : map.get("stationName").toString();
+				arg0.setStationNameEn(stationNameEn);
 				// 线路ID
 				int line = map.get("lineId").equals("") ? 0 : Integer.parseInt(map.get("lineId").toString());
 				// 线路信息
@@ -1210,6 +1215,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			String zdmc = map.get("zdmc").equals("") ? "" : map.get("zdmc").toString();
 			// 站点名称
 			String stationRouteName = map.get("stationName").equals("") ? "" : map.get("stationName").toString();
+			// 站点名称
+			String stationNameEn = map.get("stationNameEn").equals("") ? "" : map.get("stationNameEn").toString();
 			// 所在道路编码
 			String roadCoding = map.get("roadCoding").equals("") ? "" : map.get("roadCoding").toString();
 			// 经纬坐标类型
@@ -1307,6 +1314,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
  
 				StationRoute stationRoute = new StationRoute();
 				stationRoute.setStationName(stationRouteName);
+				stationRoute.setStationNameEn(stationNameEn);
 				stationRoute.setId(stationRouteId);
 				stationRoute.setStationRouteCode(stationRouteCode);
 				stationRoute.setStation(station);
@@ -1345,6 +1353,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
  
 				LsStationRoute stationRoute = new LsStationRoute();
 				stationRoute.setStationName(stationRouteName);
+				stationRoute.setStationNameEn(stationNameEn);
 				stationRoute.setId(stationRouteId);
 				stationRoute.setStationRouteCode(stationRouteCode);
 				stationRoute.setStation(station);
-<!-- 片段标题 START -->
-<div class="page-head">
-    <div class="page-title">
-        <h1>添加线路</h1>
-    </div>
-</div>
-<!-- 片段标题 END -->
-
-<!-- 线路信息导航栏组件 START -->
-<ul class="page-breadcrumb breadcrumb">
-    <li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
-    <li><span class="active">基础信息</span> <i class="fa fa-circle"></i></li>
-    <li><a href="/pages/base/line/list.html" data-pjax>线路信息</a> <i class="fa fa-circle"></i></li>
-    <li><span class="active">添加线路</span></li>
-</ul>
-<!-- 线路信息导航栏组件 END -->
-
-<!-- 信息容器组件 START -->
-<div class="portlet light bordered">
-
-    <!-- 信息容器组件标题 START -->
-    <div class="portlet-title">
-        <div class="caption">
-            <i class="icon-equalizer font-red-sunglo"></i>
-            <span class="caption-subject font-red-sunglo bold uppercase">添加线路</span>
-        </div>
-    </div>
-    <!-- 信息容器组件标题 END -->
-
-    <!-- 表单容器组件 START -->
-    <div class="portlet-body form">
-
-        <!-- line_add_form FORM START -->
-        <form action="/line" class="form-horizontal" id="line_add_form">
-
-            <!-- 表单验证错误提示组件 START -->
-            <div class="alert alert-danger display-hide">
-                <button class="close" data-close="alert"></button>
-                您的输入有误，请检查下面的输入项
-            </div>
-            <!-- 表单验证错误提示组件 END -->
-
-            <!-- 表单字段内容 START -->
-            <div class="form-body">
-
-                <!-- 表单分组组件 form-group START -->
-                <div class="form-group">
-                    <!-- 线路编码 (* 必填项) START -->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5">
-                            <span class="required"> * </span>线路编码&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
-                        </label>
-                        <div class="col-md-4">
-                            <input type="text" class="form-control" name="lineCode" id="lineCodeInput"
-                                   placeholder="线路编码">
-                        </div>
-                    </div>
-                    <!-- 线路编码 (* 必填项) END -->
-
-                    <!-- 线路名称  (* 必填项) START -->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5">
-                            <span class="required"> * </span>线路名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
-                        </label>
-                        <div class="col-md-4">
-                            <input type="text" class="form-control" name="name" id="nameInput" placeholder="线路名称"/>
-                            <span class="help-block"> 例如 :浦东88路 </span>
-                        </div>
-                    </div>
-                    <!-- 线路名称  (* 必填项) END -->
-                </div>
-
-                <!-- 表单分组组件 form-group START -->
-                <div class="form-group">
-                    <!-- 所属公司 START 在片段线路添加JS模块里初始化select(options值查询的公司表) -->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5">
-                            <span class="required"> * </span>所属公司&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
-                        </label>
-                        <div class="col-md-4">
-                            <select name="company" class="form-control" id="companySelect"></select>
-                        </div>
-                    </div>
-                    <!-- 所属公司 END -->
-
-                    <!-- 所属分公司 START 在片段线路添加JS模块里初始化select(options值查询的公司表) -->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5">
-                            <span class="required"> * </span>所属分公司&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
-                        </label>
-                        <div class="col-md-4">
-                            <select name="brancheCompany" class="form-control" id="brancheCompanySelect"></select>
-                        </div>
-                    </div>
-                    <!-- 所属分公司 END -->
-                </div>
-                <!-- 表单分组组件 form-group END -->
-
-                <!-- 表单分组组件 form-group START -->
-                <div class="form-group">
-                    <!-- 线路等级 START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5">
-                            <span class="required"> * </span>线路等级&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
-                        </label>
-                        <div class="col-md-4">
-                            <select name="level" class="form-control" id="levelSelect">
-                                <option value="">-- 请选择线路等级 --</option>
-                                <option value="1">一级线路</option>
-                                <option value="2">二级线路</option>
-                                <option value="0">未知等级</option>
-                            </select>
-                        </div>
-                    </div>
-                    <!-- 线路等级 END -->
-
-                    <!-- 线路性质  START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5">
-                            <span class="required"> * </span>线路性质&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
-                        </label>
-                        <div class="col-md-4">
-                            <select name="nature" class="form-control" id="natureSelect">
-                                <option value="">-- 请选择线路性质 --</option>
-                                <option value="lj">路救</option>
-                                <option value="bc">备车</option>
-                                <option value="dbc">定班车</option>
-                                <option value="yxl">夜宵路</option>
-                                <option value="cgxl">常规线路</option>
-                                <option value="gjxl">过江线路</option>
-                                <option value="csbs">穿梭巴士</option>
-                                <option value="tyxl">特约线路</option>
-                                <option value="cctxl">村村通线路</option>
-                                <option value="hlwgj">互联网公交</option>
-                                <option value="qt">其他</option>
-                            </select>
-                        </div>
-                    </div>
-                    <!-- 线路性质  END -->
-                </div>
-                <!-- 表单分组组件 form-group END -->
-
-                <!-- 表单分组组件 form-group START -->
-                <div class="form-group">
-                    <!-- 是否宵夜 START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5">
-                            <span class="required"> * </span>是否宵夜&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
-                        </label>
-                        <div class="col-md-4">
-                            <div class="md-radio-inline">
-                                <div class="md-radio">
-                                    <input type="radio" id="radio16" name="supperLine" class="md-radiobtn" value="1"
-                                           data-title="是">
-                                    <label for="radio16">
-                                        <span></span>
-                                        <span class="check"></span>
-                                        <span class="box"></span> 是
-                                    </label>
-                                </div>
-                                <div class="md-radio has-error">
-                                    <input type="radio" id="radio17" name="supperLine" class="md-radiobtn" value="0"
-                                           data-title="否" checked="checked">
-                                    <label for="radio17" style="color:#FFC0CB">
-                                        <span></span>
-                                        <span class="check"></span>
-                                        <span class="box"></span> 否
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <!-- 是否宵夜 END -->
-
-                    <!-- 是否撤销 START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5">
-                            <span class="required"> * </span>是否撤销&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
-                        </label>
-                        <div class="col-md-4">
-                            <div class="md-radio-inline">
-                                <div class="md-radio">
-                                    <input type="radio" id="radio14" name="destroy" data-title="是" class="md-radiobtn"
-                                           value="1">
-                                    <label for="radio14">
-                                        <span></span>
-                                        <span class="check"></span>
-                                        <span class="box"></span> 是
-                                    </label>
-                                </div>
-                                <div class="md-radio has-error">
-                                    <input type="radio" id="radio15" name="destroy" class="md-radiobtn" data-title="否"
-                                           value="0" checked="checked">
-                                    <label for="radio15" style="color:#FFC0CB">
-                                        <span></span>
-                                        <span class="check"></span>
-                                        <span class="box"></span> 否
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <!-- 是否撤销 START -->
-                </div>
-                <!-- 表单分组组件 form-group END -->
-
-                <!-- 表单分组组件 form-group START -->
-                <div class="form-group">
-                    <!-- 是否营运START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5">
-                            <span class="required"> * </span>是否营运线路&nbsp;&nbsp;&nbsp;&nbsp;:
-                        </label>
-                        <div class="col-md-4">
-                            <div class="md-radio-inline">
-                                <div class="md-radio">
-                                    <input type="radio" id="radio18" name="sfyy" class="md-radiobtn" value="1"
-                                           data-title="是" checked="checked">
-                                    <label for="radio18">
-                                        <span></span>
-                                        <span class="check"></span>
-                                        <span class="box"></span> 是
-                                    </label>
-                                </div>
-                                <div class="md-radio has-error">
-                                    <input type="radio" id="radio19" name="sfyy" class="md-radiobtn" value="0"
-                                           data-title="否">
-                                    <label for="radio19" style="color:#FFC0CB">
-                                        <span></span>
-                                        <span class="check"></span>
-                                        <span class="box"></span> 否
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <!-- 是否营运 END -->
-                    <!-- 权证车辆数 START -->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5">
-                            权证车辆数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
-                        <div class="col-md-4">
-                            <input type="text" class="form-control" name="warrantCar" id="warrantCarInput"
-                                   placeholder="权证车辆数">
-                        </div>
-                    </div>
-                    <!-- 权证车辆数 END -->
-
-                </div>
-                <!-- 表单分组组件 form-group END -->
-
-                <!-- 表单分组组件 form-group START -->
-                <div class="form-group">
-                    <!-- 起始站名称 START (该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的起点站。默认使用该字段填写值) -->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5"><span class="required"> * </span>
-                            起始站名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
-                        </label>
-                        <div class="col-md-4">
-                            <input type="text" class="form-control" name="startStationName" id="startStationNameInput"
-                                   placeholder="起始站名称">
-                            <span class="help-block"> 说明 :上行起始站名称 </span>
-                        </div>
-                    </div>
-                    <!-- 起始站名称 END -->
-
-                    <!-- 终点站名称 START  (该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的终点站。默认使用该字段填写值) -->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5"><span class="required"> * </span> 终点站名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
-                        </label>
-                        <div class="col-md-4">
-                            <input type="text" class="form-control" name="endStationName" id="endStationNameInput"
-                                   placeholder="终点站名称">
-                            <span class="help-block"> 说明 :上行终点站名称 </span>
-                        </div>
-                    </div>
-                    <!-- 终点站名称 END -->
-                </div>
-                <!-- 表单分组组件 form-group END -->
-
-                <!-- 表单分组组件 form-group START -->
-                <div class="form-group">
-                    <!-- 起始站首班车时间 (* 必填项)  START -->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5"><span class="required"> * </span> 起始站首班时间: </label>
-                        <div class="col-md-4">
-                            <input type="text" class="form-control" name="startStationFirstTime"
-                                   id="startStationFirstTimeInput" placeholder="起始站首班车时间">
-                            <span class="help-block"> 例如 :06:00 </span>
-                        </div>
-                    </div>
-                    <!-- 起始站首班车时间  END -->
-
-                    <!-- 起始站末班车时间 (* 必填项)  START -->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5"><span class="required"> * </span> 起始站末班时间: </label>
-                        <div class="col-md-4">
-                            <!-- <input type="text" class="form-control" name="StartStationEndTime" id="StartStationEndTimeInput" placeholder="起始站末班车时间 "> -->
-                            <input type="text" class="form-control" name="startStationEndTime" id="endTimeInput"
-                                   placeholder="起始站末班车时间">
-                            <span class="help-block"> 例如 :17:00 </span>
-                        </div>
-                    </div>
-                    <!-- 起始站末班车时间 END -->
-                </div>
-                <!-- 表单分组组件 form-group END -->
-
-                <!-- 表单分组组件 form-group START -->
-                <div class="form-group">
-                    <!-- 终点站首班车时间 (* 必填项)  START -->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5"><span class="required"> * </span> 终点站首班时间: </label>
-                        <div class="col-md-4">
-                            <input type="text" class="form-control" name="endStationFirstTime"
-                                   id="endStationFirstTimeInput" placeholder="终点站首班车时间">
-                            <span class="help-block"> 例如 :05:00 </span>
-                        </div>
-                    </div>
-                    <!-- 终点站首班车时间 END -->
-
-                    <!-- 终点站末班车时间 (* 必填项)  START -->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5"><span class="required"> * </span> 终点站末班时间: </label>
-                        <div class="col-md-4">
-                            <input type="text" class="form-control" name="endStationEndTime" id="endStationEndTimeInput"
-                                   placeholder="终点站末班车时间 ">
-                            <span class="help-block"> 例如 :18:00 </span>
-                        </div>
-                    </div>
-                    <!-- 终点站末班车时间 END -->
-                </div>
-                <!-- 表单分组组件 form-group END -->
-
-                <!-- 表单分组组件 form-group START -->
-                <div class="form-group">
-                    <!-- 线路规划类型 (* 必填项) START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5"><span class="required"> * </span> 线路规划类型&nbsp;&nbsp;&nbsp;:</label>
-                        <div class="col-md-4">
-                            <select name="linePlayType" class="form-control" id="linePlayTypeSelect">
-                                <!--<option value="">&#45;&#45; 请选择线路类型 &#45;&#45;</option>-->
-                                <option value="0">双向（包括双环线）</option>
-                                <option value="1">单环线</option>
-                            </select>
-                        </div>
-                    </div>
-                    <!-- 线路规划类型 (* 必填项) END -->
-
-                    <!--车辆区域 START　-->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5"> <span class="required"> * </span>线路区域&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
-                        </label>
-                        <div class="col-md-4">
-                            <select name="region" class="form-control" id="regionSelect">
-                                <!--<option value="">&#45;&#45; 请选择车辆区域 &#45;&#45;</option>-->
-                                <option value="0">区内</option>
-                                <option value="1">区外</option>
-                            </select>
-                        </div>
-                    </div>
-                    <!--车辆区域END　-->
-
-                </div>
-                <!-- 表单分组组件 form-group START -->
-
-
-                <div class="form-group">
-                    <!--大间隔等级 START　-->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5"> 大间隔等级&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
-                        <div class="col-md-4">
-                            <select name="spacGrade" class="form-control" id="spacGradeSelect">
-                                <option value="">-- 请选择大间隔等级 --</option>
-                                <option value="1">一级</option>
-                                <option value="2">二级</option>
-                                <option value="3">三级</option>
-                                <option value="4">四级</option>
-                                <option value="5">五级</option>
-                            </select>
-                        </div>
-                    </div>
-                    <!-- 大间隔等级END　-->
-                </div>
-
-                <!-- 表单分组组件 form-group START -->
-                <div class="form-group">
-                    <!-- 线路简称 START -->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5"> 线路简称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
-                        <div class="col-md-4">
-                            <input type="text" class="form-control" name="shortName" id="shortNameInput"
-                                   placeholder="线路简称">
-                        </div>
-                    </div>
-                    <!-- 线路简称 END -->
-
-                    <!-- 英文名称 START -->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5"> 英文名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
-                        <div class="col-md-4">
-                            <input type="text" class="form-control" name="es" id="esInput" placeholder="英文名称">
-                        </div>
-                    </div>
-                    <!-- 英文名称 END -->
-                </div>
-                <!-- 表单分组组件 form-group END -->
-
-                <!-- 表单分组组件 form-group START -->
-                <div class="form-group">
-                    <!-- 上海市线路编码 START -->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5"> 上海市线路编码: </label>
-                        <div class="col-md-4">
-                            <input type="text" class="form-control" name="shanghaiLinecode" id="shanghaiLinecodeInput"
-                                   placeholder="上海市线路编码">
-                        </div>
-                    </div>
-                    <!-- 上海市线路编码 END -->
-
-                    <!--设备线路编码 START -->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5"> 设备线路编码&nbsp;&nbsp;&nbsp;: </label>
-                        <div class="col-md-4">
-                            <input type="text" class="form-control" name="eqLinecode" id="eqLinecodeInput"
-                                   placeholder="设备线路编码">
-                        </div>
-                    </div>
-                    <!--设备线路编码 END -->
-                </div>
-                <!-- 表单分组组件 form-group END -->
-
-                <!-- 表单分组组件 form-group START -->
-                <div class="form-group">
-                    <!-- 起始站调度电话 START -->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5"> 起始站调度电话: </label>
-                        <div class="col-md-4">
-                            <input type="text" class="form-control" name="startPhone" id="startPhoneInput"
-                                   placeholder="起始站调度电话">
-                        </div>
-                    </div>
-                    <!-- 起始站调度电话 END -->
-
-                    <!-- 终点站调度电话 START -->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5"> 终点站调度电话: </label>
-                        <div class="col-md-4">
-                            <input type="text" class="form-control" name="endPhone" id="startPhoneInput"
-                                   placeholder="终点站调度电话">
-                        </div>
-                    </div>
-                    <!-- 终点站调度电话 START -->
-                </div>
-                <!-- 表单分组组件 form-group END -->
-
-                <!-- 表单分组组件 form-group START -->
-                <div class="form-group">
-                    <!-- 车辆总数 START -->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5"> 车辆总数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
-                        <div class="col-md-4">
-                            <input type="text" class="form-control" name="carSumNumber" id="carSumNumberInput"
-                                   placeholder="车辆总数">
-                        </div>
-                    </div>
-                    <!-- 车辆总数 END -->
-
-                    <!-- 普通车辆数 START -->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5"> 普通车辆数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
-                        <div class="col-md-4">
-                            <input type="text" class="form-control" name="ordCarNumber" id="ordCarNumberInput"
-                                   placeholder="普通车辆数">
-                        </div>
-                    </div>
-                    <!-- 普通车辆数 END -->
-                </div>
-                <!-- 表单分组组件 form-group END -->
-
-                <!-- 表单分组组件 form-group START -->
-                <div class="form-group">
-                    <!-- 空调车辆数 START -->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5"> 空调车辆数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
-                        <div class="col-md-4">
-                            <input type="text" class="form-control" name="hvacCarNumber" id="hvacCarNumberInput"
-                                   placeholder="空调车辆数">
-                        </div>
-                    </div>
-                    <!-- 空调车辆数 END -->
-
-                    <!-- 开辟日期 START　-->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5"> 开辟日期&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
-                        <div class="col-md-4">
-                            <input type="text" class="form-control" name="openDate" id="openDateInput"
-                                   placeholder="开辟日期">
-                        </div>
-                    </div>
-                    <!-- 开辟日期 END　-->
-                </div>
-                <!-- 表单分组组件 form-group END -->
-
-                <!-- 表单分组组件 form-group START -->
-                <div class="form-group">
-                    <!-- 线路沿革 START -->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5"> 线路沿革&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
-                        <div class="col-md-4">
-                            <textarea class="form-control" rows="3" name="history" id="historyTextarea"
-                                      placeholder="线路沿革"></textarea>
-                            <span class="help-block">日期及内容:如2014-1-1，开辟；2014-5-1，延线；</span>
-                        </div>
-                    </div>
-                    <!-- 线路沿革 END -->
-
-                    <!-- 描述/说明 START -->
-                    <div class="col-md-6">
-                        <label class="control-label col-md-5"> 描述/说明&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
-                        <div class="col-md-4">
-                            <textarea class="form-control" rows="3" name="descriptions" id="descriptionsTextarea"
-                                      placeholder="描述/说明"></textarea>
-                        </div>
-                    </div>
-                    <!-- 描述/说明 END -->
-                </div>
-                <!-- 表单分组组件 form-group END -->
-            </div>
-            <!-- 表单字段内容 END -->
-
-            <!-- 表单按钮组件 START -->
-            <div class="form-actions">
-                <div class="row">
-                    <div class="col-md-offset-5 col-md-7">
-                        <button type="submit" class="btn green" id="submintBtn"><i class="fa fa-check"></i> 提交</button>
-                        <a type="button" class="btn default" href="list.html" data-pjax><i class="fa fa-times"></i>
-                            取消</a>
-                    </div>
-                </div>
-            </div>
-            <!-- 表单按钮组件 END -->
-
-        </form>
-        <!-- line_add_form FORM END -->
-
-    </div>
-    <!-- 表单组件 END -->
-
-</div>
-<!-- 信息容器组件 END -->
-
-<!-- 线路信息添加片段JS模块 -->
+<!-- 片段标题 START -->
+<div class="page-head">
+    <div class="page-title">
+        <h1>添加线路</h1>
+    </div>
+</div>
+<!-- 片段标题 END -->
+
+<!-- 线路信息导航栏组件 START -->
+<ul class="page-breadcrumb breadcrumb">
+    <li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
+    <li><span class="active">基础信息</span> <i class="fa fa-circle"></i></li>
+    <li><a href="/pages/base/line/list.html" data-pjax>线路信息</a> <i class="fa fa-circle"></i></li>
+    <li><span class="active">添加线路</span></li>
+</ul>
+<!-- 线路信息导航栏组件 END -->
+
+<!-- 信息容器组件 START -->
+<div class="portlet light bordered">
+
+    <!-- 信息容器组件标题 START -->
+    <div class="portlet-title">
+        <div class="caption">
+            <i class="icon-equalizer font-red-sunglo"></i>
+            <span class="caption-subject font-red-sunglo bold uppercase">添加线路</span>
+        </div>
+    </div>
+    <!-- 信息容器组件标题 END -->
+
+    <!-- 表单容器组件 START -->
+    <div class="portlet-body form">
+
+        <!-- line_add_form FORM START -->
+        <form action="/line" class="form-horizontal" id="line_add_form">
+
+            <!-- 表单验证错误提示组件 START -->
+            <div class="alert alert-danger display-hide">
+                <button class="close" data-close="alert"></button>
+                您的输入有误，请检查下面的输入项
+            </div>
+            <!-- 表单验证错误提示组件 END -->
+
+            <!-- 表单字段内容 START -->
+            <div class="form-body">
+
+                <!-- 表单分组组件 form-group START -->
+                <div class="form-group">
+                    <!-- 线路编码 (* 必填项) START -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5">
+                            <span class="required"> * </span>线路编码&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                        </label>
+                        <div class="col-md-4">
+                            <input type="text" class="form-control" name="lineCode" id="lineCodeInput"
+                                   placeholder="线路编码">
+                        </div>
+                    </div>
+                    <!-- 线路编码 (* 必填项) END -->
+
+                    <!-- 线路名称  (* 必填项) START -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5">
+                            <span class="required"> * </span>线路名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                        </label>
+                        <div class="col-md-4">
+                            <input type="text" class="form-control" name="name" id="nameInput" placeholder="线路名称"/>
+                            <span class="help-block"> 例如 :浦东88路 </span>
+                        </div>
+                    </div>
+                    <!-- 线路名称  (* 必填项) END -->
+                </div>
+
+                <!-- 表单分组组件 form-group START -->
+                <div class="form-group">
+                    <!-- 所属公司 START 在片段线路添加JS模块里初始化select(options值查询的公司表) -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5">
+                            <span class="required"> * </span>所属公司&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                        </label>
+                        <div class="col-md-4">
+                            <select name="company" class="form-control" id="companySelect"></select>
+                        </div>
+                    </div>
+                    <!-- 所属公司 END -->
+
+                    <!-- 所属分公司 START 在片段线路添加JS模块里初始化select(options值查询的公司表) -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5">
+                            <span class="required"> * </span>所属分公司&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                        </label>
+                        <div class="col-md-4">
+                            <select name="brancheCompany" class="form-control" id="brancheCompanySelect"></select>
+                        </div>
+                    </div>
+                    <!-- 所属分公司 END -->
+                </div>
+                <!-- 表单分组组件 form-group END -->
+
+                <!-- 表单分组组件 form-group START -->
+                <div class="form-group">
+                    <!-- 线路等级 START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5">
+                            <span class="required"> * </span>线路等级&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                        </label>
+                        <div class="col-md-4">
+                            <select name="level" class="form-control" id="levelSelect">
+                                <option value="">-- 请选择线路等级 --</option>
+                                <option value="1">一级线路</option>
+                                <option value="2">二级线路</option>
+                                <option value="0">未知等级</option>
+                            </select>
+                        </div>
+                    </div>
+                    <!-- 线路等级 END -->
+
+                    <!-- 线路性质  START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5">
+                            <span class="required"> * </span>线路性质&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                        </label>
+                        <div class="col-md-4">
+                            <select name="nature" class="form-control" id="natureSelect">
+                                <option value="">-- 请选择线路性质 --</option>
+                                <option value="lj">路救</option>
+                                <option value="bc">备车</option>
+                                <option value="dbc">定班车</option>
+                                <option value="yxl">夜宵路</option>
+                                <option value="cgxl">常规线路</option>
+                                <option value="gjxl">过江线路</option>
+                                <option value="csbs">穿梭巴士</option>
+                                <option value="tyxl">特约线路</option>
+                                <option value="cctxl">村村通线路</option>
+                                <option value="hlwgj">互联网公交</option>
+                                <option value="qt">其他</option>
+                            </select>
+                        </div>
+                    </div>
+                    <!-- 线路性质  END -->
+                </div>
+                <!-- 表单分组组件 form-group END -->
+
+                <!-- 表单分组组件 form-group START -->
+                <div class="form-group">
+                    <!-- 是否宵夜 START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5">
+                            <span class="required"> * </span>是否宵夜&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                        </label>
+                        <div class="col-md-4">
+                            <div class="md-radio-inline">
+                                <div class="md-radio">
+                                    <input type="radio" id="radio16" name="supperLine" class="md-radiobtn" value="1"
+                                           data-title="是">
+                                    <label for="radio16">
+                                        <span></span>
+                                        <span class="check"></span>
+                                        <span class="box"></span> 是
+                                    </label>
+                                </div>
+                                <div class="md-radio has-error">
+                                    <input type="radio" id="radio17" name="supperLine" class="md-radiobtn" value="0"
+                                           data-title="否" checked="checked">
+                                    <label for="radio17" style="color:#FFC0CB">
+                                        <span></span>
+                                        <span class="check"></span>
+                                        <span class="box"></span> 否
+                                    </label>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <!-- 是否宵夜 END -->
+
+                    <!-- 是否撤销 START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5">
+                            <span class="required"> * </span>是否撤销&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                        </label>
+                        <div class="col-md-4">
+                            <div class="md-radio-inline">
+                                <div class="md-radio">
+                                    <input type="radio" id="radio14" name="destroy" data-title="是" class="md-radiobtn"
+                                           value="1">
+                                    <label for="radio14">
+                                        <span></span>
+                                        <span class="check"></span>
+                                        <span class="box"></span> 是
+                                    </label>
+                                </div>
+                                <div class="md-radio has-error">
+                                    <input type="radio" id="radio15" name="destroy" class="md-radiobtn" data-title="否"
+                                           value="0" checked="checked">
+                                    <label for="radio15" style="color:#FFC0CB">
+                                        <span></span>
+                                        <span class="check"></span>
+                                        <span class="box"></span> 否
+                                    </label>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <!-- 是否撤销 START -->
+                </div>
+                <!-- 表单分组组件 form-group END -->
+
+                <!-- 表单分组组件 form-group START -->
+                <div class="form-group">
+                    <!-- 是否营运START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5">
+                            <span class="required"> * </span>是否营运线路&nbsp;&nbsp;&nbsp;&nbsp;:
+                        </label>
+                        <div class="col-md-4">
+                            <div class="md-radio-inline">
+                                <div class="md-radio">
+                                    <input type="radio" id="radio18" name="sfyy" class="md-radiobtn" value="1"
+                                           data-title="是" checked="checked">
+                                    <label for="radio18">
+                                        <span></span>
+                                        <span class="check"></span>
+                                        <span class="box"></span> 是
+                                    </label>
+                                </div>
+                                <div class="md-radio has-error">
+                                    <input type="radio" id="radio19" name="sfyy" class="md-radiobtn" value="0"
+                                           data-title="否">
+                                    <label for="radio19" style="color:#FFC0CB">
+                                        <span></span>
+                                        <span class="check"></span>
+                                        <span class="box"></span> 否
+                                    </label>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <!-- 是否营运 END -->
+                    <!-- 权证车辆数 START -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5">
+                            权证车辆数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+                        <div class="col-md-4">
+                            <input type="text" class="form-control" name="warrantCar" id="warrantCarInput"
+                                   placeholder="权证车辆数">
+                        </div>
+                    </div>
+                    <!-- 权证车辆数 END -->
+
+                </div>
+                <!-- 表单分组组件 form-group END -->
+
+                <!-- 表单分组组件 form-group START -->
+                <div class="form-group">
+                    <!-- 起始站名称 START (该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的起点站。默认使用该字段填写值) -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5"><span class="required"> * </span>
+                            起始站名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                        </label>
+                        <div class="col-md-4">
+                            <input type="text" class="form-control" name="startStationName" id="startStationNameInput"
+                                   placeholder="起始站名称">
+                            <span class="help-block"> 说明 :上行起始站名称 </span>
+                        </div>
+                    </div>
+                    <!-- 起始站名称 END -->
+
+                    <!-- 终点站名称 START  (该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的终点站。默认使用该字段填写值) -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5"><span class="required"> * </span> 终点站名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                        </label>
+                        <div class="col-md-4">
+                            <input type="text" class="form-control" name="endStationName" id="endStationNameInput"
+                                   placeholder="终点站名称">
+                            <span class="help-block"> 说明 :上行终点站名称 </span>
+                        </div>
+                    </div>
+                    <!-- 终点站名称 END -->
+                </div>
+                <!-- 表单分组组件 form-group END -->
+
+                <!-- 表单分组组件 form-group START -->
+                <div class="form-group">
+                    <!-- 起始站首班车时间 (* 必填项)  START -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5"><span class="required"> * </span> 起始站首班时间: </label>
+                        <div class="col-md-4">
+                            <input type="text" class="form-control" name="startStationFirstTime"
+                                   id="startStationFirstTimeInput" placeholder="起始站首班车时间">
+                            <span class="help-block"> 例如 :06:00 </span>
+                        </div>
+                    </div>
+                    <!-- 起始站首班车时间  END -->
+
+                    <!-- 起始站末班车时间 (* 必填项)  START -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5"><span class="required"> * </span> 起始站末班时间: </label>
+                        <div class="col-md-4">
+                            <!-- <input type="text" class="form-control" name="StartStationEndTime" id="StartStationEndTimeInput" placeholder="起始站末班车时间 "> -->
+                            <input type="text" class="form-control" name="startStationEndTime" id="endTimeInput"
+                                   placeholder="起始站末班车时间">
+                            <span class="help-block"> 例如 :17:00 </span>
+                        </div>
+                    </div>
+                    <!-- 起始站末班车时间 END -->
+                </div>
+                <!-- 表单分组组件 form-group END -->
+
+                <!-- 表单分组组件 form-group START -->
+                <div class="form-group">
+                    <!-- 终点站首班车时间 (* 必填项)  START -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5"><span class="required"> * </span> 终点站首班时间: </label>
+                        <div class="col-md-4">
+                            <input type="text" class="form-control" name="endStationFirstTime"
+                                   id="endStationFirstTimeInput" placeholder="终点站首班车时间">
+                            <span class="help-block"> 例如 :05:00 </span>
+                        </div>
+                    </div>
+                    <!-- 终点站首班车时间 END -->
+
+                    <!-- 终点站末班车时间 (* 必填项)  START -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5"><span class="required"> * </span> 终点站末班时间: </label>
+                        <div class="col-md-4">
+                            <input type="text" class="form-control" name="endStationEndTime" id="endStationEndTimeInput"
+                                   placeholder="终点站末班车时间 ">
+                            <span class="help-block"> 例如 :18:00 </span>
+                        </div>
+                    </div>
+                    <!-- 终点站末班车时间 END -->
+                </div>
+                <!-- 表单分组组件 form-group END -->
+
+                <!-- 表单分组组件 form-group START -->
+                <div class="form-group">
+                    <!-- 线路规划类型 (* 必填项) START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5"><span class="required"> * </span> 线路规划类型&nbsp;&nbsp;&nbsp;:</label>
+                        <div class="col-md-4">
+                            <select name="linePlayType" class="form-control" id="linePlayTypeSelect">
+                                <!--<option value="">&#45;&#45; 请选择线路类型 &#45;&#45;</option>-->
+                                <option value="0">双向（包括双环线）</option>
+                                <option value="1">单环线</option>
+                            </select>
+                        </div>
+                    </div>
+                    <!-- 线路规划类型 (* 必填项) END -->
+
+                    <!--车辆区域 START　-->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5"> <span class="required"> * </span>线路区域&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                        </label>
+                        <div class="col-md-4">
+                            <select name="region" class="form-control" id="regionSelect">
+                                <!--<option value="">&#45;&#45; 请选择车辆区域 &#45;&#45;</option>-->
+                                <option value="0">区内</option>
+                                <option value="1">区外</option>
+                            </select>
+                        </div>
+                    </div>
+                    <!--车辆区域END　-->
+
+                </div>
+                <!-- 表单分组组件 form-group START -->
+
+
+                <div class="form-group">
+                    <!--大间隔等级 START　-->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5"> 大间隔等级&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+                        <div class="col-md-4">
+                            <select name="spacGrade" class="form-control" id="spacGradeSelect">
+                                <option value="">-- 请选择大间隔等级 --</option>
+                                <option value="1">一级</option>
+                                <option value="2">二级</option>
+                                <option value="3">三级</option>
+                                <option value="4">四级</option>
+                                <option value="5">五级</option>
+                            </select>
+                        </div>
+                    </div>
+                    <!-- 大间隔等级END　-->
+                    
+                    <!-- 线路票价 START -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5"> 票价&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+                        <div class="col-md-4">
+                            <input type="text" class="form-control" name="ticketPrice" id="ticketPriceInput"
+                                   placeholder="票价">
+                        </div>
+                    </div>
+                    
+                    <!-- 线路简称 END -->
+                </div>
+
+                <!-- 表单分组组件 form-group START -->
+                <div class="form-group">
+                    <!-- 线路简称 START -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5"> 线路简称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+                        <div class="col-md-4">
+                            <input type="text" class="form-control" name="shortName" id="shortNameInput"
+                                   placeholder="线路简称">
+                        </div>
+                    </div>
+                    <!-- 线路简称 END -->
+
+                    <!-- 英文名称 START -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5"> 英文名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+                        <div class="col-md-4">
+                            <input type="text" class="form-control" name="es" id="esInput" placeholder="英文名称">
+                        </div>
+                    </div>
+                    <!-- 英文名称 END -->
+                </div>
+                <!-- 表单分组组件 form-group END -->
+
+                <!-- 表单分组组件 form-group START -->
+                <div class="form-group">
+                    <!-- 上海市线路编码 START -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5"> 上海市线路编码: </label>
+                        <div class="col-md-4">
+                            <input type="text" class="form-control" name="shanghaiLinecode" id="shanghaiLinecodeInput"
+                                   placeholder="上海市线路编码">
+                        </div>
+                    </div>
+                    <!-- 上海市线路编码 END -->
+
+                    <!--设备线路编码 START -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5"> 设备线路编码&nbsp;&nbsp;&nbsp;: </label>
+                        <div class="col-md-4">
+                            <input type="text" class="form-control" name="eqLinecode" id="eqLinecodeInput"
+                                   placeholder="设备线路编码">
+                        </div>
+                    </div>
+                    <!--设备线路编码 END -->
+                </div>
+                <!-- 表单分组组件 form-group END -->
+
+                <!-- 表单分组组件 form-group START -->
+                <div class="form-group">
+                    <!-- 起始站调度电话 START -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5"> 起始站调度电话: </label>
+                        <div class="col-md-4">
+                            <input type="text" class="form-control" name="startPhone" id="startPhoneInput"
+                                   placeholder="起始站调度电话">
+                        </div>
+                    </div>
+                    <!-- 起始站调度电话 END -->
+
+                    <!-- 终点站调度电话 START -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5"> 终点站调度电话: </label>
+                        <div class="col-md-4">
+                            <input type="text" class="form-control" name="endPhone" id="startPhoneInput"
+                                   placeholder="终点站调度电话">
+                        </div>
+                    </div>
+                    <!-- 终点站调度电话 START -->
+                </div>
+                <!-- 表单分组组件 form-group END -->
+
+                <!-- 表单分组组件 form-group START -->
+                <div class="form-group">
+                    <!-- 车辆总数 START -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5"> 车辆总数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+                        <div class="col-md-4">
+                            <input type="text" class="form-control" name="carSumNumber" id="carSumNumberInput"
+                                   placeholder="车辆总数">
+                        </div>
+                    </div>
+                    <!-- 车辆总数 END -->
+
+                    <!-- 普通车辆数 START -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5"> 普通车辆数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+                        <div class="col-md-4">
+                            <input type="text" class="form-control" name="ordCarNumber" id="ordCarNumberInput"
+                                   placeholder="普通车辆数">
+                        </div>
+                    </div>
+                    <!-- 普通车辆数 END -->
+                </div>
+                <!-- 表单分组组件 form-group END -->
+
+                <!-- 表单分组组件 form-group START -->
+                <div class="form-group">
+                    <!-- 空调车辆数 START -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5"> 空调车辆数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+                        <div class="col-md-4">
+                            <input type="text" class="form-control" name="hvacCarNumber" id="hvacCarNumberInput"
+                                   placeholder="空调车辆数">
+                        </div>
+                    </div>
+                    <!-- 空调车辆数 END -->
+
+                    <!-- 开辟日期 START　-->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5"> 开辟日期&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+                        <div class="col-md-4">
+                            <input type="text" class="form-control" name="openDate" id="openDateInput"
+                                   placeholder="开辟日期">
+                        </div>
+                    </div>
+                    <!-- 开辟日期 END　-->
+                </div>
+                <!-- 表单分组组件 form-group END -->
+
+                <!-- 表单分组组件 form-group START -->
+                <div class="form-group">
+                    <!-- 线路沿革 START -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5"> 线路沿革&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+                        <div class="col-md-4">
+                            <textarea class="form-control" rows="3" name="history" id="historyTextarea"
+                                      placeholder="线路沿革"></textarea>
+                            <span class="help-block">日期及内容:如2014-1-1，开辟；2014-5-1，延线；</span>
+                        </div>
+                    </div>
+                    <!-- 线路沿革 END -->
+
+                    <!-- 描述/说明 START -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5"> 描述/说明&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+                        <div class="col-md-4">
+                            <textarea class="form-control" rows="3" name="descriptions" id="descriptionsTextarea"
+                                      placeholder="描述/说明"></textarea>
+                        </div>
+                    </div>
+                    <!-- 描述/说明 END -->
+                </div>
+                <!-- 表单分组组件 form-group END -->
+            </div>
+            <!-- 表单字段内容 END -->
+
+            <!-- 表单按钮组件 START -->
+            <div class="form-actions">
+                <div class="row">
+                    <div class="col-md-offset-5 col-md-7">
+                        <button type="submit" class="btn green" id="submintBtn"><i class="fa fa-check"></i> 提交</button>
+                        <a type="button" class="btn default" href="list.html" data-pjax><i class="fa fa-times"></i>
+                            取消</a>
+                    </div>
+                </div>
+            </div>
+            <!-- 表单按钮组件 END -->
+
+        </form>
+        <!-- line_add_form FORM END -->
+
+    </div>
+    <!-- 表单组件 END -->
+
+</div>
+<!-- 信息容器组件 END -->
+
+<!-- 线路信息添加片段JS模块 -->
 <script src="/pages/base/line/js/line-add-form.js"></script>
 \ No newline at end of file
-<!-- 片段标题 START -->
-<div class="page-head">
-	<div class="page-title">
-		<h1>修改线路信息</h1>
-	</div>
-</div>
-<!-- 片段标题 END -->
-
-<!-- 线路信息导航栏组件 START -->
-<ul class="page-breadcrumb breadcrumb">
-	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
-	<li><span class="active">基础信息</span> <i class="fa fa-circle"></i></li>
-	<li><a href="/pages/base/line/list.html" data-pjax>线路信息</a> <i class="fa fa-circle"></i></li>
-	<li><span class="active">修改线路信息</span></li>
-</ul>
-<!-- 线路信息导航栏组件 END -->
-
-<!-- 信息容器组件 START -->
-<div class="portlet light bordered">
-
-	<!-- 信息容器组件标题 START -->
-	<div class="portlet-title">
-		<div class="caption">
-			<i class="icon-equalizer font-red-sunglo"></i>
-			<span class="caption-subject font-red-sunglo bold uppercase">修改线路信息</span>
-		</div>
-	</div>
-	<!-- 信息容器组件标题 END -->
-
-	<!-- 表单容器组件 START -->
-	<div class="portlet-body form" id="lineEditForm">
-
-		<!-- START FORM -->
-		<form action="/" class="form-horizontal" id="line_edit_form" >
-
-			<!-- 错误提示信息组件 START -->
-			<div class="alert alert-danger display-hide">
-				<button class="close" data-close="alert"></button>
-				您的输入有误，请检查下面的输入项
-			</div>
-			<!-- 错误提示信息组件 END -->
-
-			<!-- 表单内容 START -->
-
-
-			<!-- 表单内容 -->
-			<div class="form-body">
-
-				<!-- 表单分组组件 form-group START -->
-				<div class="form-group">
-					<input type="hidden" name="id" id="lineId">
-					<!-- in_use字段 START -->
-					<input type="hidden" name="inUse" id="inUseInput" placeholder="隐藏字段" readonly="readonly">
-					<!--  in_use字段 END -->
-					<!-- 线路编码 (* 必填项) START -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5">
-							<span class="required"> * </span>线路编码&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
-						</label>
-						<div class="col-md-4">
-							<input type="text" class="form-control" name="lineCode" id="lineCodeInput"
-								   placeholder="线路编码" readonly="readonly">
-						</div>
-					</div>
-					<!-- 线路编码 (* 必填项) END -->
-
-					<!-- 线路名称  (* 必填项) START -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5">
-							<span class="required"> * </span>线路名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
-						</label>
-						<div class="col-md-4">
-							<input type="text" class="form-control" name="name" id="nameInput" placeholder="线路名称"/>
-							<span class="help-block"> 例如 :浦东88路 </span>
-						</div>
-					</div>
-					<!-- 线路名称  (* 必填项) END -->
-				</div>
-				<!-- 表单分组组件 form-group END -->
-
-				<!-- 表单分组组件 form-group START -->
-				<div class="form-group">
-					<!-- 所属公司 START 在片段线路添加JS模块里初始化select(options值查询的公司表) -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5">
-							<span class="required"> * </span>所属公司&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
-						</label>
-						<div class="col-md-4">
-							<select name="company" class="form-control" id="companySelect"></select>
-						</div>
-					</div>
-					<!-- 所属公司 END -->
-
-					<!-- 所属分公司 START 在片段线路添加JS模块里初始化select(options值查询的公司表) -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5">
-							<span class="required"> * </span>所属分公司&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
-						</label>
-						<div class="col-md-4">
-							<select name="brancheCompany" class="form-control" id="brancheCompanySelect"></select>
-						</div>
-					</div>
-					<!-- 所属分公司 END -->
-				</div>
-				<!-- 表单分组组件 form-group END -->
-
-				<!-- 表单分组组件 form-group START -->
-				<div class="form-group">
-					<!-- 线路等级 START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5">
-							<span class="required"> * </span>线路等级&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
-						</label>
-						<div class="col-md-4">
-							<select name="level" class="form-control" id="levelSelect">
-								<option value="">-- 请选择线路等级 --</option>
-								<option value="1">一级线路</option>
-								<option value="2">二级线路</option>
-								<option value="0">未知等级</option>
-							</select>
-						</div>
-					</div>
-					<!-- 线路等级 END -->
-
-					<!-- 线路性质  START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5">
-							<span class="required"> * </span>线路性质&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
-						</label>
-						<div class="col-md-4">
-							<select name="nature" class="form-control" id="natureSelect">
-								<option value="">-- 请选择线路性质 --</option>
-								<option value="lj">路救</option>
-								<option value="bc">备车</option>
-								<option value="dbc">定班车</option>
-								<option value="yxl">夜宵路</option>
-								<option value="cgxl">常规线路</option>
-								<option value="gjxl">过江线路</option>
-								<option value="csbs">穿梭巴士</option>
-								<option value="tyxl">特约线路</option>
-								<option value="cctxl">村村通线路</option>
-								<option value="hlwgj">互联网公交</option>
-								<option value="qt">其他</option>
-							</select>
-						</div>
-					</div>
-					<!-- 线路性质  END -->
-				</div>
-				<!-- 表单分组组件 form-group END -->
-
-				<!-- 表单分组组件 form-group START -->
-				<div class="form-group">
-					<!-- 是否宵夜 START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5">
-							<span class="required"> * </span>是否宵夜&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
-						</label>
-						<div class="col-md-4">
-							<div class="md-radio-inline">
-								<div class="md-radio">
-									<input type="radio" id="radio16" name="supperLine" class="md-radiobtn" value="1"
-										   data-title="是">
-									<label for="radio16">
-										<span></span>
-										<span class="check"></span>
-										<span class="box"></span> 是
-									</label>
-								</div>
-								<div class="md-radio has-error">
-									<input type="radio" id="radio17" name="supperLine" class="md-radiobtn" value="0"
-										   data-title="否" checked="checked">
-									<label for="radio17" style="color:#FFC0CB">
-										<span></span>
-										<span class="check"></span>
-										<span class="box"></span> 否
-									</label>
-								</div>
-							</div>
-						</div>
-					</div>
-					<!-- 是否宵夜 END -->
-
-					<!-- 是否撤销 START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5">
-							<span class="required"> * </span>是否撤销&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
-						</label>
-						<div class="col-md-4">
-							<div class="md-radio-inline">
-								<div class="md-radio">
-									<input type="radio" id="radio14" name="destroy" data-title="是" class="md-radiobtn"
-										   value="1">
-									<label for="radio14">
-										<span></span>
-										<span class="check"></span>
-										<span class="box"></span> 是
-									</label>
-								</div>
-								<div class="md-radio has-error">
-									<input type="radio" id="radio15" name="destroy" class="md-radiobtn" data-title="否"
-										   value="0" checked="checked">
-									<label for="radio15" style="color:#FFC0CB">
-										<span></span>
-										<span class="check"></span>
-										<span class="box"></span> 否
-									</label>
-								</div>
-							</div>
-						</div>
-					</div>
-					<!-- 是否撤销 START -->
-				</div>
-				<!-- 表单分组组件 form-group END -->
-
-				<!-- 表单分组组件 form-group START -->
-				<div class="form-group">
-					<!-- 起始站名称 START (该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的起点站。默认使用该字段填写值) -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5"><span class="required"> * </span>
-							起始站名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
-						</label>
-						<div class="col-md-4">
-							<input type="text" class="form-control" name="startStationName" id="startStationNameInput"
-								   placeholder="起始站名称">
-							<span class="help-block"> 说明 :上行起始站名称 </span>
-						</div>
-					</div>
-					<!-- 起始站名称 END -->
-
-					<!-- 终点站名称 START  (该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的终点站。默认使用该字段填写值) -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5"><span class="required"> * </span> 终点站名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
-						</label>
-						<div class="col-md-4">
-							<input type="text" class="form-control" name="endStationName" id="endStationNameInput"
-								   placeholder="终点站名称">
-							<span class="help-block"> 说明 :上行终点站名称 </span>
-						</div>
-					</div>
-					<!-- 终点站名称 END -->
-				</div>
-				<!-- 表单分组组件 form-group END -->
-
-				<!-- 表单分组组件 form-group START -->
-				<div class="form-group">
-					<!-- 起始站首班车时间 (* 必填项)  START -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5"><span class="required"> * </span> 起始站首班时间: </label>
-						<div class="col-md-4">
-							<input type="text" class="form-control" name="startStationFirstTime"
-								   id="startStationFirstTimeInput" placeholder="起始站首班车时间">
-							<span class="help-block"> 例如 :06:00 </span>
-						</div>
-					</div>
-					<!-- 起始站首班车时间  END -->
-
-					<!-- 起始站末班车时间 (* 必填项)  START -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5"><span class="required"> * </span> 起始站末班时间: </label>
-						<div class="col-md-4">
-							<!-- <input type="text" class="form-control" name="StartStationEndTime" id="StartStationEndTimeInput" placeholder="起始站末班车时间 "> -->
-							<input type="text" class="form-control" name="startStationEndTime" id="endTimeInput"
-								   placeholder="起始站末班车时间">
-							<span class="help-block"> 例如 :17:00 </span>
-						</div>
-					</div>
-					<!-- 起始站末班车时间 END -->
-				</div>
-				<!-- 表单分组组件 form-group END -->
-
-				<!-- 表单分组组件 form-group START -->
-				<div class="form-group">
-					<!-- 终点站首班车时间 (* 必填项)  START -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5"><span class="required"> * </span> 终点站首班时间: </label>
-						<div class="col-md-4">
-							<input type="text" class="form-control" name="endStationFirstTime"
-								   id="endStationFirstTimeInput" placeholder="终点站首班车时间">
-							<span class="help-block"> 例如 :05:00 </span>
-						</div>
-					</div>
-					<!-- 终点站首班车时间 END -->
-
-					<!-- 终点站末班车时间 (* 必填项)  START -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5"><span class="required"> * </span> 终点站末班时间: </label>
-						<div class="col-md-4">
-							<input type="text" class="form-control" name="endStationEndTime" id="endStationEndTimeInput"
-								   placeholder="终点站末班车时间 ">
-							<span class="help-block"> 例如 :18:00 </span>
-						</div>
-					</div>
-					<!-- 终点站末班车时间 END -->
-				</div>
-				<!-- 表单分组组件 form-group END -->
-
-				<!-- 表单分组组件 form-group START -->
-				<div class="form-group">
-					<!-- 线路规划类型 (* 必填项) START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5"><span class="required"> * </span> 线路规划类型&nbsp;&nbsp;&nbsp;:</label>
-						<div class="col-md-4">
-							<select name="linePlayType" class="form-control" id="linePlayTypeSelect">
-								<option value="">-- 请选择线路类型 --</option>
-								<option value="0">双向（包括双环线）</option>
-								<option value="1">单环线</option>
-							</select>
-						</div>
-					</div>
-					<!-- 线路规划类型 (* 必填项) END -->
-
-					<!--车辆区域 START　-->
-					<div class="col-md-6">
-						<label class="control-label col-md-5"> <span class="required"> * </span>线路区域&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
-						</label>
-						<div class="col-md-4">
-							<select name="region" class="form-control" id="regionSelect">
-								<option value="">-- 请选择车辆区域 --</option>
-								<option value="0">区内</option>
-								<option value="1">区外</option>
-							</select>
-						</div>
-					</div>
-					<!--车辆区域END　-->
-
-				</div>
-				<!-- 表单分组组件 form-group START -->
-
-				<!-- 表单分组组件 form-group START -->
-				<div class="form-group">
-					<!--大间隔等级 START　-->
-					<div class="col-md-6">
-						<label class="control-label col-md-5"> 大间隔等级&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
-						<div class="col-md-4">
-							<select name="spacGrade" class="form-control" id="spacGradeSelect">
-								<option value="">-- 请选择大间隔等级 --</option>
-								<option value="1">一级</option>
-								<option value="2">二级</option>
-								<option value="3">三级</option>
-								<option value="4">四级</option>
-								<option value="5">五级</option>
-							</select>
-						</div>
-					</div>
-					<!-- 大间隔等级END　-->
-					<!-- 权证车辆数 START -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5"> 权证车辆数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
-						<div class="col-md-4">
-							<input type="text" class="form-control" name="warrantCar" id="warrantCarInput"
-								   placeholder="权证车辆数">
-						</div>
-					</div>
-					<!-- 权证车辆数 END -->
-				</div>
-
-				<!-- 表单分组组件 form-group START -->
-				<div class="form-group">
-					<!-- 线路简称 START -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5"> 线路简称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
-						<div class="col-md-4">
-							<input type="text" class="form-control" name="shortName" id="shortNameInput"
-								   placeholder="线路简称">
-						</div>
-					</div>
-					<!-- 线路简称 END -->
-
-					<!-- 英文名称 START -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5"> 英文名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
-						<div class="col-md-4">
-							<input type="text" class="form-control" name="es" id="esInput" placeholder="英文名称">
-						</div>
-					</div>
-					<!-- 英文名称 END -->
-				</div>
-				<!-- 表单分组组件 form-group END -->
-
-				<!-- 表单分组组件 form-group START -->
-				<div class="form-group">
-					<!-- 上海市线路编码 START -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5"> 上海市线路编码: </label>
-						<div class="col-md-4">
-							<input type="text" class="form-control" name="shanghaiLinecode" id="shanghaiLinecodeInput"
-								   placeholder="上海市线路编码">
-						</div>
-					</div>
-					<!-- 上海市线路编码 END -->
-
-					<!--设备线路编码 START -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5"> 设备线路编码&nbsp;&nbsp;&nbsp;: </label>
-						<div class="col-md-4">
-							<input type="text" class="form-control" name="eqLinecode" id="eqLinecodeInput"
-								   placeholder="设备线路编码">
-						</div>
-					</div>
-					<!--设备线路编码 END -->
-				</div>
-				<!-- 表单分组组件 form-group END -->
-
-				<!-- 表单分组组件 form-group START -->
-				<div class="form-group">
-					<!-- 起始站调度电话 START -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5"> 起始站调度电话: </label>
-						<div class="col-md-4">
-							<input type="text" class="form-control" name="startPhone" id="startPhoneInput"
-								   placeholder="起始站调度电话">
-						</div>
-					</div>
-					<!-- 起始站调度电话 END -->
-
-					<!-- 终点站调度电话 START -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5"> 终点站调度电话: </label>
-						<div class="col-md-4">
-							<input type="text" class="form-control" name="endPhone" id="startPhoneInput"
-								   placeholder="终点站调度电话">
-						</div>
-					</div>
-					<!-- 终点站调度电话 START -->
-				</div>
-				<!-- 表单分组组件 form-group END -->
-
-				<!-- 表单分组组件 form-group START -->
-				<div class="form-group">
-					<!-- 车辆总数 START -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5"> 车辆总数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
-						<div class="col-md-4">
-							<input type="text" class="form-control" name="carSumNumber" id="carSumNumberInput"
-								   placeholder="车辆总数">
-						</div>
-					</div>
-					<!-- 车辆总数 END -->
-
-					<!-- 普通车辆数 START -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5"> 普通车辆数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
-						<div class="col-md-4">
-							<input type="text" class="form-control" name="ordCarNumber" id="ordCarNumberInput"
-								   placeholder="普通车辆数">
-						</div>
-					</div>
-					<!-- 普通车辆数 END -->
-				</div>
-				<!-- 表单分组组件 form-group END -->
-
-				<!-- 表单分组组件 form-group START -->
-				<div class="form-group">
-					<!-- 空调车辆数 START -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5"> 空调车辆数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
-						<div class="col-md-4">
-							<input type="text" class="form-control" name="hvacCarNumber" id="hvacCarNumberInput"
-								   placeholder="空调车辆数">
-						</div>
-					</div>
-					<!-- 空调车辆数 END -->
-					<!-- 开辟日期 START　-->
-					<div class="col-md-6">
-						<label class="control-label col-md-5"> 开辟日期&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
-						<div class="col-md-4">
-							<input type="text" class="form-control" name="openDate" id="openDateInput"
-								   placeholder="开辟日期">
-						</div>
-					</div>
-					<!-- 开辟日期 END　-->
-				</div>
-				<!-- 表单分组组件 form-group END -->
-				<!-- 表单分组组件 form-group START -->
-				<div class="form-group">
-					<!-- 线路沿革 START -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5"> 线路沿革&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
-						<div class="col-md-4">
-                            <textarea class="form-control" rows="3" name="history" id="historyTextarea"
-									  placeholder="线路沿革"></textarea>
-							<span class="help-block">日期及内容:如2014-1-1，开辟；2014-5-1，延线；</span>
-						</div>
-					</div>
-					<!-- 线路沿革 END -->
-
-					<!-- 描述/说明 START -->
-					<div class="col-md-6">
-						<label class="control-label col-md-5"> 描述/说明&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
-						<div class="col-md-4">
-                            <textarea class="form-control" rows="3" name="descriptions" id="descriptionsTextarea"
-									  placeholder="描述/说明"></textarea>
-						</div>
-					</div>
-					<!-- 描述/说明 END -->
-				</div>
-				<!-- 表单分组组件 form-group END -->
-			</div>
-
-			<!-- 表单按钮组件 START -->
-			<div class="form-actions">
-				<div class="row">
-					<div class="col-md-offset-5 col-md-7">
-						<button type="submit" class="btn green" ><i class="fa fa-check"></i> 提交</button>
-						<a type="button" class="btn default" href="list.html" data-pjax><i class="fa fa-times"></i> 取消</a>
-					</div>
-				</div>
-			</div>
-			<!-- 表单按钮组件 END -->
-		</form>
-		<!-- END FORM-->
-	</div>
-	<!-- 表单组件 END -->
-</div>
-<!-- 信息容器组件 END -->
-
-<!-- 线路信息修改片段JS模块 -->
+<!-- 片段标题 START -->
+<div class="page-head">
+	<div class="page-title">
+		<h1>修改线路信息</h1>
+	</div>
+</div>
+<!-- 片段标题 END -->
+
+<!-- 线路信息导航栏组件 START -->
+<ul class="page-breadcrumb breadcrumb">
+	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
+	<li><span class="active">基础信息</span> <i class="fa fa-circle"></i></li>
+	<li><a href="/pages/base/line/list.html" data-pjax>线路信息</a> <i class="fa fa-circle"></i></li>
+	<li><span class="active">修改线路信息</span></li>
+</ul>
+<!-- 线路信息导航栏组件 END -->
+
+<!-- 信息容器组件 START -->
+<div class="portlet light bordered">
+
+	<!-- 信息容器组件标题 START -->
+	<div class="portlet-title">
+		<div class="caption">
+			<i class="icon-equalizer font-red-sunglo"></i>
+			<span class="caption-subject font-red-sunglo bold uppercase">修改线路信息</span>
+		</div>
+	</div>
+	<!-- 信息容器组件标题 END -->
+
+	<!-- 表单容器组件 START -->
+	<div class="portlet-body form" id="lineEditForm">
+
+		<!-- START FORM -->
+		<form action="/" class="form-horizontal" id="line_edit_form" >
+
+			<!-- 错误提示信息组件 START -->
+			<div class="alert alert-danger display-hide">
+				<button class="close" data-close="alert"></button>
+				您的输入有误，请检查下面的输入项
+			</div>
+			<!-- 错误提示信息组件 END -->
+
+			<!-- 表单内容 START -->
+
+
+			<!-- 表单内容 -->
+			<div class="form-body">
+
+				<!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+					<input type="hidden" name="id" id="lineId">
+					<!-- in_use字段 START -->
+					<input type="hidden" name="inUse" id="inUseInput" placeholder="隐藏字段" readonly="readonly">
+					<!--  in_use字段 END -->
+					<!-- 线路编码 (* 必填项) START -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5">
+							<span class="required"> * </span>线路编码&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+						</label>
+						<div class="col-md-4">
+							<input type="text" class="form-control" name="lineCode" id="lineCodeInput"
+								   placeholder="线路编码" readonly="readonly">
+						</div>
+					</div>
+					<!-- 线路编码 (* 必填项) END -->
+
+					<!-- 线路名称  (* 必填项) START -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5">
+							<span class="required"> * </span>线路名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+						</label>
+						<div class="col-md-4">
+							<input type="text" class="form-control" name="name" id="nameInput" placeholder="线路名称"/>
+							<span class="help-block"> 例如 :浦东88路 </span>
+						</div>
+					</div>
+					<!-- 线路名称  (* 必填项) END -->
+				</div>
+				<!-- 表单分组组件 form-group END -->
+
+				<!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+					<!-- 所属公司 START 在片段线路添加JS模块里初始化select(options值查询的公司表) -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5">
+							<span class="required"> * </span>所属公司&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+						</label>
+						<div class="col-md-4">
+							<select name="company" class="form-control" id="companySelect"></select>
+						</div>
+					</div>
+					<!-- 所属公司 END -->
+
+					<!-- 所属分公司 START 在片段线路添加JS模块里初始化select(options值查询的公司表) -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5">
+							<span class="required"> * </span>所属分公司&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+						</label>
+						<div class="col-md-4">
+							<select name="brancheCompany" class="form-control" id="brancheCompanySelect"></select>
+						</div>
+					</div>
+					<!-- 所属分公司 END -->
+				</div>
+				<!-- 表单分组组件 form-group END -->
+
+				<!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+					<!-- 线路等级 START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5">
+							<span class="required"> * </span>线路等级&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+						</label>
+						<div class="col-md-4">
+							<select name="level" class="form-control" id="levelSelect">
+								<option value="">-- 请选择线路等级 --</option>
+								<option value="1">一级线路</option>
+								<option value="2">二级线路</option>
+								<option value="0">未知等级</option>
+							</select>
+						</div>
+					</div>
+					<!-- 线路等级 END -->
+
+					<!-- 线路性质  START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5">
+							<span class="required"> * </span>线路性质&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+						</label>
+						<div class="col-md-4">
+							<select name="nature" class="form-control" id="natureSelect">
+								<option value="">-- 请选择线路性质 --</option>
+								<option value="lj">路救</option>
+								<option value="bc">备车</option>
+								<option value="dbc">定班车</option>
+								<option value="yxl">夜宵路</option>
+								<option value="cgxl">常规线路</option>
+								<option value="gjxl">过江线路</option>
+								<option value="csbs">穿梭巴士</option>
+								<option value="tyxl">特约线路</option>
+								<option value="cctxl">村村通线路</option>
+								<option value="hlwgj">互联网公交</option>
+								<option value="qt">其他</option>
+							</select>
+						</div>
+					</div>
+					<!-- 线路性质  END -->
+				</div>
+				<!-- 表单分组组件 form-group END -->
+
+				<!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+					<!-- 是否宵夜 START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5">
+							<span class="required"> * </span>是否宵夜&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+						</label>
+						<div class="col-md-4">
+							<div class="md-radio-inline">
+								<div class="md-radio">
+									<input type="radio" id="radio16" name="supperLine" class="md-radiobtn" value="1"
+										   data-title="是">
+									<label for="radio16">
+										<span></span>
+										<span class="check"></span>
+										<span class="box"></span> 是
+									</label>
+								</div>
+								<div class="md-radio has-error">
+									<input type="radio" id="radio17" name="supperLine" class="md-radiobtn" value="0"
+										   data-title="否" checked="checked">
+									<label for="radio17" style="color:#FFC0CB">
+										<span></span>
+										<span class="check"></span>
+										<span class="box"></span> 否
+									</label>
+								</div>
+							</div>
+						</div>
+					</div>
+					<!-- 是否宵夜 END -->
+
+					<!-- 是否撤销 START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5">
+							<span class="required"> * </span>是否撤销&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+						</label>
+						<div class="col-md-4">
+							<div class="md-radio-inline">
+								<div class="md-radio">
+									<input type="radio" id="radio14" name="destroy" data-title="是" class="md-radiobtn"
+										   value="1">
+									<label for="radio14">
+										<span></span>
+										<span class="check"></span>
+										<span class="box"></span> 是
+									</label>
+								</div>
+								<div class="md-radio has-error">
+									<input type="radio" id="radio15" name="destroy" class="md-radiobtn" data-title="否"
+										   value="0" checked="checked">
+									<label for="radio15" style="color:#FFC0CB">
+										<span></span>
+										<span class="check"></span>
+										<span class="box"></span> 否
+									</label>
+								</div>
+							</div>
+						</div>
+					</div>
+					<!-- 是否撤销 START -->
+				</div>
+				<!-- 表单分组组件 form-group END -->
+
+				<!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+					<!-- 起始站名称 START (该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的起点站。默认使用该字段填写值) -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"><span class="required"> * </span>
+							起始站名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+						</label>
+						<div class="col-md-4">
+							<input type="text" class="form-control" name="startStationName" id="startStationNameInput"
+								   placeholder="起始站名称">
+							<span class="help-block"> 说明 :上行起始站名称 </span>
+						</div>
+					</div>
+					<!-- 起始站名称 END -->
+
+					<!-- 终点站名称 START  (该字段值会在规划线路站点操作时会去验证是否有值。如果为空，则用线路规划站点的终点站。默认使用该字段填写值) -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"><span class="required"> * </span> 终点站名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+						</label>
+						<div class="col-md-4">
+							<input type="text" class="form-control" name="endStationName" id="endStationNameInput"
+								   placeholder="终点站名称">
+							<span class="help-block"> 说明 :上行终点站名称 </span>
+						</div>
+					</div>
+					<!-- 终点站名称 END -->
+				</div>
+				<!-- 表单分组组件 form-group END -->
+
+				<!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+					<!-- 起始站首班车时间 (* 必填项)  START -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"><span class="required"> * </span> 起始站首班时间: </label>
+						<div class="col-md-4">
+							<input type="text" class="form-control" name="startStationFirstTime"
+								   id="startStationFirstTimeInput" placeholder="起始站首班车时间">
+							<span class="help-block"> 例如 :06:00 </span>
+						</div>
+					</div>
+					<!-- 起始站首班车时间  END -->
+
+					<!-- 起始站末班车时间 (* 必填项)  START -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"><span class="required"> * </span> 起始站末班时间: </label>
+						<div class="col-md-4">
+							<!-- <input type="text" class="form-control" name="StartStationEndTime" id="StartStationEndTimeInput" placeholder="起始站末班车时间 "> -->
+							<input type="text" class="form-control" name="startStationEndTime" id="endTimeInput"
+								   placeholder="起始站末班车时间">
+							<span class="help-block"> 例如 :17:00 </span>
+						</div>
+					</div>
+					<!-- 起始站末班车时间 END -->
+				</div>
+				<!-- 表单分组组件 form-group END -->
+
+				<!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+					<!-- 终点站首班车时间 (* 必填项)  START -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"><span class="required"> * </span> 终点站首班时间: </label>
+						<div class="col-md-4">
+							<input type="text" class="form-control" name="endStationFirstTime"
+								   id="endStationFirstTimeInput" placeholder="终点站首班车时间">
+							<span class="help-block"> 例如 :05:00 </span>
+						</div>
+					</div>
+					<!-- 终点站首班车时间 END -->
+
+					<!-- 终点站末班车时间 (* 必填项)  START -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"><span class="required"> * </span> 终点站末班时间: </label>
+						<div class="col-md-4">
+							<input type="text" class="form-control" name="endStationEndTime" id="endStationEndTimeInput"
+								   placeholder="终点站末班车时间 ">
+							<span class="help-block"> 例如 :18:00 </span>
+						</div>
+					</div>
+					<!-- 终点站末班车时间 END -->
+				</div>
+				<!-- 表单分组组件 form-group END -->
+
+				<!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+					<!-- 线路规划类型 (* 必填项) START (因为options值基本固定，所以在页面固定。【以后可以根具需求修改成使用字典表实现】) -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"><span class="required"> * </span> 线路规划类型&nbsp;&nbsp;&nbsp;:</label>
+						<div class="col-md-4">
+							<select name="linePlayType" class="form-control" id="linePlayTypeSelect">
+								<option value="">-- 请选择线路类型 --</option>
+								<option value="0">双向（包括双环线）</option>
+								<option value="1">单环线</option>
+							</select>
+						</div>
+					</div>
+					<!-- 线路规划类型 (* 必填项) END -->
+
+					<!--车辆区域 START　-->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"> <span class="required"> * </span>线路区域&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+						</label>
+						<div class="col-md-4">
+							<select name="region" class="form-control" id="regionSelect">
+								<option value="">-- 请选择车辆区域 --</option>
+								<option value="0">区内</option>
+								<option value="1">区外</option>
+							</select>
+						</div>
+					</div>
+					<!--车辆区域END　-->
+
+				</div>
+				<!-- 表单分组组件 form-group START -->
+
+				<!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+					<!--大间隔等级 START　-->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"> 大间隔等级&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+						<div class="col-md-4">
+							<select name="spacGrade" class="form-control" id="spacGradeSelect">
+								<option value="">-- 请选择大间隔等级 --</option>
+								<option value="1">一级</option>
+								<option value="2">二级</option>
+								<option value="3">三级</option>
+								<option value="4">四级</option>
+								<option value="5">五级</option>
+							</select>
+						</div>
+					</div>
+					<!-- 大间隔等级END　-->
+					 <!-- 线路票价 START -->
+                    <div class="col-md-6">
+                        <label class="control-label col-md-5"> 票价&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+                        <div class="col-md-4">
+                            <input type="text" class="form-control" name="ticketPrice" id="ticketPriceInput"
+                                   placeholder="票价">
+                        </div>
+                    </div>
+                    <!-- 线路简称 END -->
+				</div>
+
+				<!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+					<!-- 线路简称 START -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"> 线路简称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+						<div class="col-md-4">
+							<input type="text" class="form-control" name="shortName" id="shortNameInput"
+								   placeholder="线路简称">
+						</div>
+					</div>
+					<!-- 线路简称 END -->
+
+					<!-- 英文名称 START -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"> 英文名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+						<div class="col-md-4">
+							<input type="text" class="form-control" name="es" id="esInput" placeholder="英文名称">
+						</div>
+					</div>
+					<!-- 英文名称 END -->
+				</div>
+				<!-- 表单分组组件 form-group END -->
+
+				<!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+					<!-- 上海市线路编码 START -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"> 上海市线路编码: </label>
+						<div class="col-md-4">
+							<input type="text" class="form-control" name="shanghaiLinecode" id="shanghaiLinecodeInput"
+								   placeholder="上海市线路编码">
+						</div>
+					</div>
+					<!-- 上海市线路编码 END -->
+
+					<!--设备线路编码 START -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"> 设备线路编码&nbsp;&nbsp;&nbsp;: </label>
+						<div class="col-md-4">
+							<input type="text" class="form-control" name="eqLinecode" id="eqLinecodeInput"
+								   placeholder="设备线路编码">
+						</div>
+					</div>
+					<!--设备线路编码 END -->
+				</div>
+				<!-- 表单分组组件 form-group END -->
+
+				<!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+					<!-- 起始站调度电话 START -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"> 起始站调度电话: </label>
+						<div class="col-md-4">
+							<input type="text" class="form-control" name="startPhone" id="startPhoneInput"
+								   placeholder="起始站调度电话">
+						</div>
+					</div>
+					<!-- 起始站调度电话 END -->
+
+					<!-- 终点站调度电话 START -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"> 终点站调度电话: </label>
+						<div class="col-md-4">
+							<input type="text" class="form-control" name="endPhone" id="startPhoneInput"
+								   placeholder="终点站调度电话">
+						</div>
+					</div>
+					<!-- 终点站调度电话 START -->
+				</div>
+				<!-- 表单分组组件 form-group END -->
+
+				<!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+					<!-- 车辆总数 START -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"> 车辆总数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+						<div class="col-md-4">
+							<input type="text" class="form-control" name="carSumNumber" id="carSumNumberInput"
+								   placeholder="车辆总数">
+						</div>
+					</div>
+					<!-- 车辆总数 END -->
+
+					<!-- 普通车辆数 START -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"> 普通车辆数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+						<div class="col-md-4">
+							<input type="text" class="form-control" name="ordCarNumber" id="ordCarNumberInput"
+								   placeholder="普通车辆数">
+						</div>
+					</div>
+					<!-- 普通车辆数 END -->
+				</div>
+				<!-- 表单分组组件 form-group END -->
+								<div class="form-group">
+					<!-- 权证车辆数 START -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"> 权证车辆数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+						<div class="col-md-4">
+							<input type="text" class="form-control" name="warrantCar" id="warrantCarInput"
+								   placeholder="权证车辆数">
+						</div>
+					</div>
+					<!-- 权证车辆数 END -->
+                    </div>
+				<!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+					<!-- 空调车辆数 START -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"> 空调车辆数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+						<div class="col-md-4">
+							<input type="text" class="form-control" name="hvacCarNumber" id="hvacCarNumberInput"
+								   placeholder="空调车辆数">
+						</div>
+					</div>
+					<!-- 空调车辆数 END -->
+					<!-- 开辟日期 START　-->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"> 开辟日期&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+						<div class="col-md-4">
+							<input type="text" class="form-control" name="openDate" id="openDateInput"
+								   placeholder="开辟日期">
+						</div>
+					</div>
+					<!-- 开辟日期 END　-->
+				</div>
+				<!-- 表单分组组件 form-group END -->
+				<!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+					<!-- 线路沿革 START -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"> 线路沿革&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+						<div class="col-md-4">
+                            <textarea class="form-control" rows="3" name="history" id="historyTextarea"
+									  placeholder="线路沿革"></textarea>
+							<span class="help-block">日期及内容:如2014-1-1，开辟；2014-5-1，延线；</span>
+						</div>
+					</div>
+					<!-- 线路沿革 END -->
+
+					<!-- 描述/说明 START -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"> 描述/说明&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+						<div class="col-md-4">
+                            <textarea class="form-control" rows="3" name="descriptions" id="descriptionsTextarea"
+									  placeholder="描述/说明"></textarea>
+						</div>
+					</div>
+					<!-- 描述/说明 END -->
+				</div>
+				<!-- 表单分组组件 form-group END -->
+			</div>
+
+			<!-- 表单按钮组件 START -->
+			<div class="form-actions">
+				<div class="row">
+					<div class="col-md-offset-5 col-md-7">
+						<button type="submit" class="btn green" ><i class="fa fa-check"></i> 提交</button>
+						<a type="button" class="btn default" href="list.html" data-pjax><i class="fa fa-times"></i> 取消</a>
+					</div>
+				</div>
+			</div>
+			<!-- 表单按钮组件 END -->
+		</form>
+		<!-- END FORM-->
+	</div>
+	<!-- 表单组件 END -->
+</div>
+<!-- 信息容器组件 END -->
+
+<!-- 线路信息修改片段JS模块 -->
 <script src="/pages/base/line/js/line-edit-form.js"></script>
 \ No newline at end of file