Merge branch 'minhang' into pudong

潘钊
2 parents 96edad4d d60fa05e
Showing 57 changed files with 3313 additions and 462 deletions
src/main/java/com/bsth/controller/LineVersionsController.java
src/main/java/com/bsth/controller/SectionController.java
src/main/java/com/bsth/data/LineVersionsData.java
src/main/java/com/bsth/data/utils/ListFilterUtils.java
src/main/java/com/bsth/data/utils/ListPageQueryUtils.java
src/main/java/com/bsth/entity/LineVersions.java
src/main/java/com/bsth/entity/LsSectionRoute.java
src/main/java/com/bsth/entity/LsStationRoute.java
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/java/com/bsth/repository/LineVersionsRepository.java
src/main/java/com/bsth/repository/LsSectionRouteRepository.java
src/main/java/com/bsth/repository/LsStationRouteRepository.java
src/main/java/com/bsth/repository/SectionRouteRepository.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/service/LineVersionsService.java
src/main/java/com/bsth/service/SectionRouteService.java
src/main/java/com/bsth/service/SectionService.java
src/main/java/com/bsth/service/StationRouteService.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/impl/LineVersionsServiceImpl.java
+package com.bsth.controller;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.bsth.data.LineVersionsData;
+import com.bsth.entity.Line;
+import com.bsth.entity.LineVersions;
+import com.bsth.entity.LsStationRoute;
+import com.bsth.entity.StationRoute;
+import com.bsth.repository.LineRepository;
+import com.bsth.repository.LsStationRouteRepository;
+import com.bsth.service.LineVersionsService;
+
+/**
+ * 
+ * @ClassName: LineController(线路版本控制器)
+ * 
+ * @Extends : BaseController
+ * 
+ * @Description: TODO(线路版本版控制层)
+ * 
+ * @Author bsth@lq
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+@RestController
+@RequestMapping("lineVersions")
+public class LineVersionsController extends BaseController<LineVersions, Integer> {
+	
+	@Autowired
+	private LineVersionsService service;
+	
+	@Autowired
+	LineRepository lineRepository;
+	  @Autowired
+	    LsStationRouteRepository  lsStationRouteRepository ;
+	/**
+	 * 获取线路所有版本
+	 * 
+	 */
+	@RequestMapping(value = "findByLineId", method = RequestMethod.GET)
+	public List<LineVersions> getLineCode(@RequestParam(defaultValue = "lineId") int lineId) {
+		return service.findByLineCode(lineId);
+	}
+	
+	/**
+	 * 根据id查询线路版本信息
+	 * 
+	 */
+	@RequestMapping(value = "findById", method = RequestMethod.GET)
+	public LineVersions findOne(@RequestParam(defaultValue = "id") int id) {
+		service.lineUpdate();
+		return service.findById(id);
+	}
+	
+	/**
+	 * 根据id修改线路版本信息
+	 * 
+	 */
+	@RequestMapping(value = "update", method = RequestMethod.POST)
+	public Map<String, Object> update(@RequestParam Map<String, Object> map) {
+		return service.update(map);
+	}
+	
+	@RequestMapping(value = "add", method = RequestMethod.POST)
+	public Map<String, Object> add(@RequestParam Map<String, Object> map) {
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		
+		LineVersions lineVersions = new LineVersions();
+		try {
+			Date startDate = simpleDateFormat.parse(map.get("startDate").toString());
+			Date endDate = simpleDateFormat.parse(map.get("endDate").toString());
+			Line line = lineRepository.findOne(Integer.valueOf(map.get("lineId").toString())); 
+			lineVersions.setLine(line);
+			lineVersions.setLineCode(map.get("lineCode").toString());
+			lineVersions.setStartDate(new java.sql.Date(startDate.getTime()));
+			lineVersions.setEndDate(new java.sql.Date(endDate.getTime()));
+			lineVersions.setVersions(Integer.valueOf(map.get("versions").toString()));
+			lineVersions.setStatus(Integer.valueOf(map.get("status").toString()));
+			lineVersions.setRemark(map.get("remark").toString());
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return service.save(lineVersions);
+	}
+	
+}
@@ -74,6 +74,24 @@ public class SectionController extends BaseController&lt;Section, Integer&gt; {
 	}
  
 	/**
+	 * @Description :TODO(编辑线路走向保存到线路历史表)
+	 * 
+	 * @param map <sectionId:路段ID； sectionJSON：路段信息>
+	 * 
+	 * @return Map<String, Object> <SUCCESS ; ERROR>
+	 */
+	@RequestMapping(value="sectionCutSaveLineLS" , method = RequestMethod.POST)
+	public Map<String, Object> sectionCutSaveLineLS(@RequestParam Map<String, Object> map) {
+		
+		map.put("updateBy", "");
+		
+		map.put("createBy", "");
+		
+		return service.sectionCutSaveLineLS(map);
+		
+	}
+	
+	/**
 	 * @Description :TODO(编辑线路走向)
 	 * 
 	 * @param map <sectionId:路段ID； sectionJSON：路段信息>
+package com.bsth.data;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import com.bsth.entity.LineVersions;
+import com.bsth.service.LineVersionsService;
+import com.bsth.service.StationRouteService;
+
+/**
+ * @ClassName: LineVersionsData
+ * @Description: TODO(线路版本数据管理)
+ */
+@Component
+@Order(20)
+public class LineVersionsData implements CommandLineRunner {
+
+    static Logger logger = LoggerFactory.getLogger(LineVersionsData.class);
+
+
+    @Autowired
+    LineVersionsService lineVersionsService;
+    
+    @Autowired
+    StationRouteService stationRouteService;
+
+    @Override
+    public void run(String... arg0) throws Exception {
+    	
+    	
+    	try {
+    		List<LineVersions> list = lineVersionsService.lineUpdate();
+    		for (LineVersions lineVersions : list) {
+        		Integer lineId = lineVersions.getLine().getId();
+        		// 更新线路文件
+    			Map<String, Object> map = new HashMap<>();
+    			map.put("lineId", lineId);
+    			stationRouteService.usingSingle(map);
+    		}
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+    }
+}
-package com.bsth.data.utils;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 集合搜索过滤
- * Created by panzhao on 2017/8/2.
- */
-public class ListFilterUtils {
-
-    static Logger logger = LoggerFactory.getLogger(ListFilterUtils.class);
-
-    public static List filter(Collection all, Map<String, Object> map, Class clazz) {
-        List rs = new ArrayList();
-        Field[] fields = clazz.getDeclaredFields();
-
-        //参与过滤的字段
-        List<Field> fs = new ArrayList<>();
-        for (Field f : fields) {
-            f.setAccessible(true);
-            if (map.containsKey(f.getName()))
-                fs.add(f);
-        }
-
-        //过滤数据
-        for (Object obj : all) {
-            if (fieldEquals(fs, obj, map))
-                rs.add(obj);
-        }
-        return rs;
-    }
-
-    public static boolean fieldEquals(List<Field> fs, Object obj, Map<String, Object> map) {
-        try {
-            for (Field f : fs) {
-                if (StringUtils.isEmpty(map.get(f.getName()).toString()))
-                    continue;
-
-                if (f.get(obj) == null || f.get(obj).toString().indexOf(map.get(f.getName()).toString()) == -1)
-                    return false;
-            }
-        } catch (Exception e) {
-            logger.error("", e);
-            return false;
-        }
-        return true;
-    }
-}
+package com.bsth.data.utils;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 集合搜索过滤
+ * Created by panzhao on 2017/8/2.
+ */
+public class ListFilterUtils {
+
+    static Logger logger = LoggerFactory.getLogger(ListFilterUtils.class);
+
+    public static List filter(Collection all, Map<String, Object> map, Class clazz) {
+        List rs = new ArrayList();
+        Field[] fields = clazz.getDeclaredFields();
+
+        //参与过滤的字段
+        List<Field> fs = new ArrayList<>();
+        for (Field f : fields) {
+            f.setAccessible(true);
+            if (map.containsKey(f.getName()))
+                fs.add(f);
+        }
+
+        //过滤数据
+        for (Object obj : all) {
+            if (fieldEquals(fs, obj, map))
+                rs.add(obj);
+        }
+        return rs;
+    }
+
+    public static boolean fieldEquals(List<Field> fs, Object obj, Map<String, Object> map) {
+        try {
+            for (Field f : fs) {
+                if (StringUtils.isEmpty(map.get(f.getName()).toString()))
+                    continue;
+
+                if (f.get(obj) == null || f.get(obj).toString().indexOf(map.get(f.getName()).toString()) == -1)
+                    return false;
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+            return false;
+        }
+        return true;
+    }
+}
-package com.bsth.data.utils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 集合分页工具
- * Created by panzhao on 2017/8/2.
- */
-public class ListPageQueryUtils {
-
-    public static List paging(List all, int page, int pageSize) {
-        List rs = new ArrayList(pageSize);
-
-        int s = page * pageSize;
-        int e = (page + 1) * pageSize;
-
-        int size = all.size();
-
-        if (e > size)
-            e = size;
-
-        if (s > size)
-            return rs;
-
-        for (; s < e; s++) {
-            rs.add(all.get(s));
-        }
-        return rs;
-    }
-}
+package com.bsth.data.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 集合分页工具
+ * Created by panzhao on 2017/8/2.
+ */
+public class ListPageQueryUtils {
+
+    public static List paging(List all, int page, int pageSize) {
+        List rs = new ArrayList(pageSize);
+
+        int s = page * pageSize;
+        int e = (page + 1) * pageSize;
+
+        int size = all.size();
+
+        if (e > size)
+            e = size;
+
+        if (s > size)
+            return rs;
+
+        for (; s < e; s++) {
+            rs.add(all.get(s));
+        }
+        return rs;
+    }
+}
+package com.bsth.entity;
+
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+
+/**
+ * 
+ * @ClassName: LineVersions(线路版本实体类)
+ * 
+ * @Description: TODO(线路版本)
+ * 
+ * @Author bsth@lq
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Entity
+@Table(name = "bsth_c_line_versions")
+public class LineVersions{
+	
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	/** ID 主键(唯一标识符) int length(11) */
+	private Integer id;
+	
+	/** 线路ID  int length(11) */
+	@ManyToOne
+	private Line line;
+	
+	/** 线路编码 varchar length(50) */ 
+	private String lineCode;
+
+	/** 版本号  int length(11)  */
+	private int versions;
+	
+	/** 启用日期 timestamp  */
+	private Date startDate;
+	
+	/** 终止日期 timestamp  */
+	private Date endDate;
+	
+	/** 创建日期 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;
+
+	/** 备注 varchar length(50) */ 
+	private String remark;
+	
+	/** 版本状态 int length(11)
+	 *  0（历史版本），1（当前版本），2（待更新版本）
+	 */ 
+	private int status;
+	
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Line getLine() {
+		return line;
+	}
+
+	public void setLine(Line line) {
+		this.line = line;
+	}
+
+	public String getLineCode() {
+		return lineCode;
+	}
+
+	public void setLineCode(String lineCode) {
+		this.lineCode = lineCode;
+	}
+
+	public int getVersions() {
+		return versions;
+	}
+
+	public void setVersions(int versions) {
+		this.versions = versions;
+	}
+
+	public Date getStartDate() {
+		return startDate;
+	}
+
+	public void setStartDate(Date startDate) {
+		this.startDate = startDate;
+	}
+
+	public Date getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(Date endDate) {
+		this.endDate = endDate;
+	}
+
+	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 String getRemark() {
+		return remark;
+	}
+	
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public int getStatus() {
+		return status;
+	}
+
+	public void setStatus(int status) {
+		this.status = status;
+	}
+	
+}
 \ No newline at end of file
+package com.bsth.entity;
+
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+
+
+/**
+ * 
+ * @ClassName : SectionRoute(历史路段路由实体类)
+ * 
+ * @Author : bsth@lq
+ * 
+ * @Description : TODO(历史路段路由)
+ *	
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Entity
+@Table(name = "bsth_c_ls_sectionroute")
+public class LsSectionRoute {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+	
+	// 路段路由序号
+	private Integer sectionrouteCode;
+	
+	// 线路编号
+	private String lineCode;
+	
+	// 路段编号
+	private String sectionCode;
+	
+	// 路段路由方向
+	private Integer directions;
+	
+	// 版本号
+	private Integer versions;
+	
+	// 是否撤销
+	private Integer destroy;
+	
+	/** 是否有路段限速数据  <0：分段；1：未分段>*/
+	private Integer isRoadeSpeed;
+	
+	// 描述
+	private String descriptions;
+		
+	// 创建人
+	private Integer createBy;
+	
+	// 修改人
+	private Integer updateBy;
+		
+	// 创建日期
+	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+	private Date createDate;
+		
+	// 修改日期
+	@Column(name = "update_date", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+	private Date updateDate;
+		
+	// 路段信息
+	@OneToOne
+	private Section section;
+	
+	// 线路信息
+	@ManyToOne
+	private Line line;
+	
+	public Integer getIsRoadeSpeed() {
+		return isRoadeSpeed;
+	}
+
+	public void setIsRoadeSpeed(Integer isRoadeSpeed) {
+		this.isRoadeSpeed = isRoadeSpeed;
+	}
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Integer getSectionrouteCode() {
+		return sectionrouteCode;
+	}
+
+	public void setSectionrouteCode(Integer sectionrouteCode) {
+		this.sectionrouteCode = sectionrouteCode;
+	}
+
+	public String getLineCode() {
+		return lineCode;
+	}
+
+	public void setLineCode(String lineCode) {
+		this.lineCode = lineCode;
+	}
+
+	public String getSectionCode() {
+		return sectionCode;
+	}
+
+	public void setSectionCode(String sectionCode) {
+		this.sectionCode = sectionCode;
+	}
+
+	public Integer getDirections() {
+		return directions;
+	}
+
+	public void setDirections(Integer directions) {
+		this.directions = directions;
+	}
+
+	public Integer getVersions() {
+		return versions;
+	}
+
+	public void setVersions(Integer versions) {
+		this.versions = versions;
+	}
+	
+	public Integer getDestroy() {
+		return destroy;
+	}
+
+	public void setDestroy(Integer destroy) {
+		this.destroy = destroy;
+	}
+
+	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 Section getSection() {
+		return section;
+	}
+
+	public void setSection(Section section) {
+		this.section = section;
+	}
+
+	public Line getLine() {
+		return line;
+	}
+
+	public void setLine(Line line) {
+		this.line = line;
+	}
+}
+package com.bsth.entity;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * 
+ * @ClassName : StationRoute(历史站点路由实体类)
+ * 
+ * @Author : bsth@lq
+ * 
+ * @Description : TODO(历史站点路由)
+ *	
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Entity
+@Table(name = "bsth_c_ls_stationroute")
+@NamedEntityGraphs({
+    @NamedEntityGraph(name = "ls_stationRoute_station", attributeNodes = {
+            @NamedAttributeNode("station"),
+            @NamedAttributeNode("line")
+    })
+})
+public class LsStationRoute {
+	
+	//站点路由ID
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+	
+	// 站点路由序号
+	private Integer stationRouteCode;
+	
+	// 站点编码
+	private String stationCode;
+	
+	// 站点名称
+	private String stationName;
+	
+	// 线路编码
+	private String lineCode;
+	
+	/**
+	 * 站点类型
+	 * 
+	 * ------ B：起点站
+	 * 
+	 * ------ Z：中途站
+	 * 
+	 * ------ E：终点站
+	 * 
+	 * ------ T：停车场
+	 * 
+	 */
+	private String stationMark;
+	
+	// 站点路由出站序号
+	private Integer outStationNmber;
+	
+	// 站点路由到站距离
+	private Double distances;
+	
+	// 站点路由到站时间
+	private Double toTime;
+	
+	// 首班时间
+	private String firstTime;
+	
+	// 末班时间
+	private String endTime;
+	
+	// 站点路由方向
+	private Integer directions;
+	
+	// 版本号
+	private Integer versions;
+	
+	// 是否撤销
+	private Integer destroy;
+	
+	// 描述
+	private String descriptions;
+	
+	// 创建人
+	private Integer createBy;
+		
+	// 修改人
+	private Integer updateBy;
+	
+	// 创建日期
+	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+	private Date createDate;
+	
+	// 修改日期
+	@Column(name = "update_date", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+	private Date updateDate;
+	
+	// 站点信息
+	@ManyToOne(fetch = FetchType.LAZY)
+	private Station station;
+	
+	// 线路信息
+	@ManyToOne
+	private Line line;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Integer getStationRouteCode() {
+		return stationRouteCode;
+	}
+
+	public void setStationRouteCode(Integer stationRouteCode) {
+		this.stationRouteCode = stationRouteCode;
+	}
+
+	public String getStationCode() {
+		return stationCode;
+	}
+
+	public void setStationCode(String stationCode) {
+		this.stationCode = stationCode;
+	}
+
+	public String getStationName() {
+		return stationName;
+	}
+
+	public void setStationName(String stationName) {
+		this.stationName = stationName;
+	}
+
+	public String getLineCode() {
+		return lineCode;
+	}
+
+	public void setLineCode(String lineCode) {
+		this.lineCode = lineCode;
+	}
+
+	public String getStationMark() {
+		return stationMark;
+	}
+
+	public void setStationMark(String stationMark) {
+		this.stationMark = stationMark;
+	}
+
+	public Integer getOutStationNmber() {
+		return outStationNmber;
+	}
+
+	public void setOutStationNmber(Integer outStationNmber) {
+		this.outStationNmber = outStationNmber;
+	}
+
+	public Double getDistances() {
+		return distances;
+	}
+
+	public void setDistances(Double distances) {
+		this.distances = distances;
+	}
+
+	public Double getToTime() {
+		return toTime;
+	}
+
+	public void setToTime(Double toTime) {
+		this.toTime = toTime;
+	}
+
+	public String getFirstTime() {
+		return firstTime;
+	}
+
+	public void setFirstTime(String firstTime) {
+		this.firstTime = firstTime;
+	}
+
+	public String getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(String endTime) {
+		this.endTime = endTime;
+	}
+
+	public Integer getDirections() {
+		return directions;
+	}
+
+	public void setDirections(Integer directions) {
+		this.directions = directions;
+	}
+	
+	public Integer getVersions() {
+		return versions;
+	}
+
+	public void setVersions(Integer versions) {
+		this.versions = versions;
+	}
+	
+	public Integer getDestroy() {
+		return destroy;
+	}
+
+	public void setDestroy(Integer destroy) {
+		this.destroy = destroy;
+	}
+
+	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 Station getStation() {
+		return station;
+	}
+
+	public void setStation(Station station) {
+		this.station = station;
+	}
+
+	public Line getLine() {
+		return line;
+	}
+
+	public void setLine(Line line) {
+		this.line = line;
+	}
+}
 \ No newline at end of file
@@ -4,7 +4,6 @@ import com.bsth.entity.Line;
 import com.bsth.service.schedule.rules.rerun.RerunRule_input;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_Type;
-import org.apache.commons.lang3.StringUtils;
  
 import javax.persistence.*;
 import java.sql.PreparedStatement;
@@ -181,28 +180,28 @@ public class SchedulePlanInfo extends BEntity {
             }
  
             this.j = employeeConfigInfo.getJsy().getId();
-//        this.jGh = employeeConfigInfo.getJsy().getJobCode();
-            if (StringUtils.isNotEmpty(employeeConfigInfo.getJsy().getJobCode())) {
-                String[] jsy_temp = employeeConfigInfo.getJsy().getJobCode().split("-");
-                if (jsy_temp.length > 1) {
-                    this.jGh = jsy_temp[1];
-                } else {
-                    this.jGh = jsy_temp[0];
-                }
-            }
+            this.jGh = employeeConfigInfo.getJsy().getJobCodeori();
+//            if (StringUtils.isNotEmpty(employeeConfigInfo.getJsy().getJobCode())) {
+//                String[] jsy_temp = employeeConfigInfo.getJsy().getJobCode().split("-");
+//                if (jsy_temp.length > 1) {
+//                    this.jGh = jsy_temp[1];
+//                } else {
+//                    this.jGh = jsy_temp[0];
+//                }
+//            }
             this.jName = employeeConfigInfo.getJsy().getPersonnelName();
             // 关联的售票员
             if (employeeConfigInfo.getSpy() != null) {
                 this.s = employeeConfigInfo.getSpy().getId();
-//            this.sGh = employeeConfigInfo.getSpy().getJobCode();
-                if (StringUtils.isNotEmpty(employeeConfigInfo.getSpy().getJobCode())) {
-                    String[] spy_temp = employeeConfigInfo.getSpy().getJobCode().split("-");
-                    if (spy_temp.length > 1) {
-                        this.sGh = spy_temp[1];
-                    } else {
-                        this.sGh = spy_temp[0];
-                    }
-                }
+                this.sGh = employeeConfigInfo.getSpy().getJobCodeori();
+//                if (StringUtils.isNotEmpty(employeeConfigInfo.getSpy().getJobCode())) {
+//                    String[] spy_temp = employeeConfigInfo.getSpy().getJobCode().split("-");
+//                    if (spy_temp.length > 1) {
+//                        this.sGh = spy_temp[1];
+//                    } else {
+//                        this.sGh = spy_temp[0];
+//                    }
+//                }
  
                 this.sName = employeeConfigInfo.getSpy().getPersonnelName();
             }
@@ -230,28 +229,28 @@ public class SchedulePlanInfo extends BEntity {
             }
  
             this.j = employeeConfigInfo.getJsy().getId();
-//        this.jGh = employeeConfigInfo.getJsy().getJobCode();
-            if (StringUtils.isNotEmpty(employeeConfigInfo.getJsy().getJobCode())) {
-                String[] jsy_temp = employeeConfigInfo.getJsy().getJobCode().split("-");
-                if (jsy_temp.length > 1) {
-                    this.jGh = jsy_temp[1];
-                } else {
-                    this.jGh = jsy_temp[0];
-                }
-            }
+            this.jGh = employeeConfigInfo.getJsy().getJobCodeori();
+//            if (StringUtils.isNotEmpty(employeeConfigInfo.getJsy().getJobCode())) {
+//                String[] jsy_temp = employeeConfigInfo.getJsy().getJobCode().split("-");
+//                if (jsy_temp.length > 1) {
+//                    this.jGh = jsy_temp[1];
+//                } else {
+//                    this.jGh = jsy_temp[0];
+//                }
+//            }
             this.jName = employeeConfigInfo.getJsy().getPersonnelName();
             // 关联的售票员
             if (employeeConfigInfo.getSpy() != null) {
                 this.s = employeeConfigInfo.getSpy().getId();
-//            this.sGh = employeeConfigInfo.getSpy().getJobCode();
-                if (StringUtils.isNotEmpty(employeeConfigInfo.getSpy().getJobCode())) {
-                    String[] spy_temp = employeeConfigInfo.getSpy().getJobCode().split("-");
-                    if (spy_temp.length > 1) {
-                        this.sGh = spy_temp[1];
-                    } else {
-                        this.sGh = spy_temp[0];
-                    }
-                }
+                this.sGh = employeeConfigInfo.getSpy().getJobCodeori();
+//                if (StringUtils.isNotEmpty(employeeConfigInfo.getSpy().getJobCode())) {
+//                    String[] spy_temp = employeeConfigInfo.getSpy().getJobCode().split("-");
+//                    if (spy_temp.length > 1) {
+//                        this.sGh = spy_temp[1];
+//                    } else {
+//                        this.sGh = spy_temp[0];
+//                    }
+//                }
  
                 this.sName = employeeConfigInfo.getSpy().getPersonnelName();
             }
@@ -316,28 +315,28 @@ public class SchedulePlanInfo extends BEntity {
             }
  
             this.j = employeeConfigInfo.getJsy().getId();
-//        this.jGh = employeeConfigInfo.getJsy().getJobCode();
-            if (StringUtils.isNotEmpty(employeeConfigInfo.getJsy().getJobCode())) {
-                String[] jsy_temp = employeeConfigInfo.getJsy().getJobCode().split("-");
-                if (jsy_temp.length > 1) {
-                    this.jGh = jsy_temp[1];
-                } else {
-                    this.jGh = jsy_temp[0];
-                }
-            }
+            this.jGh = employeeConfigInfo.getJsy().getJobCodeori();
+//            if (StringUtils.isNotEmpty(employeeConfigInfo.getJsy().getJobCode())) {
+//                String[] jsy_temp = employeeConfigInfo.getJsy().getJobCode().split("-");
+//                if (jsy_temp.length > 1) {
+//                    this.jGh = jsy_temp[1];
+//                } else {
+//                    this.jGh = jsy_temp[0];
+//                }
+//            }
             this.jName = employeeConfigInfo.getJsy().getPersonnelName();
             // 关联的售票员
             if (employeeConfigInfo.getSpy() != null) {
                 this.s = employeeConfigInfo.getSpy().getId();
-//            this.sGh = employeeConfigInfo.getSpy().getJobCode();
-                if (StringUtils.isNotEmpty(employeeConfigInfo.getSpy().getJobCode())) {
-                    String[] spy_temp = employeeConfigInfo.getSpy().getJobCode().split("-");
-                    if (spy_temp.length > 1) {
-                        this.sGh = spy_temp[1];
-                    } else {
-                        this.sGh = spy_temp[0];
-                    }
-                }
+                this.sGh = employeeConfigInfo.getSpy().getJobCodeori();
+//                if (StringUtils.isNotEmpty(employeeConfigInfo.getSpy().getJobCode())) {
+//                    String[] spy_temp = employeeConfigInfo.getSpy().getJobCode().split("-");
+//                    if (spy_temp.length > 1) {
+//                        this.sGh = spy_temp[1];
+//                    } else {
+//                        this.sGh = spy_temp[0];
+//                    }
+//                }
  
                 this.sName = employeeConfigInfo.getSpy().getPersonnelName();
             }
+package com.bsth.repository;
+
+import java.util.Date;
+import java.util.List;
+
+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.LineVersions;
+
+/**
+ * 
+ * @Interface: LineVersionsRepository(线路Repository数据持久层接口)
+ * 
+ * @Extends : BaseRepository
+ * 
+ * @Description: TODO(线路版本Repository数据持久层接口)
+ * 
+ * @Author bsth@lq
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+@Repository
+public interface LineVersionsRepository extends BaseRepository<LineVersions, Integer> {
+	
+	/**
+	 * 获取线路所有版本
+	 */
+	@Query(value = "  SELECT lv FROM LineVersions lv where lv.line.id = ?1")
+	public List<LineVersions> findBylineCode(int lineId);
+	
+	@Transactional
+	@Modifying
+	@Query(value = "UPDATE LineVersions lv set lv.line=?2, lv.lineCode=?3, lv.startDate=?4, lv.endDate=?5, "
+			+ "lv.versions=?6, lv.status=?7, lv.remark=?8 where lv.id=?1")
+	public int update(Integer id, Line line, String lineCode, Date startDate, Date endDate, Integer versions, Integer status,
+			String remark);
+	
+	/**
+	 * 查询待更新线路的线路版本
+	 */
+	@Query(value = "SELECT lv FROM LineVersions lv where lv.status = 2 and lv.startDate<sysdate() and lv.endDate > sysdate()")
+	public List<LineVersions> findupdated();
+
+	/**
+	 * 更改为历史版本
+	 */
+	@Modifying
+	@Query(value = "UPDATE LineVersions lv set lv.status=0 where lv.line.id=?1 and lv.lineCode=?2 and lv.status=1")
+	public void updateOdlVersions(Integer lineId, String lineCode);
+	
+	/**
+	 * 更改为当前版本
+	 */
+	@Modifying
+	@Query(value = "UPDATE LineVersions lv set lv.status=1 where lv.line.id=?1 and lv.lineCode=?2 and lv.versions=?3")
+	public void updateNewVersions(Integer lineId, String lineCode, Integer versions);
+	
+}
+package com.bsth.repository;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import com.bsth.entity.LsSectionRoute;
+
+/**
+ * 
+ * @Interface: SectionRouteRepository(路段路由Repository数据持久层接口)
+ * 
+ * @Extends : BaseRepository
+ * 
+ * @Description: TODO(路段路由Repository数据持久层接口)
+ * 
+ * @Author bsth@lq
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Repository
+public interface LsSectionRouteRepository extends BaseRepository<LsSectionRoute, Integer> {
+
+	/**
+	 * 查询待更新线路的路段路由
+	 */
+	@Query(value = "SELECT sr FROM LsSectionRoute sr where sr.line.id =?1 and sr.lineCode=?2 and sr.versions=?3")
+	public List<LsSectionRoute> findupdated(Integer lineId,String lineCode,Integer versions);
+	
+	/**
+     * 更新路线前删除线路版本下历史原有路段路由
+     */
+    @Modifying
+    @Query(value="DELETE from bsth_c_ls_sectionroute where line = ?1  and directions = ?2 and versions=?3", nativeQuery=true)
+    public void batchDelete(Integer line, Integer dir, Integer versions);
+}
+package com.bsth.repository;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.EntityGraph;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import com.bsth.entity.LsStationRoute;
+
+/**
+ * 
+ * @Interface: StationRouteRepository(站点路由Repository数据持久层接口)
+ * 
+ * @Extends : BaseRepository
+ * 
+ * @Description: TODO(站点路由Repository数据持久层接口)
+ * 
+ * @Author bsth@lq
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Repository
+public interface LsStationRouteRepository extends BaseRepository<LsStationRoute, Integer> {
+	
+	/**
+	 * 查询待更新线路的站点路由
+	 */
+	@EntityGraph(value = "ls_stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
+	@Query(value = "SELECT DISTINCT sr FROM LsStationRoute sr where sr.line.id =?1 and sr.lineCode=?2 and sr.versions=?3")
+	List<LsStationRoute> findupdated(Integer lineId, String lineCode, Integer versions);
+	
+	/**
+     * 更新路线前删除线路版本号历史原有站点路由
+     * 
+     * @param line
+     * @param dir
+     */
+    @Modifying
+    @Query(value="DELETE from bsth_c_ls_stationroute where line = ?1  and directions = ?2 and versions = ?3", nativeQuery=true)
+    public void batchDelete(Integer line,Integer dir, Integer versions);
+}
@@ -192,4 +192,14 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
     @Modifying
     @Query(value="update bsth_c_sectionroute set directions = case directions when 1 then 0 when 0 then 1 end where line_code = ?1   ", nativeQuery=true)
 	public void sectionRouteDir(Integer line);
+    
+    // 更具线路批量撤销
+    @Modifying
+    @Query(value="UPDATE SectionRoute sr set sr.destroy = 1 where sr.line.id = ?1  and sr.lineCode = ?2")
+	public void batchUpdate(Integer lineId, String lineCode);
+
+    // 批量删除
+    @Modifying
+    @Query(value="delete from SectionRoute sr where sr.line.id = ?1  and sr.lineCode = ?2")
+	public void batchDelete(Integer lineId, String lineCode);
 }
@@ -313,7 +313,7 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
    	public void stationRouteIsDestroyUpdBatch(Integer ids);
  
     /**
-     * 更新路线前撤销线路原有站点
+     * 
      * 
      * @param line
      * @param dir
@@ -321,4 +321,14 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
     @Modifying
     @Query(value="insert into (select * from bsth_c_stationroute_cache where line = ?1  and directions = ?2) bsth_c_stationroute", nativeQuery=true)
     public 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);
 }
+package com.bsth.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.bsth.entity.LineVersions;
+
+/**
+ * 
+ * @Interface: LineVersionsService(线路版本service业务层实现接口)
+ * 
+ * @extends : BaseService
+ * 
+ * @Description: TODO(线路版本service业务层实现接口)
+ * 
+ * @Author bsth@lq
+ * 
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+public interface LineVersionsService extends BaseService<LineVersions, Integer> {
+	
+	/**
+	 * 获取线路版本
+	 * 
+	 */
+	List<LineVersions> findByLineCode(int lineId);
+
+	Map<String, Object> update(Map<String, Object> map);
+
+	List<LineVersions> findupdated();
+
+	List<LineVersions> lineUpdate();
+
+}
@@ -62,5 +62,7 @@ public interface SectionRouteService extends BaseService&lt;SectionRoute, Integer&gt; 
 	 List<Map<String, Object>> findUpSectionRouteCode(Map<String, Object> map);
  
 	 Map<String, Object> quoteSection(Map<String, Object> map);
+
+	void batchUpdate(Integer lineId, String lineCode);
  
 }
@@ -35,4 +35,6 @@ public interface SectionService extends BaseService&lt;Section, Integer&gt; {
 	Map<String, Object> sectionCut(Map<String, Object> map);
  
 	Map<String, Object> sectionCacheUpdate(Map<String, Object> map);
+
+	Map<String, Object> sectionCutSaveLineLS(Map<String, Object> map);
 }
@@ -112,5 +112,7 @@ public interface StationRouteService extends BaseService&lt;StationRoute, Integer&gt; 
 	 * @return
 	 */
 	Map<String, Object> getSectionRouteExport(Integer id, HttpServletResponse resp);
+
+	void batchUpdate(Integer lineId, String lineCode);
  
 }
@@ -958,6 +958,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					if(tsSet.contains(schedule2.getId()) || schedule2.getBcType().toString().equals("in") || schedule2.getBcType().toString().equals("out")){
 						fcsj2 = schedule1.getZdsjT();
 					}
+					if(fcsj2 < fcsj1)
+						fcsj2 += 1440l;
 					if(sfqr == 1 && time1 > fcsj1){
 						jhyysj += fcsj2 - time1;
 					}else if(sfqr == 1 && time2 < fcsj2){
@@ -966,7 +968,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						jhyysj += fcsj2 - fcsj1;
 					}
 					if(jhyysj < 0){
-						System.out.println(fcsj2 + " - " + fcsj1);
+						System.out.println(fcsj2 + " - " + fcsj1 + " = " + (fcsj2 - fcsj1));
 					}
 					jhyysj1 += fcsj2 - fcsj1;
 				}
@@ -1010,7 +1012,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					List<ChildTaskPlan> cTasks = cMap.get(schedule.getId());
 					for(ChildTaskPlan childTaskPlan : cTasks){
 						Map<String, Object> temp = new HashMap<String, Object>();
-						if(childTaskPlan.getMileageType().equals("empty") || childTaskPlan.isDestroy()){
+						if(!childTaskPlan.getMileageType().equals("service") || childTaskPlan.isDestroy()
+								|| !childTaskPlan.getType1().equals("正常") || childTaskPlan.getCcId() != null){
 							temp.put("lc", null);
 							temp.put("fcsj", null);
 							temp.put("zdsj", null);
@@ -1071,6 +1074,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				} else if(i == keyList.size() - 1){
 					fcsj2 = Long.valueOf(m2.get("zdsj").toString());
 				}
+				if(fcsj2 < fcsj1){
+					fcsj2 += 1440l;
+				}
 				if(sfqr == 1 && time1 > fcsj1){
 					sjyysj += fcsj2 - time1;
 				}else if(sfqr == 1 && time2 < fcsj2){
+package com.bsth.service.impl;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.drools.core.time.impl.PseudoClockScheduler;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.bsth.common.ResponseCode;
+import com.bsth.entity.Line;
+import com.bsth.entity.LineVersions;
+import com.bsth.entity.LsSectionRoute;
+import com.bsth.entity.LsStationRoute;
+import com.bsth.entity.SectionRoute;
+import com.bsth.entity.StationRoute;
+import com.bsth.repository.LineRepository;
+import com.bsth.repository.LineVersionsRepository;
+import com.bsth.repository.LsSectionRouteRepository;
+import com.bsth.repository.LsStationRouteRepository;
+import com.bsth.service.LineVersionsService;
+import com.bsth.service.SectionRouteService;
+import com.bsth.service.StationRouteService;
+
+/**
+ * 
+ * @ClassName: LineVersionsServiceImpl(线路service业务层实现类)
+ * 
+ * @Extends : BaseService
+ * 
+ * @Description: TODO(线路service业务层)
+ * 
+ * @Author bsth@lq
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Service
+public class LineVersionsServiceImpl extends BaseServiceImpl<LineVersions, Integer> implements LineVersionsService{
+	
+	@Autowired
+	private LineVersionsRepository repository;
+	
+	@Autowired
+	LineRepository lineRepository;
+	
+	@Autowired
+    SectionRouteService sectionRouteService;
+    
+    @Autowired
+    StationRouteService stationRouteService;
+    
+    @Autowired
+    com.bsth.repository.SectionRouteRepository  sectionRouteRepository ;
+    
+    @Autowired
+    com.bsth.repository.StationRouteRepository  stationRouteRepository ;
+    
+    @Autowired
+    LsSectionRouteRepository  lsSectionRouteRepository ;
+    
+    @Autowired
+    LsStationRouteRepository  lsStationRouteRepository ;
+	
+	@Override
+	public List<LineVersions> findByLineCode(int lineId) {
+		return repository.findBylineCode(lineId);
+	}
+
+	@Override
+	public Map<String, Object> update(Map<String, Object> map) {
+		Map<String, Object> resultMap = new HashMap<>();
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		try {
+			Date startDate = simpleDateFormat.parse(map.get("startDate").toString());
+			Date endDate = simpleDateFormat.parse(map.get("endDate").toString());
+			Integer id = Integer.valueOf(map.get("Id").toString());
+			Integer lineid = Integer.valueOf(map.get("lineId").toString());
+			String lineCode = map.get("lineCode").toString();
+			Integer versions = Integer.valueOf(map.get("versions").toString());
+			Integer status = Integer.valueOf(map.get("status").toString());
+			String remark = map.get("remark").toString();
+			
+			Line line = lineRepository.findOne(lineid);
+			
+			int statu = repository.update(id,line,lineCode,new java.sql.Date(startDate.getTime()),
+					new java.sql.Date(endDate.getTime()),versions,status,remark);
+			if (statu==1) {
+				resultMap.put("status", ResponseCode.SUCCESS);
+			} else {
+				resultMap.put("status", ResponseCode.ERROR);
+			}
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			resultMap.put("status", ResponseCode.ERROR);
+			return resultMap;
+		}
+		return resultMap;
+	}
+
+	@Override
+	public List<LineVersions> findupdated() {
+		return repository.findupdated();
+	}
+	
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+	
+	// 线路更新
+	@Transactional
+	@Override
+	public List<LineVersions> lineUpdate() {
+		List<LineVersions> list = findupdated();
+    	for (LineVersions lineVersions : list) {
+    		Integer lineId = lineVersions.getLine().getId();
+    		String lineCode = lineVersions.getLineCode();
+    		Integer versions = lineVersions.getVersions();
+    		// 需要更新线路的路由
+    		List<LsSectionRoute> lsSectionRoutes = lsSectionRouteRepository.findupdated(lineId, lineCode, versions);
+    		List<LsStationRoute> lsStationRoutes = lsStationRouteRepository.findupdated(lineId, lineCode, versions);
+    		if (lsSectionRoutes.size() != 0 && lsStationRoutes.size() != 0) {
+    			// 更新
+    			final List<SectionRoute> sectionRoutes = JSONArray.parseArray(JSON.toJSONString(lsSectionRoutes), SectionRoute.class);
+    			final List<StationRoute> stationRoutes = JSONArray.parseArray(JSON.toJSONString(lsStationRoutes), StationRoute.class);
+    			//sectionRouteService.batchUpdate(lineId, lineCode);
+    			//sectionRouteRepository.batchDelete(lineId, lineCode);
+    			
+    			jdbcTemplate.update("delete from bsth_c_stationroute where line = ?  and line_code = ?", lineId, lineCode);
+    			
+    			String stationSql ="insert into bsth_c_stationroute(id,line,station,station_name,station_route_code,"
+    					+ "line_code,station_code,station_mark,out_station_nmber,directions,distances,"
+    					+ "to_time,first_time,end_time,descriptions,destroy,versions,create_by,create_date,"
+    					+ "update_by,update_date) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+    			jdbcTemplate.batchUpdate(stationSql, new BatchPreparedStatementSetter() {
+					
+					@Override
+					public void setValues(PreparedStatement ps, int i) throws SQLException {
+						StationRoute sRoute = stationRoutes.get(i);
+						sRoute.getStationRouteCode();
+						ps.setInt(1, sRoute.getId());
+						ps.setInt(2, sRoute.getLine().getId());
+						ps.setInt(3, sRoute.getStation().getId());
+						ps.setString(4, sRoute.getStationName());
+						ps.setInt(5, sRoute.getStationRouteCode());
+						ps.setString(6, sRoute.getLineCode());
+						ps.setString(7, sRoute.getStationCode());
+						ps.setString(8, sRoute.getStationMark());
+						ps.setInt(9, sRoute.getOutStationNmber()==null ? 0:sRoute.getOutStationNmber());
+						ps.setInt(10, sRoute.getDirections());
+						ps.setDouble(11, sRoute.getDistances());
+						ps.setDouble(12, sRoute.getToTime());
+						ps.setString(13, sRoute.getFirstTime()==null ? "":sRoute.getFirstTime());
+						ps.setString(14, sRoute.getEndTime()==null ? "":sRoute.getEndTime());
+						ps.setString(15, sRoute.getDescriptions()==null ? "":sRoute.getDescriptions());
+						ps.setInt(16, sRoute.getDestroy());
+						ps.setInt(17, sRoute.getVersions());
+						ps.setInt(18, sRoute.getCreateBy()==null ? 0:sRoute.getCreateBy());
+						ps.setDate(19, new java.sql.Date(sRoute.getCreateDate().getTime()));
+						ps.setInt(20, sRoute.getUpdateBy()==null ? 0:sRoute.getUpdateBy());
+						ps.setDate(21, new java.sql.Date(sRoute.getUpdateDate().getTime()));						
+					}
+					
+					@Override
+					public int getBatchSize() {
+						// TODO Auto-generated method stub
+						return stationRoutes.size();
+					}
+				} );
+    			jdbcTemplate.update("delete from bsth_c_sectionroute where line = ?  and line_code = ?", lineId, lineCode);
+    			
+    			String sectionSql ="insert into bsth_c_sectionroute(id,line_code,section_code,sectionroute_code,"
+    					+ "directions,line,section,descriptions,create_by,create_date,update_by,update_date,versions,"
+    					+ "destroy,is_roade_speed) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+    			jdbcTemplate.batchUpdate(sectionSql, new BatchPreparedStatementSetter() {
+					
+					@Override
+					public void setValues(PreparedStatement ps, int i) throws SQLException {
+						SectionRoute sRoute = sectionRoutes.get(i);
+						ps.setInt(1, sRoute.getId());
+						ps.setString(2, sRoute.getLineCode());
+						ps.setString(3, sRoute.getSectionCode());
+						ps.setInt(4, sRoute.getSectionrouteCode());
+						ps.setInt(5, sRoute.getDirections());
+						ps.setInt(6, sRoute.getLine().getId());
+						ps.setInt(7, sRoute.getSection().getId());
+						ps.setString(8, sRoute.getDescriptions()==null ? "":sRoute.getDescriptions());
+						ps.setInt(9, sRoute.getCreateBy()==null ? 0:sRoute.getCreateBy());
+						ps.setDate(10, new java.sql.Date(sRoute.getCreateDate().getTime()));
+						ps.setInt(11, sRoute.getUpdateBy()==null ? 0:sRoute.getUpdateBy());
+						ps.setDate(12, new java.sql.Date(sRoute.getUpdateDate().getTime()));
+						ps.setInt(13, sRoute.getVersions());
+						ps.setInt(14, sRoute.getDestroy());
+						ps.setInt(15, sRoute.getIsRoadeSpeed()==null ? 0:sRoute.getIsRoadeSpeed());
+					}
+					
+					@Override
+					public int getBatchSize() {
+						// TODO Auto-generated method stub
+						return sectionRoutes.size();
+					}
+				} );
+    			/*for (SectionRoute sectionRoute : sectionRoutes) {
+    				sectionRouteService.save(sectionRoute);
+				}*/
+//    			sectionRouteService.bulkSave(sectionRoutes);
+    			//List<StationRoute> stationRoutes = JSONArray.parseArray(JSON.toJSONString(lsStationRoutes), StationRoute.class);
+//    			stationRouteService.batchUpdate(lineId, lineCode);
+    			
+    			//stationRouteRepository.batchDelete(lineId, lineCode);
+    			/*for (StationRoute stationRoute : stationRoutes) {
+    				stationRouteService.save(stationRoute);
+				}*/
+//    			stationRouteService.bulkSave(stationRoutes);
+    			// 更新线路版本
+    			repository.updateOdlVersions(lineId, lineCode);
+    			repository.updateNewVersions(lineId,lineCode,versions);
+			}
+		}
+    	return list;
+	}
+	
+}
@@ -385,4 +385,10 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 		}
 		return resultMap;
 	}
+	
+	// 更具线路批量撤销
+	@Override
+	public void batchUpdate(Integer lineId, String lineCode) {
+		repository.batchUpdate(lineId,lineCode);
+	}
 }
 \ No newline at end of file
@@ -17,12 +17,18 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.Line;
+import com.bsth.entity.LineVersions;
+import com.bsth.entity.LsSectionRoute;
+import com.bsth.entity.LsStationRoute;
 import com.bsth.entity.Section;
 import com.bsth.entity.SectionRoute;
 import com.bsth.entity.SectionRouteCache;
 import com.bsth.entity.StationRoute;
 import com.bsth.entity.StationRouteCache;
 import com.bsth.repository.LineRepository;
+import com.bsth.repository.LineVersionsRepository;
+import com.bsth.repository.LsSectionRouteRepository;
+import com.bsth.repository.LsStationRouteRepository;
 import com.bsth.repository.SectionRepository;
 import com.bsth.repository.SectionRouteCacheRepository;
 import com.bsth.repository.SectionRouteRepository;
@@ -62,15 +68,24 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 	LineRepository lineRepository;
  
 	@Autowired
+	LineVersionsRepository lineVersionsRepository;
+	
+	@Autowired
 	SectionRouteRepository routeRepository;
  
 	@Autowired
+	LsSectionRouteRepository lsRouteRepository;
+	
+	@Autowired
 	SectionRouteCacheRepository routeCacheRepository;
  
 	@Autowired
 	StationRouteRepository stationRouteRepository;
  
 	@Autowired
+	LsStationRouteRepository lsStationRouteRepository;
+	
+	@Autowired
 	StationRouteCacheRepository stationRouteCacheRepository;
  
 	/**
@@ -88,119 +103,12 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 			// 路段点List
 			List<Point> bPointsList = new ArrayList<>();
 			// 截取路段点List
-			List<Point> bPointsCutList = new ArrayList<>();
+//			List<Point> bPointsCutList = new ArrayList<>();
 			// 截取后的路段
 			List<Map<String, String>> sectionArrayList = new ArrayList<>();
 			String bsectionVector = map.get("sectionBsectionVector").equals("") ? "" :map.get("sectionBsectionVector").toString();
 			String bsectionVectorCutList = map.get("cutSectionList").equals("") ? "" :map.get("cutSectionList").toString();
-			if(!bsectionVector.equals("")) {
-				// 转换成JSON数组
-				JSONArray sectionsArray = JSONArray.parseArray(bsectionVector);
-				// 遍历
-				for(int s = 0 ;s<sectionsArray.size();s++) {
-					String pointsLngStr = sectionsArray.getJSONObject(s).get("lng").toString();
-					String pointsLatStr = sectionsArray.getJSONObject(s).get("lat").toString();
-					bPointsList.add(new Point(Double.parseDouble(pointsLngStr), Double.parseDouble(pointsLatStr)));
-				}
-			}
-			if(!bsectionVectorCutList.equals("")) {
-				// 转换成JSON数组
-				JSONArray sectionsArrayList = JSONArray.parseArray(bsectionVectorCutList);
-				// 截取路段在总路段中的下表
-				int firstTemp = 0;
-				int lastTemp = 0;
-				// 每个截取的路段去总路段中获取
-				for (int i = 0; i < sectionsArrayList.size(); i++) {
-					// 切点列表
-					JSONObject sectionsArray = sectionsArrayList.getJSONObject(i);
-					String sectionName = sectionsArray.get("name").toString();
-					JSONArray sectionPoints = sectionsArray.getJSONArray("section");
-					// 用两个坐标点去截取总路段
-					if (i == 0) {
-						for(int s = 0 ;s<sectionPoints.size();s++) {
-							String bpointsLngStr = sectionPoints.getJSONObject(s).get("lng").toString();
-							String bpointsLatStr = sectionPoints.getJSONObject(s).get("lat").toString();
-							Point bPointcut = new Point(Double.parseDouble(bpointsLngStr), Double.parseDouble(bpointsLatStr));
-							double distance = 0;
-							// 寻找最近点
-							for (int index = firstTemp; index < bPointsList.size(); index++) {
-								if (index == firstTemp) {
-									distance = GeoUtils.getDistance(bPointcut,bPointsList.get(index));
-								} else {
-									double distanceTemp = GeoUtils.getDistance(bPointcut,bPointsList.get(index));
-									if(distance > distanceTemp) {
-										distance = distanceTemp;
-										lastTemp = index;
-									}					
-								}
-							}	
-							if (s == 0) {
-								// 第一个点作为路段的起点
-								firstTemp = lastTemp;
-							}
-							// 用切点替换最近点
-							if(lastTemp == firstTemp) {
-								bPointsList.add(++lastTemp, bPointcut);
-							} else {
-								bPointsList.set(lastTemp, bPointcut);	
-							}						
-						}
-					} else {
-						String bpointsLngStr = sectionPoints.getJSONObject(1).get("lng").toString();
-						String bpointsLatStr = sectionPoints.getJSONObject(1).get("lat").toString();
-						Point bPointcut = new Point(Double.parseDouble(bpointsLngStr), Double.parseDouble(bpointsLatStr));
-						double distance = 0;
-						// 寻找最近点
-						for (int index = firstTemp; index < bPointsList.size(); index++) {
-							if (index == firstTemp) {
-								distance = GeoUtils.getDistance(bPointcut,bPointsList.get(index));
-							} else {
-								double distanceTemp = GeoUtils.getDistance(bPointcut,bPointsList.get(index));
-								if(distance > distanceTemp) {
-									distance = distanceTemp;
-									lastTemp = index;
-								}					
-							}
-						}
-						// 用切点替换最近点
-						if(lastTemp == firstTemp) {
-							bPointsList.add(++lastTemp, bPointcut);
-						} else {
-							bPointsList.set(lastTemp, bPointcut);	
-						}
-					}
-					// 切路段
-					if (sectionName != "" && sectionName != null ) {
-						// 原始线状图形坐标集合
-						String sectionsBpoints = "";
-						// WGS线状图形坐标集合
-						String sectionsWJPpoints = "";		
-						for (int j = firstTemp; j <= lastTemp; j++) {
-							Point point =  bPointsList.get(j);
-							String pointsLngStr = String.valueOf(point.getLon());
-							String pointsLatStr = String.valueOf(point.getLat());
-							/** to WGS坐标 */
-							Location resultPoint = FromBDPointToWGSPoint(pointsLngStr,pointsLatStr);
-							String WGSLngStr = String.valueOf(resultPoint.getLng());
-							String WGSLatStr = String.valueOf(resultPoint.getLat());
-							if(j == firstTemp) {
-								sectionsBpoints = pointsLngStr + " " + pointsLatStr;
-								sectionsWJPpoints = WGSLngStr + " " + WGSLatStr;
-							}else {
-								sectionsBpoints = sectionsBpoints + "," +  pointsLngStr + " " + pointsLatStr;
-								sectionsWJPpoints = sectionsWJPpoints + ","  +   WGSLngStr + " " + WGSLatStr;
-							}
-						}
-						Map<String, String> sectionCutMap = new HashMap<String, String>();
-						sectionCutMap.put("sectionName", sectionName);
-						sectionCutMap.put("sectionsBpoints", sectionsBpoints);
-						sectionCutMap.put("sectionsWJPpoints", sectionsWJPpoints);
-						sectionArrayList.add(sectionCutMap);
-					}
-					// 上一个路段的终点作为下一个路段的起点
-					firstTemp = lastTemp;	
-				}		
-			}			
+			sectionListCut(bPointsList, sectionArrayList, bsectionVector, bsectionVectorCutList);			
  
 			// 原坐标类型
 			String dbType = map.get("sectiondbType").equals("") ? "" : map.get("sectiondbType").toString();
@@ -217,7 +125,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 			// 路段长度
 			Double sectionDistance = 0.0;
 			// 路段路由Id
-			Integer sectionRouteId = map.get("sectionrouteId").equals("") ? null : Integer.valueOf(map.get("sectionrouteId").toString());
+//			Integer sectionRouteId = map.get("sectionrouteId").equals("") ? null : Integer.valueOf(map.get("sectionrouteId").toString());
 			// 线路编码
 			String lineCode =map.get("sectionrouteLineCode").equals("") ? "" : map.get("sectionrouteLineCode").toString();
 			// 路段时长
@@ -227,7 +135,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 			// 限速
 			Double speedLimit = map.get("sectionSpeedLimet").equals("") ? null : Double.valueOf(map.get("sectionSpeedLimet").toString());
 			// 版本
-			Integer version = map.get("versions").equals("") ? null : Integer.valueOf(map.get("versions").toString());
+			Integer versions = map.get("versions").equals("") ? null : Integer.valueOf(map.get("versions").toString());
  
 			Integer createBy = map.get("createBy").equals("") ? null : Integer.valueOf(map.get("createBy").toString());
 			String createDate = map.get("createDate").equals("") ? null : map.get("createDate").toString();
@@ -243,8 +151,8 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 			String middleNode="";
 			String sectionType="";
 			String csectionVector="";	
-			// 撤销原有路段
-			routeRepository.sectionRouteUpdDestroy(Integer.parseInt(lineCode),directions);
+			// 撤销原有路段路由
+			routeRepository.sectionRouteUpdDestroy(sectionRouteLine,directions);
 			// 路段保存
 			for (int i = 0; i < sectionArrayList.size(); i++) {
 				long sectionMaxId = GetUIDAndCode.getSectionId();
@@ -263,7 +171,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 				String bsectionVectorS = null;
 				if(!sectionsBpoints.equals(""))
 					 bsectionVectorS = "LINESTRING(" + sectionsBpoints + ")";				
-				repository.systemSave(sectionCode, sectionName, crosesRoad, endNode, startNode, middleNode, gsectionVector, bsectionVectorS, sectionType, csectionVector, roadCoding, sectionDistance, sectionTime, dbType, speedLimit, descriptions, version, sectionId);
+				repository.systemSave(sectionCode, sectionName, crosesRoad, endNode, startNode, middleNode, gsectionVector, bsectionVectorS, sectionType, csectionVector, roadCoding, sectionDistance, sectionTime, dbType, speedLimit, descriptions, versions, sectionId);
 				SectionRoute route = new SectionRoute();
 				Line line = lineRepository.findOne(sectionRouteLine);
 				Section section = repository.findOne(sectionId);
@@ -271,7 +179,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 				route.setLineCode(lineCode);
 				route.setSectionCode(sectionCode);
 				route.setDirections(directions);
-				route.setVersions(version);
+				route.setVersions(versions);
 				route.setDestroy(destroy);
 				route.setDescriptions(descriptions);
 				route.setCreateBy(createBy);
@@ -282,9 +190,9 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 				routeRepository.save(route);
 			}
 			// 删除缓存路段
-			routeCacheRepository.sectionRouteCacheDel(Integer.parseInt(lineCode),directions);
-			// 撤销原有站点
-			stationRouteRepository.stationRouteUpdDestroy(Integer.parseInt(lineCode),directions);
+			routeCacheRepository.sectionRouteCacheDel(sectionRouteLine,directions);
+			// 撤销原有站点路由
+			stationRouteRepository.stationRouteUpdDestroy(sectionRouteLine,directions);
 			// 站点保存
 			List<StationRouteCache> stationRouteList = stationRouteCacheRepository.findstationRoute(lineCode,directions);			
 			for(int i=0; i < stationRouteList.size(); i++) {
@@ -305,7 +213,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 				stationRoute.setEndTime(stationRouteCache.getEndTime());
 				stationRoute.setDescriptions(stationRouteCache.getDescriptions());
 				stationRoute.setDestroy(stationRouteCache.getDestroy());
-				stationRoute.setVersions(stationRouteCache.getVersions());
+				stationRoute.setVersions(versions);
 				stationRoute.setCreateBy(stationRouteCache.getCreateBy());
 				stationRoute.setCreateDate(stationRouteCache.getCreateDate());
 				stationRoute.setUpdateBy(stationRouteCache.getCreateBy());
@@ -313,7 +221,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 				stationRouteRepository.save(stationRoute);
 			}
 			// 删除缓存站点
-			stationRouteCacheRepository.stationRouteCacheDel(Integer.parseInt(lineCode),directions);
+			stationRouteCacheRepository.stationRouteCacheDel(sectionRouteLine,directions);
  
 			resultMap.put("status", ResponseCode.SUCCESS);			
 		} catch (Exception e) {
@@ -324,6 +232,251 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 	}
  
 	/**
+	 * @Description :TODO(编辑线路走向保存到线路历史表)
+	 * 
+	 * @param map <sectionId:路段ID； sectionJSON：路段信息>
+	 * 
+	 * @return Map<String, Object> <SUCCESS ; ERROR>
+	 */
+	@Override
+	@Transactional
+	public Map<String, Object> sectionCutSaveLineLS(Map<String, Object> map) {
+		Map<String, Object> resultMap = new HashMap<String, Object>();
+		try {
+			// 路段点List
+			List<Point> bPointsList = new ArrayList<>();
+			// 截取后的路段
+			List<Map<String, String>> sectionArrayList = new ArrayList<>();
+			String bsectionVector = map.get("sectionBsectionVector").equals("") ? "" :map.get("sectionBsectionVector").toString();
+			String bsectionVectorCutList = map.get("cutSectionList").equals("") ? "" :map.get("cutSectionList").toString();
+			sectionListCut(bPointsList, sectionArrayList, bsectionVector, bsectionVectorCutList);			
+			
+			// 原坐标类型
+			String dbType = map.get("sectiondbType").equals("") ? "" : map.get("sectiondbType").toString();
+			// 说明
+			String descriptions = map.get("descriptions").equals("") ? "" : map.get("descriptions").toString();
+			// 是否撤销
+			Integer destroy = map.get("destroy").equals("") ? null : Integer.parseInt(map.get("destroy").toString());
+			// 方向
+			Integer directions = map.get("sectionrouteDirections").equals("") ? null : Integer.parseInt(map.get("sectionrouteDirections").toString());
+			// 线路ID
+			Integer sectionRouteLine = map.get("sectionrouteLine").equals("") ? null : Integer.parseInt(map.get("sectionrouteLine").toString());
+			// 道路编码
+			String roadCoding = map.get("sectionRoadCoding").equals("") ? "" : map.get("sectionRoadCoding").toString();
+			// 路段长度
+			Double sectionDistance = 0.0;
+			// 线路编码
+			String lineCode =map.get("sectionrouteLineCode").equals("") ? "" : map.get("sectionrouteLineCode").toString();
+			// 路段时长
+			Double  sectionTime = 0.0;
+			// 路段路由
+			Integer sectionrouteCode = map.get("sectionrouteCode").equals("") ? null : Integer.valueOf(map.get("sectionrouteCode").toString());
+			// 限速
+			Double speedLimit = map.get("sectionSpeedLimet").equals("") ? null : Double.valueOf(map.get("sectionSpeedLimet").toString());
+			// 版本
+			Integer versions = map.get("versions").equals("") ? null : Integer.valueOf(map.get("versions").toString());
+			
+			Integer createBy = map.get("createBy").equals("") ? null : Integer.valueOf(map.get("createBy").toString());
+			Integer updateBy = map.get("updateBy").equals("") ?null : Integer.valueOf(map.get("updateBy").toString());
+			Integer isRoadeSpeed = map.get("isRoadeSpeed").equals("") ? null : Integer.valueOf(map.get("isRoadeSpeed").toString());
+			String crosesRoad="";
+			String endNode="";
+			String startNode="";
+			String middleNode="";
+			String sectionType="";
+			String csectionVector="";	
+			// 删除原有历史版本路段路由
+			lsRouteRepository.batchDelete(sectionRouteLine,directions,versions);
+			// 路段保存
+			for (int i = 0; i < sectionArrayList.size(); i++) {
+				long sectionMaxId = GetUIDAndCode.getSectionId();
+				// 路段编码
+				String sectionCode = String.valueOf(sectionMaxId);
+				// 路段ID
+				int sectionId = (int)sectionMaxId;
+				String sectionName = sectionArrayList.get(i).get("sectionName").toString();
+				String sectionsBpoints = sectionArrayList.get(i).get("sectionsBpoints").toString();
+				String sectionsWJPpoints = sectionArrayList.get(i).get("sectionsWJPpoints").toString();
+				// WGS坐标点集合
+				String gsectionVector = null;
+				if(!sectionsWJPpoints.equals(""))
+					gsectionVector = "LINESTRING(" + sectionsWJPpoints +")";
+				// 原坐标点集合
+				String bsectionVectorS = null;
+				if(!sectionsBpoints.equals(""))
+					bsectionVectorS = "LINESTRING(" + sectionsBpoints + ")";				
+				repository.systemSave(sectionCode, sectionName, crosesRoad, endNode, startNode, middleNode, gsectionVector, bsectionVectorS, sectionType, csectionVector, roadCoding, sectionDistance, sectionTime, dbType, speedLimit, descriptions, 1, sectionId);
+				LsSectionRoute route = new LsSectionRoute();
+				Line line = lineRepository.findOne(sectionRouteLine);
+				Section section = repository.findOne(sectionId);
+				route.setSectionrouteCode(sectionrouteCode+i*100);
+				route.setLineCode(lineCode);
+				route.setSectionCode(sectionCode);
+				route.setDirections(directions);
+				route.setVersions(versions);
+				route.setDestroy(destroy);
+				route.setDescriptions(descriptions);
+				route.setCreateBy(createBy);
+				route.setUpdateBy(updateBy);
+				route.setLine(line);
+				route.setSection(section);
+				route.setIsRoadeSpeed(isRoadeSpeed);
+				lsRouteRepository.save(route);
+			}
+			// 删除缓存路段
+			routeCacheRepository.sectionRouteCacheDel(sectionRouteLine,directions);
+			// 删除原有历史表站点路由
+			lsStationRouteRepository.batchDelete(sectionRouteLine,directions,versions);
+			// 站点保存
+			List<StationRouteCache> stationRouteList = stationRouteCacheRepository.findstationRoute(lineCode,directions);			
+			for(int i=0; i < stationRouteList.size(); i++) {
+				StationRouteCache stationRouteCache = stationRouteList.get(i);				
+				LsStationRoute stationRoute = new LsStationRoute();
+				stationRoute.setLine(stationRouteCache.getLine());
+				stationRoute.setStation(stationRouteCache.getStation());
+				stationRoute.setStationName(stationRouteCache.getStationName());
+				stationRoute.setStationRouteCode(stationRouteCache.getStationRouteCode());
+				stationRoute.setLineCode(stationRouteCache.getLineCode());
+				stationRoute.setStationCode(stationRouteCache.getStationCode());
+				stationRoute.setStationMark(stationRouteCache.getStationMark());
+				stationRoute.setOutStationNmber(stationRouteCache.getOutStationNmber());
+				stationRoute.setDirections(stationRouteCache.getDirections());
+				stationRoute.setDistances(stationRouteCache.getDistances());
+				stationRoute.setToTime(stationRouteCache.getToTime());
+				stationRoute.setFirstTime(stationRouteCache.getFirstTime());
+				stationRoute.setEndTime(stationRouteCache.getEndTime());
+				stationRoute.setDescriptions(stationRouteCache.getDescriptions());
+				stationRoute.setDestroy(stationRouteCache.getDestroy());
+				stationRoute.setVersions(versions);
+				stationRoute.setCreateBy(stationRouteCache.getCreateBy());
+				stationRoute.setCreateDate(stationRouteCache.getCreateDate());
+				stationRoute.setUpdateBy(stationRouteCache.getCreateBy());
+				stationRoute.setUpdateDate(stationRouteCache.getUpdateDate());
+				lsStationRouteRepository.save(stationRoute);
+			}
+			// 删除缓存站点
+			stationRouteCacheRepository.stationRouteCacheDel(sectionRouteLine,directions);
+			resultMap.put("status", ResponseCode.SUCCESS);			
+		} catch (Exception e) {
+			resultMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+		}
+		return resultMap;
+	}
+
+	private void sectionListCut(List<Point> bPointsList, List<Map<String, String>> sectionArrayList,
+			String bsectionVector, String bsectionVectorCutList) {
+		if(!bsectionVector.equals("")) {
+			// 转换成JSON数组
+			JSONArray sectionsArray = JSONArray.parseArray(bsectionVector);
+			// 遍历
+			for(int s = 0 ;s<sectionsArray.size();s++) {
+				String pointsLngStr = sectionsArray.getJSONObject(s).get("lng").toString();
+				String pointsLatStr = sectionsArray.getJSONObject(s).get("lat").toString();
+				bPointsList.add(new Point(Double.parseDouble(pointsLngStr), Double.parseDouble(pointsLatStr)));
+			}
+		}
+		if(!bsectionVectorCutList.equals("")) {
+			// 转换成JSON数组
+			JSONArray sectionsArrayList = JSONArray.parseArray(bsectionVectorCutList);
+			// 截取路段在总路段中的下表
+			int firstTemp = 0;
+			int lastTemp = 0;
+			// 每个截取的路段去总路段中获取
+			for (int i = 0; i < sectionsArrayList.size(); i++) {
+				// 切点列表
+				JSONObject sectionsArray = sectionsArrayList.getJSONObject(i);
+				String sectionName = sectionsArray.get("name").toString();
+				JSONArray sectionPoints = sectionsArray.getJSONArray("section");
+				// 用两个坐标点去截取总路段
+				if (i == 0) {
+					for(int s = 0 ;s<sectionPoints.size();s++) {
+						String bpointsLngStr = sectionPoints.getJSONObject(s).get("lng").toString();
+						String bpointsLatStr = sectionPoints.getJSONObject(s).get("lat").toString();
+						Point bPointcut = new Point(Double.parseDouble(bpointsLngStr), Double.parseDouble(bpointsLatStr));
+						double distance = 0;
+						// 寻找最近点
+						for (int index = firstTemp; index < bPointsList.size(); index++) {
+							if (index == firstTemp) {
+								distance = GeoUtils.getDistance(bPointcut,bPointsList.get(index));
+							} else {
+								double distanceTemp = GeoUtils.getDistance(bPointcut,bPointsList.get(index));
+								if(distance > distanceTemp) {
+									distance = distanceTemp;
+									lastTemp = index;
+								}					
+							}
+						}	
+						if (s == 0) {
+							// 第一个点作为路段的起点
+							firstTemp = lastTemp;
+						}
+						// 用切点替换最近点
+						if(lastTemp == firstTemp) {
+							bPointsList.add(++lastTemp, bPointcut);
+						} else {
+							bPointsList.set(lastTemp, bPointcut);	
+						}						
+					}
+				} else {
+					String bpointsLngStr = sectionPoints.getJSONObject(1).get("lng").toString();
+					String bpointsLatStr = sectionPoints.getJSONObject(1).get("lat").toString();
+					Point bPointcut = new Point(Double.parseDouble(bpointsLngStr), Double.parseDouble(bpointsLatStr));
+					double distance = 0;
+					// 寻找最近点
+					for (int index = firstTemp; index < bPointsList.size(); index++) {
+						if (index == firstTemp) {
+							distance = GeoUtils.getDistance(bPointcut,bPointsList.get(index));
+						} else {
+							double distanceTemp = GeoUtils.getDistance(bPointcut,bPointsList.get(index));
+							if(distance > distanceTemp) {
+								distance = distanceTemp;
+								lastTemp = index;
+							}					
+						}
+					}
+					// 用切点替换最近点
+					if(lastTemp == firstTemp) {
+						bPointsList.add(++lastTemp, bPointcut);
+					} else {
+						bPointsList.set(lastTemp, bPointcut);	
+					}
+				}
+				// 切路段
+				if (sectionName != "" && sectionName != null ) {
+					// 原始线状图形坐标集合
+					String sectionsBpoints = "";
+					// WGS线状图形坐标集合
+					String sectionsWJPpoints = "";		
+					for (int j = firstTemp; j <= lastTemp; j++) {
+						Point point =  bPointsList.get(j);
+						String pointsLngStr = String.valueOf(point.getLon());
+						String pointsLatStr = String.valueOf(point.getLat());
+						/** to WGS坐标 */
+						Location resultPoint = FromBDPointToWGSPoint(pointsLngStr,pointsLatStr);
+						String WGSLngStr = String.valueOf(resultPoint.getLng());
+						String WGSLatStr = String.valueOf(resultPoint.getLat());
+						if(j == firstTemp) {
+							sectionsBpoints = pointsLngStr + " " + pointsLatStr;
+							sectionsWJPpoints = WGSLngStr + " " + WGSLatStr;
+						}else {
+							sectionsBpoints = sectionsBpoints + "," +  pointsLngStr + " " + pointsLatStr;
+							sectionsWJPpoints = sectionsWJPpoints + ","  +   WGSLngStr + " " + WGSLatStr;
+						}
+					}
+					Map<String, String> sectionCutMap = new HashMap<String, String>();
+					sectionCutMap.put("sectionName", sectionName);
+					sectionCutMap.put("sectionsBpoints", sectionsBpoints);
+					sectionCutMap.put("sectionsWJPpoints", sectionsWJPpoints);
+					sectionArrayList.add(sectionCutMap);
+				}
+				// 上一个路段的终点作为下一个路段的起点
+				firstTemp = lastTemp;	
+			}		
+		}
+	}
+	
+	/**
 	 * @Description :TODO(编辑线路走向)
 	 * 
 	 * @param map <sectionId:路段ID； sectionJSON：路段信息>
@@ -84,7 +84,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 			List<String> title = new ArrayList<String>();
 			title.add("线路ID");
 			title.add("方向");
-			title.add("站点ID");
+			title.add("站点编码");
 			title.add("站点顺序号");
 			title.add("站点备注");
 			title.add("站点名称");
@@ -1268,4 +1268,10 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		}
 		return rs;
 	}
+
+	// 更具线路批量撤销
+	@Override
+	public void batchUpdate(Integer lineId, String lineCode) {
+		repository.batchUpdate(lineId,lineCode);
+	}
 }
@@ -60,6 +60,9 @@ import com.bsth.service.schedule.SchedulePlanInfoService;
 import com.bsth.service.sys.DutyEmployeeService;
 import com.bsth.util.*;
 import com.bsth.websocket.handler.SendUtils;
+import com.github.stuxuhai.jpinyin.PinyinException;
+import com.github.stuxuhai.jpinyin.PinyinFormat;
+import com.github.stuxuhai.jpinyin.PinyinHelper;
 import com.google.common.base.Splitter;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringEscapeUtils;
@@ -2464,6 +2467,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         Map<String, Object> map = new HashMap<String, Object>();
     	if(list.size()>0){
 	        map.put("xlName", list.get(0).getXlName());
+	        try {
+				map.put("xlNamePy", PinyinHelper.convertToPinyinString(list.get(0).getXlName(), "" , PinyinFormat.WITHOUT_TONE));
+			} catch (PinyinException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
 	        double jhyygl=culateService.culateJhgl(list);//计划营运公里
 	        double jhjcclc= culateService.culateJhJccgl(list);//计划进出场公里(计划空驶公里)
 	        map.put("jhlc", jhyygl);
@@ -2480,8 +2489,17 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	        map.put("sjzgl", Arith.add(zyygl, zksgl));
 	        map.put("sjgl",zyygl);
 	        map.put("sjksgl", zksgl);
-	
-	        map.put("ssgl", culateService.culateLbgl(list));
+	        double ssgl= culateService.culateLbgl(list);
+	        map.put("ssgl", ssgl);
+	        
+	        //计划+临加-少驶=实驶
+	        double jl=Arith.add(jhyygl, ljgl);
+	        if(Arith.sub(jl, ssgl)==sjyygl){
+	        	map.put("zt", 0);
+	        }else{
+	        	map.put("zt", 1);
+	        }
+	        
 	        map.put("ssgl_lz", culateService.culateCJLC(list, "路阻"));
 	        map.put("ssgl_dm", culateService.culateCJLC(list, "吊慢"));
 	        map.put("ssgl_gz", culateService.culateCJLC(list, "故障"));
@@ -2568,7 +2586,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 }
             }
         }
-
+        
+        Collections.sort(lMap,new AccountXlbm());
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("xlName", "合计");
         double jhyygl=culateService.culateJhgl(list);//计划营运公里
@@ -2587,7 +2606,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("sjzgl", Arith.add(zyygl, zksgl));
         map.put("sjgl",zyygl);
         map.put("sjksgl", zksgl);
-        map.put("ssgl", culateService.culateLbgl(list));
+        
+        double ssgl= culateService.culateLbgl(list);
+        map.put("ssgl", ssgl);
+        //计划+临加-少驶=实驶
+        double jl=Arith.add(jhyygl, ljgl);
+        if(Arith.sub(jl, ssgl)==sjyygl){
+        	map.put("zt", 0);
+        }else{
+        	map.put("zt", 1);
+        }
         map.put("ssgl_lz", culateService.culateCJLC(list, "路阻"));
         map.put("ssgl_dm", culateService.culateCJLC(list, "吊慢"));
         map.put("ssgl_gz", culateService.culateCJLC(list, "故障"));
@@ -4942,3 +4970,14 @@ class AccountMap2 implements Comparator&lt;Map&lt;String, Object&gt;&gt;{
 			return  o2.get("clZbh").toString().compareTo(o1.get("clZbh").toString());
 		}
 }
+
+class AccountXlbm implements Comparator<Map<String, Object>>{
+	 @Override
+		public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+			// TODO Auto-generated method stub
+//		 PinyinHelper.convertToPinyinString(ppy.getName(),
+//		 "" , PinyinFormat.WITHOUT_TONE)
+			return  o1.get("xlNamePy").toString().compareTo(
+					o2.get("xlNamePy").toString());
+		}
+}
@@ -882,7 +882,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
             else if(isInOut(sch))
                 continue;
             //主任务烂班
-            else if(sch.getStatus() == -1){
+            else if(sch.getStatus() == -1 && !sch.isCcService()){
                 if(sch.getAdjustExps().equals(item) ||
                         (StringUtils.isEmpty(sch.getAdjustExps()) && item.equals("其他"))){
                     sum = Arith.add(sum, sch.getJhlcOrig());
 <!-- 手动添加站点 -->
-<div class="modal fade" id="edit_route_mobal" tabindex="-1" role="basic" aria-hidden="true">
-	
+<div class="modal fade" id="edit_route_mobal" tabindex="-1" role="basic"
+	aria-hidden="true">
+
 	<div class="modal-dialog">
-		
+
 		<div class="modal-content">
-		
+
 			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+				<button type="button" class="close" data-dismiss="modal"
+					aria-hidden="true"></button>
 				<h4 class="modal-title">生成路线（站点和路段）</h4>
 			</div>
-			
+
 			<div class="modal-body">
-				
-				<form class="form-horizontal" role="form" id="save_route_template_form" action="" method="">
-				
-					<div class="alert alert-danger display-hide"> <button class="close" data-close="alert"></button>
+
+				<form class="form-horizontal" role="form"
+					id="save_route_template_form" action="" method="">
+
+					<div class="alert alert-danger display-hide">
+						<button class="close" data-close="alert"></button>
 						您的输入有误，请检查下面的输入项
 					</div>
-					
+
 					<!-- 站点名称 -->
 					<div class="form-body">
-					
+
 						<div class="form-group">
-							<label class="control-label col-md-2">
-          						<span class="required"> * </span> 坐标：
-                    		</label>
+							<label class="control-label col-md-2"> <span
+								class="required"> * </span> 坐标：
+							</label>
 							<div class="col-md-10">
-								<textarea class="form-control" rows="12" name="points" id="pointInput" placeholder="坐标点"></textarea> 
+								<textarea class="form-control" rows="12" name="points"
+									id="pointInput" placeholder="坐标点"></textarea>
 							</div>
-						</div>						
+						</div>
 					</div>
 					<div class="form-group">
 						<label class="col-md-3 control-label">选择方向：</label>
 						<div class="col-md-9">
 							<div class="icheck-list">
-								<label>
-										<input type="radio" class="icheck" name="dirCheck" value='0' checked> 上行
-								</label>
-								<label>
-										<input type="radio" class="icheck" name="dirCheck" value='1' > 下行
+								<label> <input type="radio" class="icheck"
+									name="dirCheck" value='0' checked> 上行
+								</label> <label> <input type="radio" class="icheck"
+									name="dirCheck" value='1'> 下行
 								</label>
 							</div>
 						</div>
 					</div>
-					 <div class="form-group">
-					 	<div class="alert alert-info font-blue-chambray" style="background-color: #2C3E50">
-                            <h5 class="block"><span class="help-block" style="color:#1bbc9b;"> *　坐标生成路线规划说明： </span></h5>
-                            <p>
-                            	<span class="help-block" style="color:#1bbc9b;">
-                            		&nbsp;请在文本域中按顺序依次输坐标点（如果是站点，请将在坐标后面用【Tab】键隔开后加(站点名/stop);没有(站点名/stop)默认是路段点）,每输入完一个坐标时请按回车键【Enter】换行.
-                            		例如：<br>
-                            		121.715623	31.224058	042408.000<br>
-									121.715623	31.224065	042409.000	Stop<br>
-									121.715623	31.224065	042410.000<br>
-                            	</span> 
-                            </p>
-                        </div>
-					 </div>
+					<div class="form-group">
+						<div class="alert alert-info font-blue-chambray"
+							style="background-color: #2C3E50">
+							<h5 class="block">
+								<span class="help-block" style="color: #1bbc9b;"> *
+									坐标生成路线规划说明： </span>
+							</h5>
+							<p>
+								<span class="help-block" style="color: #1bbc9b;">
+									&nbsp;请在文本域中按顺序依次输坐标点,每行中的数据之间用【Tab】键隔开（如果是站点，请将在坐标后面加 stop;没有
+									stop默认是路段点）,每输入完一个坐标时请按回车键【Enter】换行. 例如：<!-- <br> 121.715623
+									31.224058 042408.000<br> 121.715623 31.224065 042409.000
+									Stop<br> 121.715623 31.224065 042410.000<br> -->
+									<br>121.511870	31.180638	043703.000
+									<br>121.511870	31.180643	043705.000
+									<br>121.511870	31.180648	043706.000	Stop
+									<br>121.511872	31.180653	043707.000
+									<br>121.511873	31.180658	043708.000
+								</span>
+							</p>
+						</div>
+					</div>
 				</form>
 			</div>
 			<div class="modal-footer">
-				<button type="button" class="btn default" data-dismiss="modal" id="addMobalHiden">取消</button>
+				<button type="button" class="btn default" data-dismiss="modal"
+					id="addMobalHiden">取消</button>
 				<button type="button" class="btn btn-primary" id="templateSaveData">提交数据</button>
 			</div>
 		</div>
@@ -139,20 +152,21 @@ $(&#39;#edit_route_mobal&#39;).on(&#39;editRouteMobal.show&#39;, function(e,transGPS,editRoute,m
 			var directionData = $("input[name='dirCheck']:checked").val();
 			editRoute.setLineDir(directionData);
 			// 弹出正在加载层
-			var i = layer.load(0,{offset:['200px', '280px']});
+			var i = layer.load(2);
 			// 表单序列化
 			var paramsForm = form.serializeJSON();
 			// 切割坐标点
 			var array = paramsForm.points.split('\r\n');
 			// 把坐标点转换为站点或路段
 			var arrayFormat = inputStationValueFormat(array);
-			var stationList = arrayFormat.stationList;			
+			var stationList = arrayFormat.stationList;		
 			var sectionListTemp = arrayFormat.sectionList;
 			var sectionList = [];
 			// 隔30个取一个点（相当于30s）
 			for(var i = 0; i*30 < sectionListTemp.length; i++) {
 				sectionList[i] = sectionListTemp[i*30];
 			}
+			sectionList[sectionList.length] = sectionListTemp[sectionListTemp.length-1];
  
 			var sectionListFinal = [];
 			sectionListFinal.push({sectionName : lineNameV, points : sectionList});
@@ -227,7 +241,7 @@ $(&#39;#edit_route_mobal&#39;).on(&#39;editRouteMobal.show&#39;, function(e,transGPS,editRoute,m
 		}
 		for(var i = 0 ;i<sectionList.length;i++) {
 			if(sectionList[i] == "" || typeof(sectionList[i]) == "undefined" || sectionList[i] == null) {
-				sectionList.splice(i,1);
+				sectionList.splice(i,1);//删除数组中下表i-i+1之间的值
 				i= i-1;
 			}
  
@@ -94,13 +94,13 @@ $(function(){
 		// 需要验证的表单元素
 		rules : {
 			'name' : {required : true,maxlength: 30},// 线路名称 必填项、 最大长度.
-			'lineCode' : {required : true,maxlength: 6,digits:true ,remote:{type: 'GET',
-												                url: '/line/lineCodeVerification',
-												                data:{'lineCode':function(){ return $("#lineCodeInput").val();}},
-												                dataFilter: function (data,type) {
-												                	return data;  //要返回data   否则会影响到后续验证   并且阻碍提交【即使验证通过】，也不会提交
-										                        },
-												                delay: 2000}},// 线路编码 必填项、最大长度.
+			'lineCode' : {required : true,maxlength: 6,digits:true ,
+				remote:{type: 'GET',
+		                url: '/line/lineCodeVerification',
+		                cache:false,
+                        async:false,
+		                data:{'lineCode':function(){ return $("#lineCodeInput").val();}}
+						}},// 线路编码 必填项、最大长度.
 			'company' : {required : true,maxlength: 30},// 所属公司  必填项、最大长度.
 			'brancheCompany' : {required : true,maxlength: 30},// 所属分公司  必填项、最大长度.
 			'level' : {required : true,maxlength: 30},// 线路等级 必填项、最大长度.
@@ -120,7 +120,6 @@ var WorldsBMapLine = function () {
 					 var index = parseInt(arguments.callee.count) - 1;
  
 					 if (index >= len-1) {
-						 
 						 callback && callback(points);
  
 			              return;
@@ -347,27 +347,14 @@
 			return ;
     	}else {
     		id = arrChk.data('id');
-    		/*$('#uploadRoute').on('click', function() {
-    			EditRoute.setLineId(id);
-    			EditRoute.setLineDir(direction);
-    			$.get('editRoute.html', function(m){
-    				$(pjaxContainer).append(m);
-    				$('#edit_route_mobal').trigger('editRouteMobal.show',[TransGPS,EditRoute,WorldsBMapLine,DrawingManagerObj,GetAjaxData,PublicFunctions]);
-    			});
-    			// 更新section_table 和缓存中的一切过的点数
-    			WorldsBMapLine.initCutSectionPoint();
-    			WorldsBMapLine.setPointIndex(0);
-    		});*/
-    		// 设置路线的线路id
-    		//var a =  EditRoute.setLineId(id);
-    		// 显示地图
-    		/*var param = {};
-    		var list = [1,2,3];
-    		param.id = id;
-    		param.list = list;
-    		
-    		$get('/pages/base/line/map.html',param);*/
- 			window.location.href = "/pages/base/line/map.html?no="+id;
+			$.get('/lineVersions/findByLineId',{'lineId':id},function(lineVersions){
+				if(lineVersions != null && lineVersions != "") {
+					window.location.href = "/pages/base/line/map.html?no="+id;
+				} else {
+					layer.msg('此线路没有线路版本,请先到线路版本信息页面添加改线路版本！');
+					return ;
+				}
+			});
     	}
 	});	
  
@@ -41,7 +41,7 @@
 							<a href="javascript:;" data-action="1" id="editRoute" class="tool-action"> <i class="fa fa-level-up"></i>上传GPS生成路线</a>
 						</li>
 						<li>
-							<a href="javascript:;" data-action="2" id="exportStation" class="tool-action"> <i class="fa fa-level-up"></i>导出线路站点Excel</a>
+							<a href="javascript:;" data-action="2" id="exportStation" class="tool-action"> <i class="fa fa-level-down"></i>导出线路站点Excel</a>
 						</li>
 						<!-- <li><a href="javascript:;" data-action="0" class="tool-action"> <i class="fa fa-print"></i> 打印
 						</a></li>
-< <link href="/pages/base/line/css/bmap_base.css" rel="stylesheet" type="text/css" /> 
+<
+<link href="/pages/base/line/css/bmap_base.css" rel="stylesheet"
+	type="text/css" />
 <div class="portlet-body">
 	<!-- 地图 -->
-	<div  id="bmap_basic" class="bmaps"></div>	
+	<div id="bmap_basic" class="bmaps"></div>
 	<!-- 右边显示栏 -->
 	<div class="cut-section" id="scrllmouseEvent_div">
-		<div class="portlet-title" >
-			<div class="caption" >
-				途径站点 
+		<div class="portlet-title">
+			<div class="caption">途径站点</div>
+		</div>
+		<div class="portlet-body">
+			<div class="table-toolbar" style="text-align: center;" id="upload">
+				<button class="btn btn-circle blue" id="uploadRoute">
+					<i class="fa fa-plus"></i> 生成路线
+				</button>
 			</div>
-		</div>	
-		 <div class="portlet-body">
-           	<div class="table-toolbar" style="text-align:center;" id="upload">
-				<button class="btn btn-circle blue" id="uploadRoute" ><i class="fa fa-plus"></i> 生成路线 </button>						
-           	</div>
-           	<div class="portlet-body hidden" id="upload_show">
-           		<div class="defeat-scroll" style="height: auto;max-height:600px;overflow-y:auto; border-left: 10px;">
-					<table class="table table-bordered table-hover table-checkable " id="section_table" style="color:#B7B7B7;">
+			<div class="portlet-body hidden" id="upload_show">
+				<div class="defeat-scroll"
+					style="height: auto; max-height: 600px; overflow-y: auto; border-left: 10px;">
+					<table class="table table-bordered table-hover table-checkable "
+						id="section_table" style="color: #B7B7B7;">
 						<thead>
 							<tr role="row" class="heading">
-								<th >截取路段</th>
+								<th>截取路段</th>
 							</tr>
 						</thead>
 						<tbody></tbody>
 					</table>
 				</div>
-	           	<div class="table-toolbar" style="text-align:center;">
-	           		<button class="btn btn-circle blue" id="cutSection">提交路段</button>
-					<button class="btn btn-circle blue" id="Undo">撤销切点</button>			
-	           	</div>
-           	</div>	           	
+				<div class="table-toolbar" style="text-align: center;">
+					<button class="btn btn-circle blue" id="cutSection">提交选项</button>
+					<button class="btn btn-circle blue" id="Undo">撤销切点</button>
+				</div>
+			</div>
 		</div>
 	</div>
 </div>
@@ -45,8 +49,9 @@
 		</tr>
 	{{/if}}
 </script>
-<!--上传GPS坐标生成路线监听事件 -->
-<<script type="text/javascript">
+<!--上传GPS坐标生成路线监听事件 -->
+<
+<script type="text/javascript">
 $(function(){
 	// 关闭左侧栏
 	if (!$('body').hasClass('page-sidebar-closed')) {$('.menu-toggler.sidebar-toggler').click();}
@@ -111,7 +116,16 @@ $(function(){
 	// 提交截取事件
 	$('#cutSection').on('click', function() {		
 		if(WorldsBMapLine.getPointIndex() > 0) {
-			layer.confirm('提交会把原有的站点和路段覆盖，您确定要提交吗？', {
+			var sectionList = WorldsBMapLine.getSectionList();
+			var data = {};
+			var section = EditSectionObj.getEitdSection();
+			var josnSectionList = JSON.stringify(sectionList);
+			section.cutSectionList = josnSectionList;
+			$.get('submit_select.html', function(m){
+				$(pjaxContainer).append(m);
+				$('#submit_select_mobal').trigger('submitSelectMobal.show',[section,EditRoute]);
+			});
+			/* layer.confirm('提交会把原有的站点和路段覆盖，您确定要提交吗？', {
 				btn: ['提交','取消'] //按钮
 			}, function(){
 				var sectionList = WorldsBMapLine.getSectionList();
@@ -131,7 +145,7 @@ $(function(){
 						layer.msg('提交失败...');
 					}
 				});
-			});	
+			}); */	
 		} else {
 			layer.msg("请先截取路段！！！");
 		}
@@ -170,11 +184,11 @@ $(function(){
 	}).on('mouseleave',function() {
 		$('.defeat-scroll').css('overflow','hidden');
 	});	
-});
+});
 </script>
 <!--编辑路线类 -->
 <script src="/pages/base/line/js/editRoute.js"></script>
- <!--坐标转换类 -->
+<!--坐标转换类 -->
 <script src="/pages/base/line/js/transGPS.js"></script>
 <!-- 地图类 -->
 <script src="/pages/base/line/js/line-list-map.js"></script>
+<!-- 提交选项 -->
+<div class="modal fade" id="submit_select_mobal" tabindex="-1"
+	role="basic" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal"
+					aria-hidden="true"></button>
+				<h4 class="modal-title">
+					提交选项
+				</h4>
+			</div>
+			<div class="modal-body">
+				<form class="form-horizontal" action="/" method="post"
+					id="formBootbox" role="form">
+					
+					<div class="form-group">
+						<label class="col-md-3 control-label">选择版本：</label>
+						<div class="col-md-9">
+							<select class="form-control" name="lineVersions" id="lineVersions" style="width: 370px;"></select>
+						</div>
+					 </div>			 
+				</form>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn default" data-dismiss="modal">取消</button>
+				<button type="button" class="btn btn-primary"
+					id="submitSelectnextButton">提交</button>
+			</div>
+		</div>
+	</div>
+</div>
+<script type="text/javascript">
+	$('#submit_select_mobal').on('submitSelectMobal.show',function(e,section) {
+		// 加载显示mobal
+		$('#submit_select_mobal').modal({
+			show : true,
+			backdrop : 'static',
+			keyboard : false
+			});
+		// 给版本号下拉框赋值
+		$.get('/lineVersions/findByLineId',{'lineId':section.sectionrouteLine},function(lineVersions){
+			var options = "";
+			$.each(lineVersions, function () {
+				var startDate;
+				if(this.startDate != "" && this.startDate != null){
+					startDate = moment(this.startDate).format('YYYY-MM-DD HH:mm:ss');
+				} else {
+					startDate = "无";
+				}
+				if(this.status==1){
+					//当前版本为默认
+					options += '<option value="'+this.versions+','+this.status+','+startDate+'"  > 版本'+this.versions+' 启用时间：'+startDate+' 当前版本</option>';
+				} else if(this.status==2){
+					options += '<option value="'+this.versions+','+this.status+','+startDate+'" selected = "selected"> 版本'+this.versions+' 启用时间：'+startDate+' 待更新版本</option>';
+				}
+			});
+			$('#lineVersions').html(options);
+		});
+		
+		// 获取表单元素
+		var form = $('#formBootbox');
+		// 下一步点击事件
+		$('#submitSelectnextButton').on('click', function() {
+			// 表单提交
+			form.submit();
+		});
+		// 表单验证
+		form.validate({
+			// 表单序列化
+			submitHandler : function(f) {
+				var lineVersions = $('#lineVersions').val();
+				var line = lineVersions.split(",");
+				// 即时更新 
+				if(line[1] == 1) {
+					section.versions = line[0];
+					// 隐藏选项mobal
+					$('#submit_select_mobal').modal('hide');
+					layer.confirm('提交马上会把原有的站点和路段覆盖，您确定要提交吗？', {
+						btn: ['提交','取消'] //按钮
+					}, function(){
+						$.post('/section/sectionCut', section, function(resuntDate){
+							if(resuntDate.status=='SUCCESS') {
+								// 弹出添加成功提示消息
+								layer.msg('提交成功，跳转到线路详情页面！');
+								window.location.href = "/pages/base/stationroute/list.html?no="+section.sectionrouteLine+","+section.sectionrouteDirections;
+							}else {
+								// 弹出添加失败提示消息
+								layer.msg('提交失败...');
+							}
+						});
+					});	
+				// 定时更新
+				} else if(line[1] == 2) {
+					section.versions = line[0];
+					// 隐藏选项mobal
+					$('#submit_select_mobal').modal('hide');
+					layer.confirm('提交后线路将在'+line[2]+'时间以后启用您提交的版本：'+line[0], {
+						btn: ['提交','取消'] //按钮
+					}, function(rs){
+						$.post('/section/sectionCutSaveLineLS', section, function(resuntDate){
+							if(resuntDate.status=='SUCCESS') {
+								// 关闭提示弹出层
+								layer.close(rs);								
+								// 弹出添加成功提示消息
+								layer.msg('提交成功！');
+								// 返回线路list页面
+								loadPage('/pages/base/line/list.html');
+// 								window.location.href = "/pages/base/stationroute/list.html?no="+section.sectionrouteLine+","+section.sectionrouteDirections;
+							}else {
+								// 弹出添加失败提示消息
+								layer.msg('提交失败...');
+							}
+						});
+					});	
+				}
+			}
+		});
+	});
+</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="/lineVersions" class="form-horizontal" id="lineVersions_add_form" >
+			
+			<!-- 错误提示信息组件 START -->
+			<div class="alert alert-danger display-hide">
+				<button class="close" data-close="alert"></button>
+				您的输入有误，请检查下面的输入项
+			</div>
+			<!-- 错误提示信息组件 END -->
+			
+			<!-- 表单内容 START -->
+			<div class="form-body">
+				<input type="hidden" name="lineId" id="lineIdInput" />
+				<input type="hidden" name="lineCode" id="lineCodeInput" />
+                 
+                 <!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+						<label class="control-label col-md-5">
+          					<span class="required"> * </span>线路名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                    	</label>
+	                    <div class="col-md-4">
+	                     	<select name="line" class="form-control" style="width:100%" id="lineSelect"></select>
+	                    </div>
+                 </div>
+                 <!-- 表单分组组件 form-group END -->
+                 
+                  <!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+						<label class="control-label col-md-5">
+          					<span class="required"> * </span>启用时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                    	</label>
+	                    <div class="col-md-4">
+	                     	<input type="text" class="form-control" name="startDate" id="startDateInput" />
+	                    </div>
+                 </div>
+                 <!-- 表单分组组件 form-group END -->
+                 
+                   <!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+						<label class="control-label col-md-5">
+          					<span class="required"> * </span>终止时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                    	</label>
+	                    <div class="col-md-4">
+	                     	<input type="text" class="form-control" name="endDate" id="endDateInput" />
+	                    </div>
+                 </div>
+                 <!-- 表单分组组件 form-group END -->
+                  
+                   <!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+						<label class="control-label col-md-5">
+          					<span class="required"> * </span>线路版本&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                    	</label>
+	                    <div class="col-md-4">
+	                     	<input type="text" class="form-control" name="versions" id="versionsInput" placeholder="线路版本" />
+	                    </div>
+                 </div>
+                 <!-- 表单分组组件 form-group END -->
+                  
+                 <div class="form-group">
+						<label class="control-label col-md-5"> 
+							<span class="required"> * </span>线路版本状态&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+						</label>
+	                    <div class="col-md-4">
+	                  		<select name="status" class="form-control" id="statusInput">
+								<option value="">请选择...</option>
+								<option value="1">当前版本</option>
+								<option value="2">待更新版本</option>
+								<option value="0">历史版本</option>
+							</select>
+						</div>
+	              </div>
+	              
+                 <!-- 表单分组组件 form-group START -->
+                 <div class="form-group">
+					<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="remark" id="remarkTextarea" placeholder="请填写更换版本原因，方便排班人员操作！"></textarea>
+                   	</div>
+                </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/lineversions/js/lineversions-add-from.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="/lineVersions" class="form-horizontal" id="lineVersions_edit_form" >
+			
+			<!-- 错误提示信息组件 START -->
+			<div class="alert alert-danger display-hide">
+				<button class="close" data-close="alert"></button>
+				您的输入有误，请检查下面的输入项
+			</div>
+			<!-- 错误提示信息组件 END -->
+			
+			<!-- 表单内容 START -->
+			<div class="form-body">
+				<input type="hidden" name="lineId" id="lineIdInput" />
+				<input type="hidden" name="lineCode" id="lineCodeInput" />
+				
+				<!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+						<label class="control-label col-md-5">
+          					<span class="required"> * </span>线路版本Id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                    	</label>
+	                    <div class="col-md-4">
+	                     	<input type="text" class="form-control" name="Id" id="IdInput" readonly="readonly" />
+	                    </div>
+                 </div>
+                 <!-- 表单分组组件 form-group END -->
+                 
+                 <!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+						<label class="control-label col-md-5">
+          					<span class="required"> * </span>线路名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                    	</label>
+	                    <div class="col-md-4">
+	                     	<select name="line" class="form-control" style="width:100%" id="lineSelect"></select>
+	                    </div>
+                 </div>
+                 <!-- 表单分组组件 form-group END -->
+                 
+                  <!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+						<label class="control-label col-md-5">
+          					<span class="required"> * </span>启用时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                    	</label>
+	                    <div class="col-md-4">
+	                     	<input type="text" class="form-control" name="startDate" id="startDateInput" />
+	                    </div>
+                 </div>
+                 <!-- 表单分组组件 form-group END -->
+                 
+                   <!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+						<label class="control-label col-md-5">
+          					<span class="required"> * </span>终止时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                    	</label>
+	                    <div class="col-md-4">
+	                     	<input type="text" class="form-control" name="endDate" id="endDateInput" />
+	                    </div>
+                 </div>
+                 <!-- 表单分组组件 form-group END -->
+                  
+                   <!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+						<label class="control-label col-md-5">
+          					<span class="required"> * </span>线路版本&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                    	</label>
+	                    <div class="col-md-4">
+	                     	<input type="text" class="form-control" name="versions" id="versionsInput" placeholder="线路版本" />
+	                    </div>
+                 </div>
+                 <!-- 表单分组组件 form-group END -->
+                  
+                 <div class="form-group">
+						<label class="control-label col-md-5"> 
+							<span class="required"> * </span>线路版本状态&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+						</label>
+	                    <div class="col-md-4">
+	                  		<select name="status" class="form-control" id="statusInput">
+								<option value="">请选择...</option>
+								<option value="1">当前版本</option>
+								<option value="2">待更新版本</option>
+								<option value="0">历史版本</option>
+							</select>
+						</div>
+	              </div>
+	              
+                 <!-- 表单分组组件 form-group START -->
+                 <div class="form-group">
+					<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="remark" id="remarkTextarea" placeholder="请填写更换版本原因，方便排班人员操作！"></textarea>
+                   	</div>
+                </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/lineversions/js/lineversions-edit-from.js"></script>
 \ No newline at end of file
+// 线路版本添加js
+(function(){
+	//获取参数ID
+	var id = $.url().param('no');
+	
+	$("#startDateInput").datetimepicker({
+		format : 'YYYY-MM-DD HH:mm:ss',
+		locale : 'zh-cn'
+	});
+	
+	$("#endDateInput").datetimepicker({
+		format : 'YYYY-MM-DD HH:mm:ss',
+		locale : 'zh-cn'
+	});
+	// 初始化线路名称select
+	lineAllInfo();
+	
+	function getComp (cb) {
+		$.get('/user/companyData',null,function(rs) {
+			var params = {};
+			if(rs.length>0) {
+				var compA = new Array();
+				for(var c = 0 ; c<rs.length;c++) {
+					var comC = rs[c].companyCode;
+					var child = rs[c].children;
+					if(child.length>0) {
+						for(var d = 0 ;d< child.length;d++) {
+							compA.push(comC + '_' + child[d].code);
+						}
+					}else {
+						compA.push(comC);
+					}
+				}
+				params.cgsbm_in  = compA.toString();
+			}
+			return cb && cb(params);
+		});
+	}
+	
+	// 填充公司下拉框选择值
+	function lineAllInfo(){
+		getComp(function(params) {
+			$get('/line/all', params, function(array){
+				// get请求获取公司
+				$get('/business/all', {upCode_eq: '88'}, function(compD){
+					var len_ = array.length,paramsD = new Array();
+					if(len_>0) {
+						$.each(array, function(i, g){
+							if(g.name!='' || g.name != null) {
+								paramsD.push({'id':g.id + '_' + g.lineCode,
+											  'text':g.name + gsdmTogsName(compD,g.company)});
+							}
+						});
+						if($('span').hasClass('select2-selection'))
+							$('span .select2-selection').remove();
+						initPinYinSelect2($('#lineSelect'),paramsD,function(selector) {
+							selector.select2("val", splitxlName(window.localStorage.xlName_AgursData));
+						});
+					}
+				});
+			});
+		});
+	}
+	
+	// 监听线路名称下拉框值改变事件.
+	$('#lineSelect').on("change", function (e) { 
+		var lineSelectValue = $('#lineSelect').val();// 获取线路名称值.
+		if(lineSelectValue=='' || lineSelectValue==null) {
+			$('#lineCodeInput').val('');// 设值线路编码.
+			$('#lineIdInput').val('');// 设值线路ID.
+		}else {
+			var lineSelectValueArray = lineSelectValue.split('_');// 切割线路名称值.
+			$('#lineIdInput').val(lineSelectValueArray[0]);// 设值线路编码.
+			$('#lineCodeInput').val(lineSelectValueArray[1]);// 设值线路ID.
+		}
+	});
+	
+	function gsdmTogsName(gsD,code) {
+		var rsStr = '';
+		for(var s = 0 ; s < gsD.length; s++) {
+			if(gsD[s].businessCode == code) {
+				rsStr = rsStr + '(' + gsD[s].businessName.replace('公司','') + ')';
+				break;
+			}
+		}
+		return rsStr;
+	}
+	
+	// 切割线路名称值.获取线路ID及编码.
+	function splitxlName(str) {
+		var rsStr = '';
+		if(str) {
+			var strArray = str.split('_');
+			rsStr = strArray[0];
+		}
+		return rsStr;
+	}
+	
+	// 定义表单
+	var form = $('#lineVersions_add_form');
+	// 定义表单异常
+	var error = $('.alert-danger',form);
+	// 表单验证
+	form.validate({
+		// 错误提示元素span对象
+		errorElement : 'span',
+		// 错误提示元素class名称
+		errorClass : 'help-block help-block-error', 
+		// 验证错误获取焦点
+		focusInvalid : true, 
+		// 需要验证的表单元素
+		rules : {
+			'line' : {required : true,maxlength: 30},// 线路名称 必填项、最大长度.
+			'startDate' : {required : true},// 启用时间 不为空.
+			'endDate' : {required : true},// 结束时间.
+			'versions' : {required : true, digits : true, maxlength: 10},// 版本号  必填项、数字、最大长度10.
+			'status' : {required : true, digits : true, maxlength: 10},// 版本状态 必填项、数字、最大长度10.
+		},
+		
+		/**
+		 * 类型：Callback。当未通过验证的表单提交时，可以在该回调函数中处理一些事情。
+		 * 
+		 * 参数：该回调函数有两个参数：第一个为一个事件对象，第二个为验证器（validator）
+		 */
+		invalidHandler : function(event, validator) {
+			// 显示表单未通过提示信息
+			error.show();
+			// 把提示信息放到指定的位置。
+			App.scrollTo(error, -200);
+		},
+		
+		/**
+		 * 类型：Callback。
+		 * 
+		 * 默认：添加errorClass("has-error")到表单元素。将未通过验证的表单元素设置高亮。
+		 */
+		highlight : function(element) { 
+			// 添加errorClass("has-error")到表单元素
+			$(element).closest('.form-group').addClass('has-error'); 
+		},
+		
+		/**
+		 * 类型：Callback。
+		 * 
+		 * 默认：移除errorClass("has-error")。与highlight操作相反
+		 */
+		unhighlight : function(element) { 
+			// 移除errorClass("has-error")
+			$(element).closest('.form-group').removeClass('has-error'); 
+		},
+		
+		/**
+		 * 类型：String,Callback。
+		 * 
+		 * 如果指定它，当验证通过时显示一个消息。
+		 * 
+		 * 如果是String类型的，则添加该样式到标签中；
+		 * 
+		 * 如果是一个回调函数，则将标签作为其唯一的参数。
+		 */
+		success : function(label) {
+			// 当验证通过时,移除errorClass("has-error")
+			label.closest('.form-group').removeClass('has-error'); 
+			
+		},
+		/**
+		 * 类型：Callback。
+		 * 
+		 * 默认：default (native) form submit;当表单通过验证，提交表单。回调函数有个默认参数form
+		 */
+		submitHandler : function(f) {
+			// 隐藏错误提示
+			error.hide();
+			// 表单序列化
+			var params = form.serializeJSON();
+			submit();
+			// 提交
+			function submit() {
+				// 添加数据
+				$post('/lineVersions/add', params, function(result) {
+					// 如果返回结果不为空
+					if(result){
+						// 返回状态码为"SUCCESS" ，则添加成功；返回状态码为"ERROR" ，则添加失败
+						if(result.status=='SUCCESS') {
+							// 弹出添加成功提示消息
+							layer.msg('添加成功...');
+						} else if(result.status=='ERROR') {
+							// 弹出添加失败提示消息
+							layer.msg('添加失败...');
+						}
+					}
+					// 返回list.html页面
+					loadPage('list.html');
+				});
+			}
+		}
+	});
+})();
 \ No newline at end of file
+// 线路版本修改js
+(function(){
+	//获取参数ID
+	var id = $.url().param('no');
+	
+	$("#startDateInput").datetimepicker({
+		format : 'YYYY-MM-DD HH:mm:ss',
+		locale : 'zh-cn'
+	});
+	
+	$("#endDateInput").datetimepicker({
+		format : 'YYYY-MM-DD HH:mm:ss',
+		locale : 'zh-cn'
+	});
+	// 初始化线路名称select
+	lineAllInfo();
+	
+	function getComp (cb) {
+		$.get('/user/companyData',null,function(rs) {
+			var params = {};
+			if(rs.length>0) {
+				var compA = new Array();
+				for(var c = 0 ; c<rs.length;c++) {
+					var comC = rs[c].companyCode;
+					var child = rs[c].children;
+					if(child.length>0) {
+						for(var d = 0 ;d< child.length;d++) {
+							compA.push(comC + '_' + child[d].code);
+						}
+					}else {
+						compA.push(comC);
+					}
+				}
+				params.cgsbm_in  = compA.toString();
+			}
+			return cb && cb(params);
+		});
+	}
+	
+	// 填充公司下拉框选择值
+	function lineAllInfo(){
+		getComp(function(params) {
+			$get('/line/all', params, function(array){
+				// get请求获取公司
+				$get('/business/all', {upCode_eq: '88'}, function(compD){
+					var len_ = array.length,paramsD = new Array();
+					if(len_>0) {
+						$.each(array, function(i, g){
+							if(g.name!='' || g.name != null) {
+								paramsD.push({'id':g.id + '_' + g.lineCode,
+											  'text':g.name + gsdmTogsName(compD,g.company)});
+							}
+						});
+						if($('span').hasClass('select2-selection'))
+							$('span .select2-selection').remove();
+						initPinYinSelect2($('#lineSelect'),paramsD,function(selector) {
+							selector.select2("val", splitxlName(window.localStorage.xlName_AgursData));
+						});
+					}
+				});
+			});
+		});
+	}
+	
+	// 监听线路名称下拉框值改变事件.
+	$('#lineSelect').on("change", function (e) { 
+		var lineSelectValue = $('#lineSelect').val();// 获取线路名称值.
+		if(lineSelectValue=='' || lineSelectValue==null) {
+			$('#lineCodeInput').val('');// 设值线路编码.
+			$('#lineIdInput').val('');// 设值线路ID.
+		}else {
+			var lineSelectValueArray = lineSelectValue.split('_');// 切割线路名称值.
+			$('#lineIdInput').val(lineSelectValueArray[0]);// 设值线路编码.
+			$('#lineCodeInput').val(lineSelectValueArray[1]);// 设值线路ID.
+		}
+	});
+	
+	// 如果参数ID不为空
+	if(id) {
+		setTimeout(function(){
+				/** 根据ID查询详细信息 */
+				$get('/lineVersions/findById',{'id':id}, function(result){
+					// 如果不为空
+					if(result) {	
+						$("#IdInput").val(result.id);
+						$("#lineIdInput").val(result.line);
+						$("#lineCodeInput").val(result.lineCode);
+						$("#lineSelect").val();
+						$("#lineSelect").val(result.line.id+"_"+result.lineCode).trigger("change");
+						$("#startDateInput").val(moment(result.startDate).format('YYYY-MM-DD HH:mm:ss'));
+						$("#endDateInput").val(moment(result.endDate).format('YYYY-MM-DD HH:mm:ss'));
+						$("#versionsInput").val(result.versions);
+						$("#statusInput").val(result.status);
+						$("#remarkTextarea").val(result.remark);
+					}
+					 
+				});
+		}, 500);
+		
+	} else {
+		// 缺少ID
+		layer.confirm('【ID缺失，请点击返回，重新进行修改操作】', {btn : [ '返回' ],icon: 3, title:'提示'}, function(index){
+			// 关闭弹出层
+			layer.close(index);
+			// 跳转到list页面
+			loadPage('list.html');
+		});
+	}
+	
+	function gsdmTogsName(gsD,code) {
+		var rsStr = '';
+		for(var s = 0 ; s < gsD.length; s++) {
+			if(gsD[s].businessCode == code) {
+				rsStr = rsStr + '(' + gsD[s].businessName.replace('公司','') + ')';
+				break;
+			}
+		}
+		return rsStr;
+	}
+	
+	// 切割线路名称值.获取线路ID及编码.
+	function splitxlName(str) {
+		var rsStr = '';
+		if(str) {
+			var strArray = str.split('_');
+			rsStr = strArray[0];
+		}
+		return rsStr;
+	}
+	
+	// 定义表单
+	var form = $('#lineVersions_edit_form');
+	// 定义表单异常
+	var error = $('.alert-danger',form);
+	// 表单验证
+	form.validate({
+		// 错误提示元素span对象
+		errorElement : 'span',
+		// 错误提示元素class名称
+		errorClass : 'help-block help-block-error', 
+		// 验证错误获取焦点
+		focusInvalid : true, 
+		// 需要验证的表单元素
+		rules : {
+			'line' : {required : true,maxlength: 30},// 线路名称 必填项、最大长度.
+			'startDate' : {required : true},// 启用时间 不为空.
+			'endDate' : {required : true},// 结束时间.
+			'versions' : {required : true, digits : true, maxlength: 10},// 版本号  必填项、数字、最大长度10.
+			'status' : {required : true, digits : true, maxlength: 10},// 版本状态 必填项、数字、最大长度10.
+		},
+		
+		/**
+		 * 类型：Callback。当未通过验证的表单提交时，可以在该回调函数中处理一些事情。
+		 * 
+		 * 参数：该回调函数有两个参数：第一个为一个事件对象，第二个为验证器（validator）
+		 */
+		invalidHandler : function(event, validator) {
+			// 显示表单未通过提示信息
+			error.show();
+			// 把提示信息放到指定的位置。
+			App.scrollTo(error, -200);
+		},
+		
+		/**
+		 * 类型：Callback。
+		 * 
+		 * 默认：添加errorClass("has-error")到表单元素。将未通过验证的表单元素设置高亮。
+		 */
+		highlight : function(element) { 
+			// 添加errorClass("has-error")到表单元素
+			$(element).closest('.form-group').addClass('has-error'); 
+		},
+		
+		/**
+		 * 类型：Callback。
+		 * 
+		 * 默认：移除errorClass("has-error")。与highlight操作相反
+		 */
+		unhighlight : function(element) { 
+			// 移除errorClass("has-error")
+			$(element).closest('.form-group').removeClass('has-error'); 
+		},
+		
+		/**
+		 * 类型：String,Callback。
+		 * 
+		 * 如果指定它，当验证通过时显示一个消息。
+		 * 
+		 * 如果是String类型的，则添加该样式到标签中；
+		 * 
+		 * 如果是一个回调函数，则将标签作为其唯一的参数。
+		 */
+		success : function(label) {
+			// 当验证通过时,移除errorClass("has-error")
+			label.closest('.form-group').removeClass('has-error'); 
+			
+		},
+		/**
+		 * 类型：Callback。
+		 * 
+		 * 默认：default (native) form submit;当表单通过验证，提交表单。回调函数有个默认参数form
+		 */
+		submitHandler : function(f) {
+			// 隐藏错误提示
+			error.hide();
+			// 表单序列化
+			var params = form.serializeJSON();
+			submit();
+			// 提交
+			function submit() {
+				// 添加数据
+				$post('/lineVersions/update', params, function(result) {
+					// 如果返回结果不为空
+					if(result){
+						// 返回状态码为"SUCCESS" ，则添加成功；返回状态码为"ERROR" ，则添加失败
+						if(result.status=='SUCCESS') {
+							// 弹出添加成功提示消息
+							layer.msg('修改成功...');
+						} else if(result.status=='ERROR') {
+							// 弹出添加失败提示消息
+							layer.msg('修改失败...');
+						}
+					}
+					// 返回list.html页面
+					loadPage('list.html');
+				});
+			}
+		}
+	});
+})();
 \ No newline at end of file
+/**
+ * 
+ * @JSName : lineversions-list-table.js(线路版本信息list.html页面js)
+ * @Description : TOOD(线路信息list.html页面js)
+ */
+
+(function(){
+	// 关闭左侧栏
+	if (!$('body').hasClass('page-sidebar-closed')) {$('.menu-toggler.sidebar-toggler').click();}
+	// 定义 page : 当前页；initPag ； icheckOptions:选择框
+	var page = 0,
+		initPag,
+		icheckOptions = {checkboxClass: 'icheckbox_flat-blue',increaseArea: '20%'},
+		storage = window.localStorage;
+	if(storage.xlName_AgursData!=null && storage.xlName_AgursData !='') {
+		$('.tipso-animation').children().remove();
+		// 延迟加载
+		setTimeout(function(){
+			$('.tipso-animation').tipso({
+			      speed           : 400,
+			      background      : '#0ed0e8',
+			      color           : '#ffffff',
+			      position		  :'bottom',
+			      width           : 400,
+			      delay           : 100,
+			      animationIn	  : 'fadeInDownBig',
+			      animationOut	  : 'fadeOut',
+			      offsetX         : -50,
+			      offsetY         : -195,
+			      content	      :'您可以通过点击重置按钮来清除对线路名称的记忆哦!',
+			     
+			});
+			$('.tipso-animation').tipso('show');
+			setTimeout(function(){$('.tipso-animation').tipso('hide');},4000);
+		},200);
+	}
+	initCompanySelect2(function(array) {
+		// 公司下拉options属性值
+		var options = '<option value="">请选择...</option>';
+		// 遍历array
+		$.each(array, function(i,d){
+			options += '<option value="'+d.businessCode+'">'+d.businessName+'</option>';
+		});
+		// 初始化公司下拉框并监听值改变事件.
+		$('#companySelect').html(options).on('change', setBrancheCompanySelectOptions);
+		// 初始化分公司下拉框.
+		setBrancheCompanySelectOptions();
+		initLineSelect2(array);
+		/** 表格数据分页加载 @param：<null：搜索参数；true：是否重新分页> */
+		loadTableDate({'line.name_like':splitxlName(storage.xlName_AgursData)},true);
+	});
+	
+	function initLineSelect2(compD) {
+		getComp(function(rs) {
+			var params = {};
+			if(rs.length>0) {
+				var compA = new Array();
+				for(var c = 0 ; c<rs.length;c++) {
+					var comC = rs[c].companyCode;
+					var child = rs[c].children;
+					if(child.length>0) {
+						for(var d = 0 ;d< child.length;d++) {
+							compA.push(comC + '_' + child[d].code);
+						}
+					}else {
+						compA.push(comC);
+					}
+				}
+				params.cgsbm_in  = compA.toString();
+			}
+			// 填充线路拉框选择值
+			$get('/line/all', params, function(array){
+				var len_ = array.length,paramsD = new Array();
+				if(len_>0) {
+					$.each(array, function(i, g){
+						if(g.name!='' || g.name != null) {
+							paramsD.push({'id':g.name + '_' + g.id + '_' + g.lineCode ,'text':g.name + gsdmTogsName(compD,g.company)});
+						}
+					});
+					if($('span').hasClass('select2-selection'))
+						$('span .select2-selection').remove();
+					initPinYinSelect2($('#lineSelect'),paramsD,function(selector) {
+						selector.select2("val", storage.xlName_AgursData);
+					});
+				}
+			});
+		});
+	}
+	
+	function gsdmTogsName(gsD,code) {
+		var rsStr = '';
+		for(var s = 0 ; s < gsD.length; s++) {
+			if(gsD[s].businessCode == code) {
+				rsStr = rsStr + '(' + gsD[s].businessName.replace('公司','') + ')';
+				break;
+			}
+		}
+		return rsStr;
+	}
+	
+    function initCompanySelect2(cb) {
+		// get请求获取公司
+		$get('/business/all', {upCode_eq: '88'}, function(gs_d){
+			 return cb && cb(gs_d);
+		});
+	}
+	function getComp(cb) {
+		$.get('/user/companyData',null,function(rs) {
+			return cb && cb(rs);
+		});
+	}
+	function getParams() {
+		// cells 集合返回表格中所有（列）单元格的一个数组
+		var cells = $('tr.filter')[0].cells;
+		// 搜索参数集合
+		var params = {};
+		// 搜索字段名称
+		var name;
+		// 遍历cells数组
+		$.each(cells, function(i, cell){
+			// 获取第i列的input或者select集合
+			var items = $('input,select', cell);
+			// 遍历items集合
+			for(var j = 0, item; item = items[j++];){
+				// 获取字段名称
+				name = $(item).attr('name');
+				if(name){
+					// 赋取相对应的值
+					params[name] = $(item).val();
+				}
+			}
+		});
+		return params;
+	}
+	
+	/** 表格数据分页加载事件 @param:<param : 查询参数;isPon : 是否重新分页> */
+	function loadTableDate(param,isPon){
+		// 搜索参数
+		var params = {};
+		if(param) {
+			params = param;
+		}
+		// 排序（按方向与序号）
+		params['order'] = 'lineCode,versions';
+		// 排序方向.
+		params['direction'] = 'ASC,ASC';
+		// 记录当前页数
+		params['page'] = page;
+		// 弹出正在加载层
+		var i = layer.load(2);
+		// 异步请求获取表格数据
+		$.get('/lineVersions',params,function(result){
+			// 添加序号
+			result.content.page =  page;
+			// 把数据填充到模版中
+			$.each(result.content, function(){
+				this.startDateStr=moment(this.startDate).format('YYYY-MM-DD HH:mm:ss');
+				this.endDateStr=moment(this.endDate).format('YYYY-MM-DD HH:mm:ss');
+			})
+
+			var tbodyHtml = template('lineversions_list_temp',{list:result.content});
+			$('#datatable_lineversions tbody').html(tbodyHtml);
+			// 是重新分页且返回数据长度大于0
+			if(isPon && result.content.length > 0){
+				// 重新分页
+				initPag = true;
+				// 分页栏
+				showPagination(result);
+			}
+			// 关闭弹出加载层
+			layer.close(i);
+		});
+	}
+
+
+	function toDate(timestamp){
+		var date = new Date(parseInt(timestamp).toLocaleString());
+		return date;
+	}
+	
+	/** 复选框组件 */
+	function iCheckChange(){
+		// 获取当前的父节点tr
+		var tr = $(this).parents('tr');
+		// 判断当前是否选中
+		if(this.checked) {
+			// 选中，则增添父节点tr的样式
+			tr.addClass('row-active');
+		}else {
+			// 未选中，则删除父节点tr的样式
+			tr.removeClass('row-active');
+		}
+	}
+	
+	/** 分页栏组件 */
+	function showPagination(data){
+		// 分页组件
+		$('#pagination').jqPaginator({
+			// 总页数
+		    totalPages: data.totalPages,
+		    // 中间显示页数
+		    visiblePages: 6,
+		    // 当前页
+		    currentPage: page + 1,
+		    first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
+            prev:  '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
+            next:  '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
+            last:  '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
+            page:  '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
+		    onPageChange: function (num, type) {
+		    	if(initPag){
+		    		initPag = false;
+		    		return;
+		    	}	
+		    	var pData = getParams();
+		    	pData['line.name_like'] = splitxlName(pData['line.name_like']);
+		    	page = num - 1;
+		    	loadTableDate(pData, false);
+		    }
+		});
+	}
+	 /** 填充分公司下拉框选择值 */ 
+	 function setBrancheCompanySelectOptions(){
+		 // 获取公司下拉框选择值
+		 var businessCode = $('#companySelect').val();
+		 // 分公司下拉框options属性值
+		 var options = '<option value="">请选择...</option>';
+		 // 如果公司选择为空则分公司为空 ; 否则查询出所属公司下的分公司名称和相应分公司代码
+		 if(businessCode == null || businessCode ==''){
+			 // 填充分公司下拉框options
+			 $('#brancheCompanySelect').html(options);
+		  } else {
+			  /** 查询出所属公司下的分公司名称和相应分公司代码 @param：<upCode_eq：公司代码> */
+			  $get('/business/all', {upCode_eq: businessCode}, function(array){
+				  // 遍历array
+				  $.each(array, function(i,d){
+					  options += '<option value="'+d.businessCode+'">'+d.businessName+'</option>';
+					  // 填充分公司下拉框options
+					  $('#brancheCompanySelect').html(options);
+				  });
+			  });
+		  }
+	 }
+	
+	/** 重置按钮事件 */
+	$('tr.filter .filter-cancel').on('click',function() {
+		 // 清空搜索框值
+		 $('tr.filter input,select').val('').change();
+		 $('.tipso-animation').tipso('hide');
+		 storage.setItem('xlName_AgursData','');
+		 /** 表格数据分页加载 @param：<null：搜索参数；true：是否重新分页> */
+		 loadTableDate(null,true);
+	});
+	
+	function splitxlName(str) {
+		var rsStr = '';
+		if(str) {
+			var strArray = str.split('_');
+			rsStr = strArray[0];
+		}
+		return rsStr;
+	}
+	
+	/**  搜索按钮事件 */
+	$('tr.filter .filter-submit').on('click',function(){
+		var params =  getParams();
+		if(params['line.name_like']!='' && params['line.name_like'] != null) {
+			storage.setItem('xlName_AgursData',params['line.name_like']);
+		}
+		params['line.name_like'] = splitxlName(params['line.name_like']);
+		page = 0;
+		/** 表格数据分页加载 @param：<params：搜索参数；true：是否重新分页> */
+		loadTableDate(params,true);
+	});
+	
+})();
 \ 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><span class="active">线路版本信息</span></li>
+</ul>
+<!-- 线路信息导航栏组件 END -->
+
+<div class="row">
+	<div class="col-md-12">
+		<div class="portlet light porttlet-fit bordered">
+			<div class="portlet-title">
+				<div class="tipso-animation">
+				</div>
+				<div class="caption">
+					 <i class="fa fa-info-circle font-dark"></i> 
+					 <span class="caption-subject font-dark sbold uppercase">线路版本信息</span>
+				</div>
+				<div class="actions">
+					<div class="btn-group btn-group-devided" data-toggle="buttons">
+						<a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加线路版本</a>
+					</div>
+				</div>
+			</div>
+			<div class="portlet-body">
+				<div class="table-container" style="margin-top: 10px">
+					<table class="table table-striped table-bordered table-hover table-checkable" id="datatable_lineversions">
+						<thead>
+							<tr role="row" class="heading">
+								<th width="4%">序号</th>
+								<th width="5%">线路编码</th>
+								<th width="8%">线路名称</th>
+								<th width="8%">所属公司</th>
+								<th width="9%">所属分公司</th>
+								<th width="8%">启用时间</th>
+								<th width="8%">终止时间</th>
+								<th width="6%">版本号</th>
+								<th width="6%">版本状态</th>
+								<th width="6%">描述</th>
+								<th width="12%">操作</th>
+							</tr>
+							<tr role="row" class="filter">
+								<td>#</td>
+								<td>
+									<input type="text"  class="form-control form-filter input-sm" name="lineCode_eq">
+								</td>
+								<td>
+									<select name="line.name_like" class="form-control" style="width:100%" id="lineSelect"></select>
+									<!-- <input type="text"  class="form-control form-filter input-sm" name="name_like"> -->
+								</td>
+								<td>
+									 <!-- 公司这里没使用字典表，暂时查的公司表 -->
+									 <select name="line.company_eq" class="form-control" id="companySelect"></select>
+								</td>
+								<!-- 闵行没有下属公司，这里暂时注释掉 -->
+								<td>
+									 <select name="line.brancheCompany_eq" class="form-control" id="brancheCompanySelect"></select>
+								</td>
+								<td>
+<!-- 									 <input type="text" class="form-control form-filter input-sm" name="shanghaiLinecode_eq"> -->
+								</td>
+								<td>
+<!-- 									 <input type="text" class="form-control form-filter input-sm" name="shanghaiLinecode_eq"> -->
+								</td>
+								<td>
+									 <input type="text" class="form-control form-filter input-sm" name="versions_eq">
+									 
+								</td>
+								<td>
+									 <select name="status_eq" class="form-control" id="statusSelect">
+										<option value="">请选择...</option>
+										<option value="1">当前版本</option>
+										<option value="2">待更新版本</option>
+										<option value="0">历史版本</option>
+									</select>
+								</td>
+								<td></td>
+								<td>
+									<button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
+										<i class="fa fa-search"></i> 搜索
+									</button>
+                                                                
+									<button class="btn btn-sm red btn-outline filter-cancel" id="notification-trigger">
+										<i class="fa fa-times"></i> 重置
+									</button>
+								</td>
+							</tr>
+						</thead>
+						<tbody></tbody>
+					</table>
+					<div style="text-align: right;">
+						<ul id="pagination" class="pagination"></ul>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script type="text/html" id="lineversions_list_temp">
+	{{each list as obj i }}
+		<tr>
+			<td style="vertical-align: middle;">
+				{{(list.page*10)+(i+1)}}
+			</td>
+			<td>
+				{{obj.lineCode}}
+			</td>
+			<td>
+				{{obj.line.name}}
+			</td>
+			<td>
+				{{if obj.line.company == '55'}}
+					上南公司
+				{{else if obj.line.company == '22'}}
+					金高公司
+				{{else if obj.line.company == '05'}}
+					杨高公司
+				{{else if obj.line.company == '26'}}
+					南汇公司
+				{{else if obj.line.company == '77'}}
+					闵行公司
+				{{/if}}
+			</td>
+			<td>
+				{{if obj.line.company == '55'}}
+
+					{{if obj.line.brancheCompany == '1'}}
+						上南二分公司
+					{{else if obj.line.brancheCompany == '2'}}
+						上南三分公司
+					{{else if obj.line.brancheCompany == '3'}}
+						上南六分公司
+					{{else if obj.line.brancheCompany == '4'}}
+						上南一分公司
+					{{/if}}
+
+				{{else if obj.company == '22'}}
+
+					{{if obj.line.brancheCompany == '1'}}
+						四分公司
+					{{else if obj.line.brancheCompany == '2'}}
+						二分公司
+					{{else if obj.line.brancheCompany == '3'}}
+						三分公司
+					{{else if obj.line.brancheCompany == '5'}}
+						一分公司
+					{{/if}}
+		
+				{{else if obj.line.company == '05'}}
+					
+					{{if obj.line.brancheCompany == '1'}}
+						川沙分公司
+					{{else if obj.line.brancheCompany == '2'}}
+						金桥分公司
+					{{else if obj.line.brancheCompany == '3'}}
+						芦潮港分公司
+					{{else if obj.line.brancheCompany == '5'}}
+						杨高分公司
+					{{else if obj.line.brancheCompany == '6'}}
+						周浦分公司
+					{{/if}}
+
+				{{else if obj.line.company == '26'}}
+
+					{{if obj.line.brancheCompany == '1'}}
+						南汇一分
+					{{else if obj.line.brancheCompany == '2'}}
+						南汇二分
+					{{else if obj.line.brancheCompany == '3'}}
+						南汇三分
+					{{else if obj.line.brancheCompany == '4'}}
+						南汇维修公司
+					{{else if obj.line.brancheCompany == '5'}}
+						南汇公司
+					{{/if}}
+
+				{{/if}}
+			</td>
+			<td>
+				{{obj.startDateStr}}
+			</td>
+			<td>
+				{{obj.endDateStr}}
+			</td>
+			<td>
+				{{obj.versions}}
+			</td>
+			<td>
+				{{if obj.status == '0'}}
+						历史版本
+				{{else if obj.status == '1'}}
+						当前版本
+				{{else if obj.status == '2'}}
+						待更新版本
+				{{/if}}
+			</td>
+			<td>
+				{{obj.remark}}
+			</td>
+			<td>
+				<a href="edit.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 修改 </a>
+			</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan=13><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
+<!-- 线路信息片段JS模块 -->
+<script src="/pages/base/lineversions/js/lineversions-list-table.js"></script>
 \ No newline at end of file
@@ -245,7 +245,7 @@
 								<div class="form-group">
 									<label class="col-md-3 control-label">版本号&nbsp;&nbsp;&nbsp;:</label>
 									<div class="col-md-6">
-										<input type="text" class="form-control" name="versions" value='1' Readonly>
+										<input type="text" class="form-control" name="versions" id="versionsInput" Readonly>
 									</div>
 								</div>
 							</div>
@@ -6,13 +6,22 @@ $(function(){
 	// 监听线路名称下拉框值改变事件.
 	$('#lineSelect').on("change", function (e) { 
 		var lineSelectValue = $('#lineSelect').val();// 获取线路名称值.
-		if(lineSelectValue=='') {
+		if(lineSelectValue=='' || lineSelectValue==null) {
 			$('#lineCodeInput').val('');// 设值线路编码.
 			$('#lineIdInput').val('');// 设值线路ID.
 		}else {
+			debugger
 			var lineSelectValueArray = lineSelectValue.split('_');// 切割线路名称值.
 			$('#lineIdInput').val(lineSelectValueArray[0]);// 设值线路编码.
 			$('#lineCodeInput').val(lineSelectValueArray[1]);// 设值线路ID.
+			// 版本号赋值
+			$.get('/lineVersions/findByLineId',{'lineId':lineSelectValueArray[0]},function(lineVersions){
+				$.each(lineVersions,function(){
+					if (this.status == 1) {
+						$('#versionsInput').val(this.versions); 
+					}
+				})
+			});
 			// 获取该线路下的路段路由.
 			PublicFunctions.getSectionRouteInfo(lineSelectValueArray[0],function(array) {
 				// 定义路段路由长度、渲染拼音检索下拉框格式数据.
@@ -27,6 +27,7 @@
 		// 线路下拉框初始化.
 		PublicFunctions.getLineAllInfo(function(array,compD) {
 			var len_ = array.length,paramsD = new Array();
+//			paramsD.push({'id':'','text':'请选择...'});
 			if(len_>0) {
 				$.each(array, function(i, g){
 					if(g.name!='' || g.name != null) {
@@ -33,7 +33,7 @@ var PositionsPublicFunctions = function () {
 			$('#speedLimitInput').val(Section.sectionSpeedLimit);// 道路限速
 			$('#sectionDistanceInput').val(Section.sectionDistance);// 路段长度
 			$('#sectionTimeInput').val(Section.sectionTime);// 路段长度
-			$('#versionsInput').val(Section.sectionVersion);// 版本号
+			$('#versionsInput').val(Section.sectionRouteVersions);// 版本号
 			$('#destroySelect').val(Section.sectionRouteDestroy);// 是否撤销
 			$('#descriptionsTextarea').val(Section.sectionRouteDescriptions);// 描述/说明
 			$('#isRoadeSpeedInput').val(Section.isRoadeSpeed);// 是否有路段限速数据  <0：分段；1：未分段>
@@ -288,7 +288,7 @@
 								<div class="form-group">
 									<label class="col-md-3 control-label">版本号&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
 									<div class="col-md-6">
-										<input type="text" class="form-control" name="versions" value='1' Readonly>
+										<input type="text" class="form-control" name="versions" id="versionsInput" Readonly>
 									</div>
 								</div>
 							</div>
@@ -184,7 +184,7 @@
 						<div class="form-group">
 							<label class="col-md-3 control-label">版本号&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
 							<div class="col-md-6">
-								<input type="text" class="form-control" name="versions" value='1' Readonly>
+								<input type="text" class="form-control" name="versions" id='versionsInput' Readonly>
 							</div>
 						</div>
 					</div>
@@ -253,7 +253,7 @@ $(&#39;#editPoitsions_station_mobal&#39;).on(&#39;editStationMobal_show&#39;, function(e, map,fu
 			'stationMark' : {required : true},// 站点类型  必填项
 			'bJwpoints' : {required : true},// 经纬度坐标点  必填项
 			'shapesType' : {required : true},// 几何图形类型  必填项
-			'radius' : {required : true},// 圆形半径  必填项
+			'radius' : {required : true, number : true,},// 圆形半径  必填项
 			'destroy' : {required : true},// 是否撤销  必填项
 			'toTime' : {number : true},// 到站时间 必须输入合法的数字（负数，小数）。
 			'distances' : {number : true},// 到站距离 // 到站距离
@@ -14,7 +14,7 @@ $(function(){
 	// 监听线路名称值改变事件.
 	$('#lineSelect').on("change", function (e) { 
 		var lineSelectValue = $(this).val();
-		if(lineSelectValue=='' && lineSelectValue ==null) {
+		if(lineSelectValue=='' || lineSelectValue ==null) {
 			$('#lineCodeInput').val('');
 			$('#lineIdInput').val('');
 		}else {
@@ -23,6 +23,14 @@ $(function(){
 			$('#lineIdInput').val(lineSelectValueArray[0]);
 			$('#lineCodeInput').val(lineSelectValueArray[1]);
 			var params =  {'lineCode_eq':lineSelectValueArray[1],'destroy_eq':0,'directions_eq':dir};
+			// 版本号赋值
+			$.get('/lineVersions/findByLineId',{'lineId':lineSelectValueArray[0]},function(lineVersions){
+				$.each(lineVersions,function(){
+					if (this.status == 1) {
+						$('#versionsInput').val(this.versions); 
+					}
+				})
+			});
 			initSelect(params);
 		}
 	});
@@ -58,8 +66,8 @@ $(function(){
 		PublicFunctions.getStationRouteInfo(p,function(array) {
 			// 定义路段路由长度、渲染拼音检索下拉框格式数据.
 			var len_ = array.length,paramsD = new Array();
+//			paramsD.push({'id':'','text':'请选择...'});
 			if(len_>0) {
-				paramsD.push({'id':'','text':'请选择...'});
 				// 遍历.
 				$.each(array, function(i, g){
 					// 判断.
@@ -25,6 +25,7 @@
 		$('#destroySelect').val('0');
 		PublicFunctions.getLineAllInfo(function(array,compD) {
 			var len_ = array.length,paramsD = new Array();
+//			paramsD.push({'id':'','text':'请选择...'});
 			if(len_>0) {
 				$.each(array, function(i, g){
 					if(g.name!='' || g.name != null) {
@@ -36,7 +36,7 @@ var FormWizard = function() {
 					'directions' : 	  	 {required : true,},// 站点方向 必填项
 					'bJwpoints' : 		 {required : true,},// 经纬度坐标点 必填项
 					'shapesType' : 	     {required : true,},// 范围图形类型 必填项
-					'radius':			 {required : true,},// 圆形半径 
+					'radius':			 {required : true, number : true,},// 圆形半径 
 					'destroy' : 		 {required : true,},// 是否撤销 必填项.
 					'toTime' : 			 {number   : true,},// 路段时长 必须输入合法的数字（负数，小数）。
 					'distances' : 		 {number   : true,},// 路段时长 必须输入合法的数字（负数，小数）。
@@ -54,7 +54,7 @@
 				'stationRouteCode' : {isStart : true},// 站点序号
 				'bJwpoints' : {required : true},// 经纬度坐标点  必填项
 				'shapesType' : {required : true},// 几何图形类型  必填项
-				'radius' : {required : true},// 圆形半径  必填项
+				'radius' : {required : true, number : true,},// 圆形半径  必填项
 				'destroy' : {required : true},// 是否撤销  必填项
 				'toTime' : {number : true},// 到站时间 必须输入合法的数字（负数，小数）。
 				'distances' : {number : true},// 到站距离 // 到站距离
@@ -150,6 +150,8 @@ var PositionsPublicFunctions = function () {
 				$('#toTimeInput').val(stationObj.stationRouteToTime);
 				// 到站距离
 				$('#distancesInput').val(stationObj.stationRouteDistances);
+				// 版本号
+				$('#versionsInput').val(stationObj.stationRouteVersions);
 				// 描述/说明
 				$('#descriptionsTextarea').val(stationObj.stationRouteDescriptions);
 			},
@@ -194,6 +196,8 @@ var PositionsPublicFunctions = function () {
 				$('#toTimeInput').val(stationObj.stationRouteToTime);
 				// 到站距离
 				$('#distancesInput').val(stationObj.stationRouteDistances);
+				// 版本号
+				$('#versionsInput').val(stationObj.stationRouteVersions);
 				// 描述/说明
 				$('#descriptionsTextarea').val(stationObj.stationRouteDescriptions);
 			},
@@ -241,7 +241,7 @@
 						<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="versions"  >
+                     		<input type="text" class="form-control" name="versions" id="versionsInput" Readonly>
                     	</div>
 	                </div>
                  </div>
@@ -173,7 +173,7 @@
 						<div class="form-group">
 							<label class="col-md-3 control-label">版本号&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
 							<div class="col-md-6">
-								<input type="text" class="form-control" name="versions" value='1' Readonly>
+								<input type="text" class="form-control" name="versions" id='versionsInput' Readonly>
 							</div>
 						</div>
 					</div>
@@ -236,6 +236,15 @@ $(&#39;#add_station_mobal&#39;).on(&#39;AddStationMobal.show&#39;, function(e, addMap,ajaxd,stao
 			$('#radiusInput').val(Station.radius);
 			// 是否撤销
 			$('#destroySelect').val(0); 
+			// 版本号
+			$.get('/lineVersions/findByLineId',{'lineId':Line.id},function(lineVersions){
+				$.each(lineVersions,function(){
+					if (this.status == 1) {
+						$('#versionsInput').val(this.versions); 
+					}
+				})
+			});
+			
 			var initzdlyP = {'line.id_eq':Line.id,'destroy_eq':0,'directions_eq':Station.dir};
 			initSelect(initzdlyP);
 		});
@@ -171,7 +171,7 @@
 						<div class="form-group">
 							<label class="col-md-3 control-label">版本号&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
 							<div class="col-md-6">
-								<input type="text" class="form-control" name="versions" value='1' Readonly>
+								<input type="text" class="form-control" name="versions" id='versionsInput' Readonly>
 							</div>
 						</div>
 					</div>
@@ -277,7 +277,6 @@ var PublicFunctions = function () {
  
 			/** @param directionV_ ：方向 */
 			stationRevoke : function(directionV_) {
-				debugger
 				// 获取树选中节点对象
 				var obj = PublicFunctions.getCurrSelNode(directionV_);
 				// 是否选中，选中节点是否为站点
@@ -377,6 +376,8 @@ var PublicFunctions = function () {
 				$('#toTimeInput').val(editStationParmas.stationRouteToTime);
 				// 到站距离
 				$('#distancesInput').val(editStationParmas.stationRouteDistances);
+				// 线路版本号
+				$('#versionsInput').val(editStationParmas.stationRouteVersions);
 				// 描述/说明
 				$('#descriptionsTextarea').val(editStationParmas.stationRouteDescriptions);
 			},
@@ -121,7 +121,7 @@
 <script src="/pages/base/timesmodel/js/base-fun.js"></script>
 <script src="/pages/base/timesmodel/js/v2/ParameterObj.js"></script>
 <script src="/pages/base/timesmodel/js/v2/core/InternalBcObj.js"></script>
-<script src="/pages/base/timesmodel/js/v2/core/InternalGroupBcObj.js"></script>
+<script src="/pages/base/timesmodel/js/v2/core/InternalGroupObj.js"></script>
 <script src="/pages/base/timesmodel/js/v2/core/InternalLpObj.js"></script>
 <script src="/pages/base/timesmodel/js/v2/core/InternalScheduleObj.js"></script>
 <script src="/pages/base/timesmodel/js/v2/main_v2.js"></script>
@@ -797,44 +797,44 @@ var BaseFun = function() {
                 var temp = [];
                 temp.push(allLMapBc[0]);
                 console.log(temp);
-                return {'json':temp,'bxrcgs':null};
+                //return {'json':temp,'bxrcgs':null};
  
-                //// 第二步 纵向调整
-                //baseF.evenStartDepartSpace(allLMapBc , dataMap);
-                ////return {'json':allLMapBc,'bxrcgs':null};
-                //
-				//// 第三步 剔除首末班车以外的班次，并确认首末班车.
-				//var markArray = baseF.markFirstAndLastBusAlsoDietNotInRangeBc(allLMapBc , dataMap);
-                ////return {'json':markArray,'bxrcgs':null};
-				//// 第四步 横向调整
-				//baseF.resizeByPitStopTime(cara , markArray , dataMap);
+                // 第二步 纵向调整
+                baseF.evenStartDepartSpace(allLMapBc , dataMap);
+                //return {'json':allLMapBc,'bxrcgs':null};
+
+				// 第三步 剔除首末班车以外的班次，并确认首末班车.
+				var markArray = baseF.markFirstAndLastBusAlsoDietNotInRangeBc(allLMapBc , dataMap);
+                //return {'json':markArray,'bxrcgs':null};
+				// 第四步 横向调整
+				baseF.resizeByPitStopTime(cara , markArray , dataMap);
+                //return {'json':markArray,'bxrcgs':null};
+				/**
+				 * 第五步 把班型合理的分配到各个路牌上.
+				 *
+				 * 		 切割班型/人次/配车数 字符串 为 数组对象.
+				 *
+				 * 		 把班型分配到对应的具体路牌上.
+				 */
+				// 切割班型/人次/配车数 字符串 为 数组对象.
+				var list = baseF.getBxRcListCollection(map.bxrc);
+				// 把班型分配到对应的具体路牌上.
+				baseF.bxAlloTotLp(list,cara);
                 ////return {'json':markArray,'bxrcgs':null};
-				///**
-				// * 第五步 把班型合理的分配到各个路牌上.
-				// *
-				// * 		 切割班型/人次/配车数 字符串 为 数组对象.
-				// *
-				// * 		 把班型分配到对应的具体路牌上.
-				// */
-				//// 切割班型/人次/配车数 字符串 为 数组对象.
-				//var list = baseF.getBxRcListCollection(map.bxrc);
-				//// 把班型分配到对应的具体路牌上.
-				//baseF.bxAlloTotLp(list,cara);
-                //////return {'json':markArray,'bxrcgs':null};
-                ////
-                ////
-				//// 第六步 抽车来满足工时.
-				//var tempA = baseF.abstractCar(list , markArray , cara , saa , dataMap , map);
-				////return {'json':tempA,'bxrcgs':null};
-				//// 第七步 确定吃饭时间.
-                //if (map.cfdd) { // NEW，没有选择吃饭地点，不设定吃饭班次
-                 //   baseF.markeEatTime(list , tempA , cara , saa , dataMap ,map);
-                //}
-				//baseF.resizeByPitStopTime(cara , tempA , dataMap);
-				//baseF.updfcno01(tempA,0);
-                ////return {'json':tempA,'bxrcgs':null};
-				//// 确定进出场、早晚例保时间.并返回班次数组集合
-				//return {'json':baseF.addInOutFieldBc(cara,tempA,dataMap,saa,map),'bxrcgs':null};
+                //
+                //
+				// 第六步 抽车来满足工时.
+				var tempA = baseF.abstractCar(list , markArray , cara , saa , dataMap , map);
+				//return {'json':tempA,'bxrcgs':null};
+				// 第七步 确定吃饭时间.
+                if (map.cfdd) { // NEW，没有选择吃饭地点，不设定吃饭班次
+                    baseF.markeEatTime(list , tempA , cara , saa , dataMap ,map);
+                }
+				baseF.resizeByPitStopTime(cara , tempA , dataMap);
+				baseF.updfcno01(tempA,0);
+                //return {'json':tempA,'bxrcgs':null};
+				// 确定进出场、早晚例保时间.并返回班次数组集合
+				return {'json':baseF.addInOutFieldBc(cara,tempA,dataMap,saa,map),'bxrcgs':null};
 			},
  
 			markeEatTime : function(list , markArray , cara , saa , dataMap ,map) {
 /**
  * 内部班次对象。
- * @constructor
+ * @param lpObj 内部路牌对象
+ * @param groupObj 内部圈对象
+ * @param otherParamObj 其他参数对象
+ * @constructor InternalBcObj
  */
 var InternalBcObj = function(
-    bcType, // 班次类型（normal，in，out等）
-    isUp, // boolean是否上下行
-    lp, // 路牌标识符
-    fcno, // 发车顺序号
-    fcTimeObj, // 发车时间对象
-    bclc, // 班次里程
-    bcsj, // 班次历时
-    arrtime, // 到达时间对象
-    stoptime, // 停站时间
-    tccid, // 停车场id
-    ttinfoid, // 时刻表id
-    xl, // 线路id
-    qdzid, // 起点站id
-    zdzid // 终点站id
+    lpObj, // InternalLpObj路牌对象
+    otherParamObj // 班次其他参数对象
 ) {
+    // 简单验证
+    if (!lpObj) {
+        throw "new InternalBcObj 路牌对象为空";
+    }
+    if (!otherParamObj) {
+        throw "new InternalBcObj 其他参数对象为空"
+    }
+
+    // 内部重要属性
+    this._$$_internal_lp_obj = lpObj; // 班次所属的路牌对象（横轴）
+    // 之后会设定
+    this._$$_internal_group_obj; // 班次所属的圈对象（纵轴）
+
     // 属性重新复制一遍，加前缀 _$_ 表示内部属性，不要直接访问k
     // 外部函数使用 prototype 方式
-    this._$_bcType = bcType;
-    this._$_isUp = isUp;
-    this._$_lp = lp;
-    this._$_fcno = fcno;
-    this._$_fcsjObj = moment(fcTimeObj);
-    this._$_bclc = bclc;
-    this._$_bcsj = bcsj;
-    this._$_arrtime = arrtime;
-    this._$_stoptime = stoptime;
-    this._$_tccid = tccid;
-    this._$_ttinfoid = ttinfoid;
-    this._$_xlid = xl;
-    this._$_qdzid = qdzid;
-    this._$_zdzid = zdzid;
+    this._$_bcType = otherParamObj.bcType; // 班次类型（normal，in，out等）
+    this._$_isUp = otherParamObj.isUp; // boolean是否上下行
+    this._$_fcno = otherParamObj.fcno; // 发车顺序号
+    this._$_fcsjObj = moment(otherParamObj.fcTimeObj); // 发车时间对象
+    this._$_bclc = otherParamObj.bclc; // 班次里程
+    this._$_bcsj = otherParamObj.bcsj; // 班次历时
+    this._$_arrtime = otherParamObj.arrtime; // 到达时间对象
+    this._$_stoptime = otherParamObj.stoptime; // 停站时间
+    this._$_tccid = otherParamObj.tccid; // 停车场id
+    this._$_ttinfoid = otherParamObj.ttinfoid; // 时刻表id
+    this._$_xlid = otherParamObj.xl; // 线路id
+    this._$_qdzid = otherParamObj.qdzid; // 起点站id
+    this._$_zdzid = otherParamObj.zdzid; // 终点站id
  
 };
  
+//------------------- get/set 方法 -------------------//
+
+/**
+ * 设置路牌对象。
+ * @param lpObj InternalLpObj路牌对象
+ */
+InternalBcObj.prototype.setLp = function(lpObj) {
+    this._$$_internal_lp_obj = lpObj;
+};
 /**
- * 设置路牌标号。
- * @param lpNo
+ * 设置圈对象。
+ * @param groupObj
  */
-InternalBcObj.prototype.setLp = function(lpNo) {
-    this._$_lp = lpNo;
+InternalBcObj.prototype.setGroup = function(groupObj) {
+    this._$$_internal_group_obj = groupObj;
 };
  
 /**
@@ -80,16 +92,19 @@ InternalBcObj.prototype.getBcTime = function() {
 InternalBcObj.prototype.getStopTime = function() {
     return this._$_stoptime;
 };
+
+//---------------------- 其他方法 -------------------------//
+
 /**
  * 转换成显示用班次对象。
  * @returns {{}}
  */
 InternalBcObj.prototype.toGanttBcObj = function() {
     var _bcObj = {
-        parent: this._$_lp,
-        lpNo: this._$_lp,
+        parent: this._$$_internal_lp_obj.getLpNo(),
+        lpNo: this._$$_internal_lp_obj.getLpNo(),
         lp: null,
-        lpName: this._$_lp,
+        lpName: this._$$_internal_lp_obj.getLpName(),
         lpType: '普通路牌',
         bcType: this._$_bcType,
         fcno: this._$_fcno,
@@ -4,11 +4,15 @@
  * 一定是从第1圈开始，第0圈表示中标线的第一个班次，是下行班次，则第0圈的上行班次就是空的。
  * @constructor
  */
-var InternalGroupBcObj = function(
+var InternalGroupObj = function(
+    lpObj, // 所属 InternalLpObj 路牌对象
     isUp, // 是否上行，就是圈以上行开始，还是下行开始
     bc1, // 第一班次
     bc2 // 第二个班次
 ) {
+    // 所属内部路牌对象
+    this._$$_internal_lp_obj = lpObj;
+
     this._$_isUp = isUp;
  
     this._$_internalBcArray = [];
@@ -16,26 +20,39 @@ var InternalGroupBcObj = function(
     this._$_internalBcArray.push(bc2);
 };
  
-InternalGroupBcObj.prototype.getBc1 = function() {
+//------------------------ get/set 方法 ------------------------//
+
+InternalGroupObj.prototype.getBc1 = function() {
     return this._$_internalBcArray[0];
 };
-InternalGroupBcObj.prototype.getBc2 = function() {
+InternalGroupObj.prototype.getBc2 = function() {
     return this._$_internalBcArray[1];
 };
  
-InternalGroupBcObj.prototype.setBc1 = function(bc) {
+InternalGroupObj.prototype.setBc1 = function(bc) {
     this._$_internalBcArray[0] = bc;
 };
-InternalGroupBcObj.prototype.setBc2 = function(bc) {
+InternalGroupObj.prototype.removeBc1 = function() {
+    this._$_internalBcArray[0] = undefined;
+};
+InternalGroupObj.prototype.setBc2 = function(bc) {
     this._$_internalBcArray[1] = bc;
 };
-InternalGroupBcObj.prototype.setLp = function(lp) {
+InternalGroupObj.prototype.removeBc2 = function() {
+    this._$_internalBcArray[1] = undefined;
+};
+InternalGroupObj.prototype.setLp = function(lpObj) {
+    this._$$_internal_lp_obj = lpObj; // InternalLpObj 对象
+
     var bc1 = this._$_internalBcArray[0];
     var bc2 = this._$_internalBcArray[1];
     if (bc1) {
-        bc1.setLp(lp);
+        bc1.setLp(lpObj);
     }
     if (bc2) {
-        bc2.setLp(lp);
+        bc2.setLp(lpObj);
     }
-};
 \ No newline at end of file
+};
+
+
+