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

into pudong

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control
into pudong
廖磊
2 parents a7da449c 73d9e104
Showing 53 changed files with 2566 additions and 189 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/controller/geo_data/GeoDataController.java
src/main/java/com/bsth/data/car_out_info/CarOutInfoHandler.java
src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java
src/main/java/com/bsth/data/line_version/EnableRouteVersionHandler.java
src/main/java/com/bsth/data/line_version/dto/EvSectionRoute.java
src/main/java/com/bsth/data/line_version/dto/EvStationRoute.java
src/main/java/com/bsth/data/line_version/thread/FixedEnableVerionsThread.java
src/main/java/com/bsth/data/schedule/ScheduleComparator.java
src/main/java/com/bsth/data/schedule/late_adjust/ScheduleLateThread.java
src/main/java/com/bsth/service/geo_data/GeoDataService.java
src/main/java/com/bsth/service/geo_data/impl/GeoDataServiceImpl.java
src/main/java/com/bsth/service/geo_data/impl/dto/CascadeSaveRoad.java
src/main/java/com/bsth/service/geo_data/impl/dto/CascadeSaveStation.java
src/main/java/com/bsth/service/geo_data/impl/SaveRoadRouteDTO.java → src/main/java/com/bsth/service/geo_data/impl/dto/SaveRoadRouteDTO.java
src/main/java/com/bsth/service/geo_data/impl/SaveStationRouteDTO.java → src/main/java/com/bsth/service/geo_data/impl/dto/SaveStationRouteDTO.java
src/main/resources/static/pages/base/carpark/add.html
src/main/resources/static/pages/base/carpark/js/add-form-wizard.js
src/main/resources/static/pages/base/company/add.html
src/main/resources/static/pages/base/company/js/comp-add-form.js
 package com.bsth;
 import com.bsth.data.BasicData;
-import com.bsth.data.LineVersionsData;
 import com.bsth.data.ThreadMonotor;
 import com.bsth.data.car_out_info.UpdateDBThread;
 import com.bsth.data.directive.DirectivesPstThread;
 import com.bsth.data.forecast.SampleTimeDataLoader;
 import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread;
 import com.bsth.data.gpsdata_v2.thread.OfflineMonitorThread;
+import com.bsth.data.line_version.thread.FixedEnableVerionsThread;
 import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.msg_queue.WebSocketPushQueue;
 import com.bsth.data.safe_driv.SafeDrivDataLoadThread;
@@ -73,8 +73,11 @@ public class XDApplication implements CommandLineRunner {
     @Autowired
     OfflineMonitorThread offlineMonitorThread;
+    //@Autowired
+    //LineVersionsData lineVersionsData;
+
     @Autowired
-    LineVersionsData lineVersionsData;
+    FixedEnableVerionsThread fixedEnableVerionsThread;
     @Autowired
     SafeDrivDataLoadThread safeDrivDataLoadThread;
@@ -126,7 +129,7 @@ public class XDApplication implements CommandLineRunner {
         //实际排班更新线程
         //sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
         //sexec.scheduleWithFixedDelay(autoExecScanThread, 100, 50, TimeUnit.SECONDS);//班次自动执行
-        WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的
+        //WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的
         //实际排班延迟入库线程
         //sexec.scheduleWithFixedDelay(schedulePstThread, 60, 15, TimeUnit.SECONDS);
         //班次修正日志延迟入库
@@ -138,6 +141,8 @@ public class XDApplication implements CommandLineRunner {
         //安全驾驶
         //sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 40, 30, TimeUnit.SECONDS);
+
+        //sexec.scheduleWithFixedDelay(fixedEnableVerionsThread, 20, 60 * 2 , TimeUnit.SECONDS);
     }
     public void prodInit(){
@@ -175,6 +180,9 @@ public class XDApplication implements CommandLineRunner {
         sexec.scheduleAtFixedRate(calcOilThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
         //线路版本更新
-        sexec.scheduleWithFixedDelay(lineVersionsData, 60 * 5, 60 * 15, TimeUnit.SECONDS);
+        //sexec.scheduleWithFixedDelay(lineVersionsData, 60 * 5, 60 * 15, TimeUnit.SECONDS);
+
+        //线路版本更新
+        sexec.scheduleWithFixedDelay(fixedEnableVerionsThread, 60 * 4, 60 * 2 , TimeUnit.SECONDS);
     }
 }
@@ -22,14 +22,14 @@ public class GeoDataController {
     GeoDataService geoDataService;
     @RequestMapping("findGeoStations")
-    public Map<String, Object> findGeoStations(@RequestParam String lineCode){
-        return geoDataService.findGeoStations(lineCode);
+    public Map<String, Object> findGeoStations(@RequestParam String lineCode, Integer version){
+        return geoDataService.findGeoStations(lineCode, version);
     }
     @RequestMapping("findGeoRoad")
-    public Map<String, Object> findGeoRoad(@RequestParam String lineCode){
-        return geoDataService.findGeoRoad(lineCode);
+    public Map<String, Object> findGeoRoad(@RequestParam String lineCode,Integer version){
+        return geoDataService.findGeoRoad(lineCode, version);
     }
     @RequestMapping(value = "updateBufferInfo",method = RequestMethod.POST)
@@ -73,4 +73,24 @@ public class GeoDataController {
     public Map<String, Object> findVersionInfo(@RequestParam String lineCode){
         return geoDataService.findVersionInfo(lineCode);
     }
+
+    @RequestMapping(value = "addNewLineVersion",method = RequestMethod.POST)
+    public Map<String, Object> addNewLineVersion(@RequestParam Map<String, Object> map){
+        return geoDataService.addNewLineVersion(map);
+    }
+
+    @RequestMapping(value = "deleteLineVersion",method = RequestMethod.POST)
+    public Map<String, Object> deleteLineVersion(@RequestParam String lineCode,@RequestParam int version){
+        return geoDataService.deleteLineVersion(lineCode, version);
+    }
+
+    @RequestMapping("findFutureVersion")
+    public Map<String, Object> findFutureVersion(@RequestParam String lineCode){
+        return  geoDataService.findFutureVersion(lineCode);
+    }
+
+    @RequestMapping(value = "addEnableInfo",method = RequestMethod.POST)
+    public Map<String, Object> addEnableInfo(@RequestParam String lineCode,@RequestParam int versions, @RequestParam String startDate){
+        return geoDataService.addEnableInfo(lineCode, versions, startDate);
+    }
 }
 \ No newline at end of file
@@ -45,7 +45,7 @@ public class CarOutInfoHandler {
         bcTypeMap.put("ldks", "两点间空驶");
     }
-    private static ScheduleComparator.DFSJ schDFSJComparator = new ScheduleComparator.DFSJ();
+    private static ScheduleComparator.DFSJ2 schDFSJComparator = new ScheduleComparator.DFSJ2();
     @Autowired
     JdbcTemplate jdbcTemplate;
@@ -75,36 +75,13 @@ public class DataHandleProcess {
             List<Future> fRs = new ArrayList<>(ks.size());
             for (Integer index : ks) {
-                fRs.add(threadPool.submit(new SignalHandleThread(dataListMap.get(index), count)));
+                threadPool.submit(new SignalHandleThread(dataListMap.get(index), count));
             }
-            //按线路分组gps
-            /*ArrayListMultimap multimap = ArrayListMultimap.create();
-            for (GpsEntity gps : list) {
-                multimap.put(gps.getLineId(), gps);
-            }
-
-            Set<String> ks = multimap.keySet();
-
-            logger.info("analyse gps size: " + list.size() + ", ks: " + ks.size());
-            count = new CountDownLatch(ks.size());
-
-            for (String lineCode : ks) {
-                threadPool.execute(new SignalHandleThread(multimap.get(lineCode), count));
-            }*/
             //等待子线程结束
             count.await();
-            for (Future f : fRs) {
-                try {
-                    f.get();
-                } catch (InterruptedException e) {
-                } catch (ExecutionException e) {
-                    logger.error(e.getCause().getMessage());
-                }
-            }
-
             //加入实时gps对照
             for (GpsEntity gps : list)
                 gpsRealData.put(gps);
+package com.bsth.data.line_version;
+
+import com.bsth.data.line_version.dto.EvSectionRoute;
+import com.bsth.data.line_version.dto.EvStationRoute;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.namedparam.BeanPropertySqlParameterSource;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 启用线路路由版本
+ * Created by panzhao on 2017/12/28.
+ */
+@Component
+public class EnableRouteVersionHandler {
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    @Autowired
+    NamedParameterJdbcTemplate namedParameterJdbcTemplate;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    public void enable(String lineCode, int version){
+        //编程式事务
+        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
+        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
+        TransactionStatus status = tran.getTransaction(def);
+
+
+        try{
+            enableStation(lineCode, version);
+            enableRoad(lineCode, version);
+
+            //将当前版本变为历史版本
+            String sql = "update bsth_c_line_versions set status=0, end_date=SYSDATE(),update_date=SYSDATE() where line_code=" + lineCode + " and status=1";
+            jdbcTemplate.update(sql);
+            //将待更新版本变为启用版本
+            sql = "update bsth_c_line_versions set status=1,update_date=SYSDATE() where line_code=" + lineCode + " and  versions="+version;
+            jdbcTemplate.update(sql);
+
+            tran.commit(status);
+        }catch (Exception e){
+            tran.rollback(status);
+            logger.error("", e);
+        }
+    }
+
+    /**
+     * 启用新版本站点
+     * @param lineCode
+     * @param version
+     */
+    public void enableStation(String lineCode, int version){
+        //删除当前站点路由表数据
+        String sql = "delete from bsth_c_stationroute where line_code=" + lineCode;
+        jdbcTemplate.update(sql);
+
+        //将新版本数据插入当前表
+        sql = "select * from bsth_c_ls_stationroute where line_code=" + lineCode + " and versions=" + version;
+        List<EvStationRoute> list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(EvStationRoute.class));
+
+        List<BeanPropertySqlParameterSource> sourceList = new ArrayList<>();
+        for(EvStationRoute s : list){
+            sourceList.add(new BeanPropertySqlParameterSource(s));
+        }
+
+        sql = "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_date,update_date) " +
+                " values(:id,:line,:station,:stationName,:stationRouteCode,:lineCode,:stationCode,:stationMark,:outStationNmber,:directions,:distances,:toTime,:firstTime,:endTime,:descriptions,:destroy,:versions,SYSDATE(),SYSDATE())";
+        BeanPropertySqlParameterSource[] beanSources  =  sourceList.toArray(new BeanPropertySqlParameterSource[sourceList.size()]);
+        namedParameterJdbcTemplate.batchUpdate(sql, beanSources);
+    }
+
+    /**
+     * 启用新版本路段
+     * @param lineCode
+     * @param version
+     */
+    public void enableRoad(String lineCode, int version){
+        //删除当前路段路由表数据
+        String sql = "delete from bsth_c_sectionroute where line_code=" + lineCode;
+        jdbcTemplate.update(sql);
+
+        //将新版本数据插入当前表
+        sql = "select * from bsth_c_ls_sectionroute where line_code=" + lineCode + " and versions=" + version;
+        List<EvSectionRoute> list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(EvSectionRoute.class));
+
+        List<BeanPropertySqlParameterSource> sourceList = new ArrayList<>();
+        for(EvSectionRoute s : list){
+            sourceList.add(new BeanPropertySqlParameterSource(s));
+        }
+
+        sql = "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(:id,:lineCode,:sectionCode,:sectionrouteCode,:directions,:line,:section,:descriptions,:createBy,SYSDATE(),:updateBy,SYSDATE(),:versions,:destroy,:isRoadeSpeed)";
+        BeanPropertySqlParameterSource[] beanSources  =  sourceList.toArray(new BeanPropertySqlParameterSource[sourceList.size()]);
+        namedParameterJdbcTemplate.batchUpdate(sql, beanSources);
+    }
+}
+package com.bsth.data.line_version.dto;
+
+import java.util.Date;
+
+/**
+ * Created by panzhao on 2017/12/28.
+ */
+public class EvSectionRoute {
+
+
+    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;
+
+    // 创建日期
+    private Date createDate;
+
+    // 修改日期
+    private Date updateDate;
+
+    // 路段信息
+    private Integer section;
+
+    // 线路信息
+    private Integer line;
+
+    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 Integer getIsRoadeSpeed() {
+        return isRoadeSpeed;
+    }
+
+    public void setIsRoadeSpeed(Integer isRoadeSpeed) {
+        this.isRoadeSpeed = isRoadeSpeed;
+    }
+
+    public String getDescriptions() {
+        return descriptions;
+    }
+
+    public void setDescriptions(String descriptions) {
+        this.descriptions = descriptions;
+    }
+
+    public Integer getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(Integer createBy) {
+        this.createBy = createBy;
+    }
+
+    public Integer getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(Integer updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public Integer getSection() {
+        return section;
+    }
+
+    public void setSection(Integer section) {
+        this.section = section;
+    }
+
+    public Integer getLine() {
+        return line;
+    }
+
+    public void setLine(Integer line) {
+        this.line = line;
+    }
+}
+package com.bsth.data.line_version.dto;
+
+import java.util.Date;
+
+/**
+ * Created by panzhao on 2017/12/28.
+ */
+public class EvStationRoute {
+    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;
+
+    // 创建日期
+    private Date createDate;
+
+    // 修改日期
+    private Date updateDate;
+
+    // 站点信息
+    private Integer station;
+
+    // 线路信息
+    private Integer 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 Integer getStation() {
+        return station;
+    }
+
+    public void setStation(Integer station) {
+        this.station = station;
+    }
+
+    public Integer getLine() {
+        return line;
+    }
+
+    public void setLine(Integer line) {
+        this.line = line;
+    }
+}
+package com.bsth.data.line_version.thread;
+
+import com.bsth.data.line_version.EnableRouteVersionHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/12/28.
+ */
+@Component
+public class FixedEnableVerionsThread extends Thread{
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    EnableRouteVersionHandler enableRouteVersionHandler;
+
+    @Override
+    public void run() {
+        try{
+
+            String sql = "select * from bsth_c_line_versions where status=2 and start_date<=SYSDATE()";
+
+            List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
+            if(list.size() == 0)
+                return;
+
+            String lineCode;
+            int version;
+
+            for(Map<String, Object> map : list){
+                lineCode = map.get("line_code").toString();
+                version = Integer.parseInt(map.get("versions").toString());
+
+                enableRouteVersionHandler.enable(lineCode, version);
+            }
+        }catch (Exception e){
+            logger.error("", e);
+        }
+    }
+}
 package com.bsth.data.schedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -23,6 +25,7 @@ public class ScheduleComparator {
 		}
 	}*/
+
 	static Map<String, Integer> bcTypeOrderMap = new HashMap<>();
 	static{
@@ -50,10 +53,44 @@ public class ScheduleComparator {
 	public static class DFSJ  implements Comparator<ScheduleRealInfo>{
+        static Logger logger = LoggerFactory.getLogger(DFSJ.class);
+
 		@Override
 		public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
-			int diff = (int) (s1.getDfsjT() - s2.getDfsjT());
-			return diff!=0?diff:typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
+            try{
+
+                if(!s1.getXlBm().equals(s2.getXlBm()) || !s1.getLpName().equals(s2.getLpName())){
+                    int diff = (int) (s1.getDfsjT() - s2.getDfsjT());
+                    return diff!=0?diff:typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
+                }
+                else{
+                    /**
+                     * 按时刻表发车顺序号
+                     */
+                    Integer fc1 = s1.getFcno();
+                    Integer fc2 = s2.getFcno();
+                    if(null != fc1 && null != fc2){
+                        return fc1.intValue()==fc2.intValue()?0:fc1.intValue()-fc2.intValue();
+                    }
+                    else{
+                        int diff = (int) (s1.getDfsjT() - s2.getDfsjT());
+                        return diff!=0?diff:typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
+                    }
+                }
+            }catch (Exception e){
+                logger.error("排序异常", e);
+                return s1.getDfsjT() - s2.getDfsjT() > 0?1:-1;
+            }
 		}
 	}
+
+    public static class DFSJ2  implements Comparator<ScheduleRealInfo>{
+
+
+        @Override
+        public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
+            int diff = (int) (s1.getDfsjT() - s2.getDfsjT());
+            return diff!=0?diff:typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
+        }
+    }
 }
@@ -35,7 +35,7 @@ public class ScheduleLateThread extends Thread{
 	Logger logger = LoggerFactory.getLogger(this.getClass());
-	private static Comparator<ScheduleRealInfo> cpm = new ScheduleComparator.DFSJ();
+	private static Comparator<ScheduleRealInfo> cpm = new ScheduleComparator.DFSJ2();
 	@Override
 	public void run() {
@@ -11,10 +11,10 @@ import java.util.Map;
 public interface GeoDataService {
-    Map<String, Object> findGeoStations(String lineCode);
+    Map<String, Object> findGeoStations(String lineCode, Integer version);
-    Map<String, Object> findGeoRoad(String lineCode);
+    Map<String, Object> findGeoRoad(String lineCode,Integer version);
     Map<String, Object> updateBufferInfo(GeoStation station);
@@ -31,4 +31,12 @@ public interface GeoDataService {
     Map<String,Object> addNewRoadRoute(String lineCode, int upDown, int versions, String sectionName,String crosesRoad, String coords, int prevRouteId);
     Map<String,Object> findVersionInfo(String lineCode);
+
+    Map<String,Object> addNewLineVersion(Map<String, Object> map);
+
+    Map<String,Object> deleteLineVersion(String lineCode, int version);
+
+    Map<String,Object> findFutureVersion(String lineCode);
+
+    Map<String,Object> addEnableInfo(String lineCode, int version, String enableTime);
 }
 package com.bsth.service.geo_data.impl;
 import com.bsth.common.ResponseCode;
+import com.bsth.entity.LineVersions;
 import com.bsth.entity.geo_data.GeoLineVersionInfo;
 import com.bsth.entity.geo_data.GeoRoad;
 import com.bsth.entity.geo_data.GeoStation;
 import com.bsth.service.geo_data.GeoDataService;
+import com.bsth.service.geo_data.impl.dto.CascadeSaveRoad;
+import com.bsth.service.geo_data.impl.dto.CascadeSaveStation;
+import com.bsth.service.geo_data.impl.dto.SaveRoadRouteDTO;
+import com.bsth.service.geo_data.impl.dto.SaveStationRouteDTO;
 import com.bsth.util.GetUIDAndCode;
 import com.bsth.util.TransGPS;
 import com.google.common.base.Splitter;
@@ -22,6 +27,7 @@ import org.springframework.transaction.support.DefaultTransactionDefinition;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 /**
@@ -36,11 +42,20 @@ public class GeoDataServiceImpl implements GeoDataService {
     Logger logger = LoggerFactory.getLogger(this.getClass());
     @Override
-    public Map<String, Object> findGeoStations(String lineCode) {
+    public Map<String, Object> findGeoStations(String lineCode, Integer version) {
         Map<String, Object> map = new HashMap();
         try {
-            String sql = "select t1.*,t2.g_lonx,g_laty,ST_AsText(g_polygon_grid) as g_polygon_grid,radius,shapes_type from (select id,station_name,station_route_code,line_code,station_code,station_mark,versions,directions from bsth_c_ls_stationroute where line=" + lineCode + " and destroy=0 and versions in (select DISTINCT versions from bsth_c_stationroute where line=" + lineCode + " and destroy=0)) t1 LEFT JOIN bsth_c_station t2 on t1.station_code=t2.station_cod";
+
+            String sql = "select versions from bsth_c_line_versions where line='"+lineCode+"' and status=1";
+            //当前使用的线路版本
+            Integer currentVersion = jdbcTemplate.queryForObject(sql, Integer.class);
+
+
+            if(null == version)
+                version = currentVersion;
+
+            sql = "select t1.*,t2.g_lonx,g_laty,ST_AsText(g_polygon_grid) as g_polygon_grid,radius,shapes_type from (select id,station_name,station_route_code,line_code,station_code,station_mark,versions,directions from bsth_c_ls_stationroute where line=" + lineCode + " and destroy=0 and versions="+version+") t1 LEFT JOIN bsth_c_station t2 on t1.station_code=t2.station_cod";
             List<GeoStation> list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(GeoStation.class));
@@ -51,6 +66,8 @@ public class GeoDataServiceImpl implements GeoDataService {
             }
             map.put("status", ResponseCode.SUCCESS);
             map.put("list", list);
+            map.put("currentVersion", currentVersion);
+            map.put("editVersion", version);
         } catch (Exception e) {
             logger.error("", e);
             map.put("status", ResponseCode.ERROR);
@@ -60,10 +77,20 @@ public class GeoDataServiceImpl implements GeoDataService {
     }
     @Override
-    public Map<String, Object> findGeoRoad(String lineCode) {
+    public Map<String, Object> findGeoRoad(String lineCode,Integer version) {
         Map<String, Object> map = new HashMap();
         try {
-            String sql = "select t1.*,t2.section_name,t2.croses_road,ST_AsText(t2.gsection_vector) as gsection_vector from (select id,sectionroute_code,directions,line_code,section_code,versions from bsth_c_ls_sectionroute where line=" + lineCode + " and destroy=0 and versions in (select DISTINCT versions from bsth_c_sectionroute where line=" + lineCode + " and destroy=0)) t1 LEFT JOIN bsth_c_section t2 on t1.section_code=t2.section_code";
+
+            String sql = "select versions from bsth_c_line_versions where line='"+lineCode+"' and status=1";
+            //当前使用的线路版本
+            Integer currentVersion = jdbcTemplate.queryForObject(sql, Integer.class);
+
+
+            if(null == version)
+                version = currentVersion;
+
+
+            sql = "select t1.*,t2.section_name,t2.croses_road,ST_AsText(t2.gsection_vector) as gsection_vector from (select id,sectionroute_code,directions,line_code,section_code,versions from bsth_c_ls_sectionroute where line=" + lineCode + " and destroy=0 and versions="+version+") t1 LEFT JOIN bsth_c_section t2 on t1.section_code=t2.section_code";
             List<GeoRoad> list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(GeoRoad.class));
@@ -169,7 +196,7 @@ public class GeoDataServiceImpl implements GeoDataService {
     }
     @Override
-    public Map<String, Object> addNewRoadRoute(String lineCode, int upDown, int versions, String sectionName,String crosesRoad, String coords, int prevRouteId) {
+    public Map<String, Object> addNewRoadRoute(String lineCode, int upDown, int versions, String sectionName, String crosesRoad, String coords, int prevRouteId) {
         Map<String, Object> rs = new HashMap<>();
         //编程式事务
@@ -178,7 +205,7 @@ public class GeoDataServiceImpl implements GeoDataService {
         def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
         TransactionStatus status = tran.getTransaction(def);
         try {
-            //根据站点编码，查询站点ID
+            //根据线路编码，查询线路ID
             int lineId = jdbcTemplate.queryForObject("select id from bsth_c_line where line_code=" + lineCode, Integer.class);
             String sql = "select * from bsth_c_ls_sectionroute where line_code='" + lineCode + "' and line=" + lineId + " and directions=" + upDown + " and destroy=0 and versions=" + versions;
@@ -192,7 +219,7 @@ public class GeoDataServiceImpl implements GeoDataService {
             String bdCooed = "LINESTRING(" + coords + ")";
             //insert 路段
             sql = "insert into bsth_c_section(id, section_code, section_name, croses_road, bsection_vector, gsection_vector, create_date, update_date, versions) " +
-                    " values(?,?,?,?,ST_GeomFromText('"+bdCooed+"'),ST_GeomFromText('"+wgsCoord+"'),sysdate(),sysdate(),?)";
+                    " values(?,?,?,?,ST_GeomFromText('" + bdCooed + "'),ST_GeomFromText('" + wgsCoord + "'),sysdate(),sysdate(),?)";
             jdbcTemplate.update(sql, sCode, sCode, sectionName, crosesRoad, 1);
@@ -269,6 +296,7 @@ public class GeoDataServiceImpl implements GeoDataService {
     /**
      * 获取线路版本信息
+     *
      * @param lineCode
      * @return
      */
@@ -277,10 +305,10 @@ public class GeoDataServiceImpl implements GeoDataService {
         Map<String, Object> rs = new HashMap<>();
         try {
-            String sql = "select t1.*,t2.name as line_name from bsth_c_line_versions t1 LEFT JOIN bsth_c_line t2 on t1.line_code=t2.line_code where t1.line_code='"+lineCode+"'";
+            String sql = "select t1.*,t2.name as line_name from bsth_c_line_versions t1 LEFT JOIN bsth_c_line t2 on t1.line_code=t2.line_code where t1.line_code='" + lineCode + "'";
             List<GeoLineVersionInfo> list =
-            jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(GeoLineVersionInfo.class));
+                    jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(GeoLineVersionInfo.class));
             rs.put("list", list);
             rs.put("status", ResponseCode.SUCCESS);
@@ -293,6 +321,326 @@ public class GeoDataServiceImpl implements GeoDataService {
     }
     @Override
+    public Map<String, Object> addNewLineVersion(Map<String, Object> map) {
+        Map<String, Object> rs = new HashMap<>();
+
+        //编程式事务
+        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
+        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
+        TransactionStatus status = tran.getTransaction(def);
+        try {
+
+            String lineCode = map.get("lineCode").toString();
+            String remark = map.get("remark").toString();
+            String name = map.get("name").toString();
+            Date startDate = new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(map.get("startDate").toString());
+            int extendsVersion = Integer.parseInt(map.get("extendsVersion").toString());
+
+            if(startDate.getTime() - System.currentTimeMillis() < 1000 * 60 * 3){
+                rs.put("status", ResponseCode.ERROR);
+                rs.put("msg", "启用时间最少需要晚于当前服务器时间3分钟！");
+                return rs;
+            }
+
+            int nameCount = jdbcTemplate.queryForObject("select count(*) from bsth_c_line_versions where line_code=" + lineCode + " and name='"+name+"'", Integer.class);
+            if(nameCount > 0){
+                rs.put("status", ResponseCode.ERROR);
+                rs.put("msg", "你不能使用一个已经存在的版本名称！！");
+                return rs;
+            }
+
+            //当前最大的版本号
+            int maxVersion = jdbcTemplate.queryForObject("select max(versions) as versions from bsth_c_line_versions where line_code=" + lineCode, Integer.class);
+            Date d = new Date();
+
+            //根据线路编码，查询线路ID
+            int lineId = jdbcTemplate.queryForObject("select id from bsth_c_line where line_code=" + lineCode, Integer.class);
+
+            maxVersion += 1;
+            LineVersions lVersion = new LineVersions();
+            lVersion.setName(name);
+            lVersion.setVersions(maxVersion);
+            lVersion.setRemark(remark);
+            lVersion.setStartDate(startDate);
+            lVersion.setStatus(2);
+            lVersion.setCreateDate(d);
+            lVersion.setUpdateDate(d);
+            lVersion.setLineCode(lineCode);
+
+            //如果有待启用的版本，设置为历史版本
+            jdbcTemplate.update("update bsth_c_line_versions set `status`=0, start_date=null,end_date=null where line_code='"+lineCode+"' and `status`=2");
+
+            //入库线路版本
+            jdbcTemplate.update("insert into bsth_c_line_versions(name, line, line_code, versions, start_date, create_date, update_date, remark,status, isupdate) " +
+                            " values(?,?,?,?,?,?,?,?,?,?)", lVersion.getName(), lineId, lVersion.getLineCode()
+                    , lVersion.getVersions(), lVersion.getStartDate(), lVersion.getCreateDate(), lVersion.getUpdateDate(), lVersion.getRemark(), lVersion.getStatus(), lVersion.getIsupdate());
+
+            if (extendsVersion != -1) {
+                //复制站点信息
+                String sql = "SELECT t1.id AS route_id,t1.line,t1.directions,t1.station,t1.station_name,t1.station_route_code,t1.line_code,t1.station_code,t1.station_mark,t1.distances,t1.to_time,t2.id AS station_id,t2.db_type,t2.b_jwpoints,t2.g_lonx,t2.g_laty,t2.radius,ST_AsText(t2.g_polygon_grid) as g_polygon_grid,t2.shapes_type FROM bsth_c_ls_stationroute t1 LEFT JOIN bsth_c_station t2 ON t1.station_code = t2.station_cod where t1.destroy=0 and t1.line_code='" + lineCode + "' and t1.versions="+extendsVersion+" order by t1.directions, t1.station_route_code";
+                List<CascadeSaveStation> cssList = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(CascadeSaveStation.class));
+
+                //新的站点编码
+                long sCode;
+                for (CascadeSaveStation ss : cssList) {
+                    sCode = GetUIDAndCode.getStationId();
+                    ss.setRouteId(null);
+                    ss.setStationCode(sCode + "");
+                    ss.setStation((int) sCode);
+                }
+                //入库新版本的站点 和 路由
+                batchInsertStation(cssList, maxVersion);
+
+                //复制路段信息
+                sql = "SELECT t1.id AS route_id,t1.line,t1.line_code,t1.directions,t1.section,t1.section_code,t1.sectionroute_code,t1.versions,t2.section_name,t2.croses_road,ST_AsText(t2.gsection_vector) as gsection_vector,t2.db_type,t2.speed_limit FROM bsth_c_ls_sectionroute t1 LEFT JOIN bsth_c_section t2 ON t1.section_code = t2.section_code WHERE t1.destroy = 0 AND t1.line_code = '"+lineCode+"' and t1.versions="+ extendsVersion +" ORDER BY t1.directions,t1.sectionroute_code";
+                List<CascadeSaveRoad> csrList = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(CascadeSaveRoad.class));
+                //新的路段编码
+                long cCode;
+                for(CascadeSaveRoad csr : csrList){
+                    cCode = GetUIDAndCode.getSectionId();
+                    csr.setRouteId(null);
+                    csr.setSection((int) cCode);
+                    csr.setSectionCode(cCode + "");
+                }
+                //入库新版本的路段 和 路段路由
+                batchInsertRoad(csrList, maxVersion);
+            }
+
+            tran.commit(status);
+            rs.put("newVersion", maxVersion);
+            rs.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            tran.rollback(status);
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", "服务器出现异常");
+        }
+        return rs;
+    }
+
+    /**
+     * 删除一个线路走向版本
+     * @param lineCode
+     * @param version
+     * @return
+     */
+    @Override
+    public Map<String, Object> deleteLineVersion(String lineCode, int version) {
+        Map<String, Object> rs = new HashMap<>();
+
+        //编程式事务
+        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
+        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
+        TransactionStatus status = tran.getTransaction(def);
+        try{
+            int enableVersion = jdbcTemplate.queryForObject("select versions from bsth_c_line_versions where line_code='"+lineCode+"' and `status`=1", Integer.class);
+
+            if(enableVersion==version){
+                rs.put("status", ResponseCode.ERROR);
+                rs.put("msg", "你不能删除当前正在启用的走向版本！");
+                return rs;
+            }
+            /*int versionCount = jdbcTemplate.queryForObject("select count(*) from bsth_c_line_versions where line_code='"+lineCode+"'", Integer.class);
+            if(versionCount == 1){
+                rs.put("status", ResponseCode.ERROR);
+                rs.put("msg", "线路至少要保留一个走向版本！");
+                return rs;
+            }*/
+
+           /* //要删除的站点ID（未被其他线路、版本引用的）
+            String sql = "select DISTINCT station from bsth_c_ls_stationroute where line_code='"+lineCode+"' and versions="+version+" and station not in(" +
+                            "select station from bsth_c_ls_stationroute where (line!='"+lineCode+"' or versions!="+version+") and station in (" +
+                                "select station from bsth_c_ls_stationroute where line_code='"+lineCode+"' and versions="+version +
+                        "))";
+
+            List<Integer> stationRemoves = jdbcTemplate.queryForList(sql, Integer.class);*/
+
+            //删除站点路由
+            String sql = "delete from bsth_c_ls_stationroute where line_code='"+lineCode+"' and versions=" + version;
+            jdbcTemplate.update(sql);
+
+            //删除路段路由
+            sql = "delete from bsth_c_ls_sectionroute where line_code='"+lineCode+"' and versions=" + version;
+            jdbcTemplate.update(sql);
+
+            //删除版本信息
+            sql = "delete from bsth_c_line_versions where line_code='"+lineCode+"' and versions=" + version;
+            jdbcTemplate.update(sql);
+
+            tran.commit(status);
+            rs.put("status", ResponseCode.SUCCESS);
+        }catch (Exception e){
+            tran.rollback(status);
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", "服务器出现异常");
+        }
+        return rs;
+    }
+
+    /**
+     * 获取线路的待更新版本信息
+     * @param lineCode
+     * @return
+     */
+    @Override
+    public Map<String, Object> findFutureVersion(String lineCode) {
+        Map<String, Object> rs = new HashMap();
+        try{
+            List<Map<String, Object>> list = jdbcTemplate.queryForList("select * from bsth_c_line_versions where line_code='"+lineCode+"' and `status`=2 order by start_date");
+
+            rs.put("data", list);
+            rs.put("status", ResponseCode.SUCCESS);
+        }catch (Exception e){
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", "服务器出现异常");
+        }
+        return rs;
+    }
+
+    @Override
+    public Map<String, Object> addEnableInfo(String lineCode, int version, String enableTime) {
+        Map<String, Object> rs = new HashMap();
+        try{
+            Date startDate = new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(enableTime);
+            if(startDate.getTime() - System.currentTimeMillis() < 1000 * 60 * 3){
+                rs.put("status", ResponseCode.ERROR);
+                rs.put("msg", "启用时间最少需要晚于当前服务器时间3分钟！");
+                return rs;
+            }
+
+            jdbcTemplate.update("update bsth_c_line_versions set `status`=0 where line_code="+lineCode+" and versions=" + version);
+            jdbcTemplate.update("update bsth_c_line_versions set `status`=2 ,start_date=? where line_code=? and versions=?", startDate, lineCode, version);
+
+            rs.put("status", ResponseCode.SUCCESS);
+        }catch (Exception e){
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", "服务器出现异常");
+        }
+        return rs;
+    }
+
+    /**
+     * 批量入库路段
+     * @param cssList
+     * @param version
+     */
+    private void batchInsertRoad(final List<CascadeSaveRoad> csrList, final int version){
+        final Date d = new Date();
+        jdbcTemplate.batchUpdate("insert into bsth_c_section(id, section_code, section_name, croses_road, gsection_vector, create_date, update_date, versions) " +
+                " values(?,?,?,?,ST_GeomFromText(?),?,?,?)", new BatchPreparedStatementSetter() {
+            @Override
+            public void setValues(PreparedStatement ps, int i) throws SQLException {
+                CascadeSaveRoad csr = csrList.get(i);
+                ps.setInt(1, csr.getSection());
+                ps.setString(2, csr.getSectionCode());
+                ps.setString(3, csr.getSectionName());
+                ps.setString(4, csr.getCrosesRoad());
+                ps.setString(5, csr.getGsectionVector());
+                ps.setTimestamp(6, new java.sql.Timestamp(d.getTime()));
+                ps.setTimestamp(7, new java.sql.Timestamp(d.getTime()));
+                ps.setInt(8, version);
+            }
+
+            @Override
+            public int getBatchSize() {
+                return csrList.size();
+            }
+        });
+
+        //路由
+        jdbcTemplate.batchUpdate("insert into bsth_c_ls_sectionroute(line_code, section_code, sectionroute_code, directions, line, section, create_date,update_date,versions,destroy,is_roade_speed) " +
+                " values(?,?,?,?,?,?,?,?,?,?,?)", new BatchPreparedStatementSetter() {
+            @Override
+            public void setValues(PreparedStatement ps, int i) throws SQLException {
+                CascadeSaveRoad csr = csrList.get(i);
+                ps.setString(1, csr.getLineCode());
+                ps.setString(2, csr.getSectionCode());
+                ps.setInt(3, csr.getSectionrouteCode());
+                ps.setInt(4, csr.getDirections());
+                ps.setInt(5, csr.getLine());
+                ps.setInt(6, csr.getSection());
+                ps.setTimestamp(7, new java.sql.Timestamp(d.getTime()));
+                ps.setTimestamp(8, new java.sql.Timestamp(d.getTime()));
+                ps.setInt(9, version);
+                ps.setInt(10, 0);
+                ps.setInt(11, 0);
+            }
+
+            @Override
+            public int getBatchSize() {
+                return csrList.size();
+            }
+        });
+    }
+
+    /**
+     * 批量插入站点
+     *
+     * @param cssList
+     */
+    private void batchInsertStation(final List<CascadeSaveStation> cssList, final int version) {
+        //站点
+        jdbcTemplate.batchUpdate("insert into bsth_c_station(id, station_cod, station_name, db_type, b_jwpoints, g_lonx, g_laty, destroy, radius, shapes_type, versions, g_polygon_grid) " +
+                " values(?,?,?,?,?,?,?,?,?,?,?,ST_GeomFromText(?))", new BatchPreparedStatementSetter() {
+            @Override
+            public void setValues(PreparedStatement ps, int i) throws SQLException {
+                CascadeSaveStation ss = cssList.get(i);
+                ps.setInt(1, ss.getStation());
+                ps.setString(2, ss.getStationCode());
+                ps.setString(3, ss.getStationName());
+                ps.setString(4, "b");
+                ps.setString(5, ss.getbJwpoints());
+                ps.setDouble(6, ss.getgLonx());
+                ps.setDouble(7, ss.getgLaty());
+                ps.setInt(8, 0);
+                ps.setInt(9, ss.getRadius()==null?0:ss.getRadius());
+                ps.setString(10, ss.getShapesType());
+                ps.setInt(11, version);
+                ps.setString(12, ss.getgPolygonGrid());
+            }
+
+            @Override
+            public int getBatchSize() {
+                return cssList.size();
+            }
+        });
+
+        final Date d = new Date();
+        //站点路由
+        jdbcTemplate.batchUpdate("insert into bsth_c_ls_stationroute(line, station, station_name, station_route_code, line_code, station_code, station_mark, distances, to_time, destroy, versions, create_date, update_date,directions) " +
+                " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)", new BatchPreparedStatementSetter() {
+            @Override
+            public void setValues(PreparedStatement ps, int i) throws SQLException {
+                CascadeSaveStation ss = cssList.get(i);
+                ps.setInt(1, ss.getLine());
+                ps.setInt(2, ss.getStation());
+                ps.setString(3, ss.getStationName());
+                ps.setInt(4, ss.getStationRouteCode());
+                ps.setString(5, ss.getLineCode());
+                ps.setString(6, ss.getStationCode());
+                ps.setString(7, ss.getStationMark());
+                ps.setDouble(8, ss.getDistances());
+                ps.setDouble(9, ss.getToTime());
+                ps.setInt(10, 0);
+                ps.setInt(11, version);
+                ps.setTimestamp(12, new java.sql.Timestamp(d.getTime()));
+                ps.setTimestamp(13, new java.sql.Timestamp(d.getTime()));
+                ps.setInt(14, ss.getDirections());
+            }
+
+            @Override
+            public int getBatchSize() {
+                return cssList.size();
+            }
+        });
+    }
+
+    @Override
     public Map<String, Object> addNewStationRoute(String lineCode, int upDown, int versions, String stationName, Float lat, Float lng, int prevRouteId) {
         Map<String, Object> rs = new HashMap<>();
@@ -362,6 +710,10 @@ public class GeoDataServiceImpl implements GeoDataService {
             nsr.setCreateDate(d);
             nsr.setUpdateDate(d);
             nsr.setDestroy(0);
+            if (prevRouteId == -1)
+                nsr.setStationMark("B");
+            else if(routes.size()==1)
+                nsr.setStationMark("E");
             //routes.add(sr);
@@ -370,8 +722,10 @@ public class GeoDataServiceImpl implements GeoDataService {
             for (int i = 0, size = routes.size(); i < size; i++) {
                 routes.get(i).setStationMark("Z");
             }
-            routes.get(0).setStationMark("B");
-            routes.get(routes.size() - 1).setStationMark("E");
+            if(routes.size() > 0 && prevRouteId!=-1)
+                routes.get(0).setStationMark("B");
+            if(routes.size() > 1)
+                routes.get(routes.size() - 1).setStationMark("E");
             final List<SaveStationRouteDTO> saveList = routes;
             //insert 新路由 （ID自增）
@@ -454,15 +808,68 @@ public class GeoDataServiceImpl implements GeoDataService {
     public Map<String, Object> destroyStation(GeoStation station) {
         Map<String, Object> rs = new HashMap<>();
+        //编程式事务
+        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
+        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
+        TransactionStatus status = tran.getTransaction(def);
         try {
             String sql = "update bsth_c_ls_stationroute set destroy=1 where id=?";
             jdbcTemplate.update(sql, station.getId());
+            //重新排序路由，标记mark
+            sql = "select * from bsth_c_ls_stationroute where line_code='" + station.getLineCode() + "' and directions=" + station.getDirections() + " and destroy=0 and versions=" + station.getVersions();
+            List<SaveStationRouteDTO> routes = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(SaveStationRouteDTO.class));
+            Collections.sort(routes, new StationRouteComp());
+
+            for (int i = 0, size = routes.size(); i < size; i++) {
+                routes.get(i).setStationMark("Z");
+            }
+            if(routes.size() > 0)
+                routes.get(0).setStationMark("B");
+            if(routes.size() > 1)
+                routes.get(routes.size() - 1).setStationMark("E");
+
+            final List<SaveStationRouteDTO> saveList = routes;
+            // update 原路由
+            jdbcTemplate.batchUpdate("update bsth_c_ls_stationroute set line=?,station=?,station_name=?,station_route_code=?," +
+                            "line_code=?,station_code=?,station_mark=?,distances=?,to_time=?,destroy=?,versions=?,create_date=?,update_date=?,directions=?" +
+                            " where id=?"
+                    , new BatchPreparedStatementSetter() {
+                        @Override
+                        public void setValues(PreparedStatement ps, int i) throws SQLException {
+                            SaveStationRouteDTO sr = saveList.get(i);
+                            ps.setInt(1, sr.getLine());
+                            ps.setLong(2, sr.getStation());
+                            ps.setString(3, sr.getStationName());
+                            ps.setInt(4, sr.getStationRouteCode());
+                            ps.setString(5, sr.getLineCode());
+                            ps.setString(6, sr.getStationCode());
+                            ps.setString(7, sr.getStationMark());
+                            ps.setDouble(8, sr.getDistances());
+                            ps.setDouble(9, sr.getToTime());
+                            ps.setInt(10, sr.getDestroy());
+                            ps.setInt(11, sr.getVersions());
+                            ps.setTimestamp(12, new java.sql.Timestamp(sr.getCreateDate().getTime()));
+                            ps.setTimestamp(13, new java.sql.Timestamp(sr.getUpdateDate().getTime()));
+                            ps.setInt(14, sr.getDirections());
+                            ps.setInt(15, sr.getId());
+                        }
+
+                        @Override
+                        public int getBatchSize() {
+                            return saveList.size();
+                        }
+                    });
+
+            tran.commit(status);
+
             //返回更新之后的数据
             List<GeoStation> list = findByUpdown(station.getLineCode(), station.getDirections(), station.getVersions());
             rs.put("list", list);
             rs.put("status", ResponseCode.SUCCESS);
         } catch (Exception e) {
+            tran.rollback(status);
             logger.error("", e);
             rs.put("status", ResponseCode.ERROR);
             rs.put("msg", "服务器出现异常");
+package com.bsth.service.geo_data.impl.dto;
+
+/**
+ * 级联入库的路段 和 路段路由
+ * Created by panzhao on 2017/12/25.
+ */
+public class CascadeSaveRoad {
+
+    private Integer routeId;
+
+    private Integer line;
+
+    private String lineCode;
+
+    private int directions;
+
+    private Integer section;
+
+    private String sectionCode;
+
+    private Integer sectionrouteCode;
+
+    private int versions;
+
+    private String sectionName;
+
+    private String crosesRoad;
+
+    private String gsectionVector;
+
+    private String dbType;
+
+    private Integer speedLimit;
+
+    public Integer getRouteId() {
+        return routeId;
+    }
+
+    public void setRouteId(Integer routeId) {
+        this.routeId = routeId;
+    }
+
+    public Integer getLine() {
+        return line;
+    }
+
+    public void setLine(Integer line) {
+        this.line = line;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public Integer getSection() {
+        return section;
+    }
+
+    public void setSection(Integer section) {
+        this.section = section;
+    }
+
+    public String getSectionCode() {
+        return sectionCode;
+    }
+
+    public void setSectionCode(String sectionCode) {
+        this.sectionCode = sectionCode;
+    }
+
+    public Integer getSectionrouteCode() {
+        return sectionrouteCode;
+    }
+
+    public void setSectionrouteCode(Integer sectionrouteCode) {
+        this.sectionrouteCode = sectionrouteCode;
+    }
+
+    public int getVersions() {
+        return versions;
+    }
+
+    public void setVersions(int versions) {
+        this.versions = versions;
+    }
+
+    public String getSectionName() {
+        return sectionName;
+    }
+
+    public void setSectionName(String sectionName) {
+        this.sectionName = sectionName;
+    }
+
+    public String getCrosesRoad() {
+        return crosesRoad;
+    }
+
+    public void setCrosesRoad(String crosesRoad) {
+        this.crosesRoad = crosesRoad;
+    }
+
+    public String getGsectionVector() {
+        return gsectionVector;
+    }
+
+    public void setGsectionVector(String gsectionVector) {
+        this.gsectionVector = gsectionVector;
+    }
+
+    public String getDbType() {
+        return dbType;
+    }
+
+    public void setDbType(String dbType) {
+        this.dbType = dbType;
+    }
+
+    public Integer getSpeedLimit() {
+        return speedLimit;
+    }
+
+    public void setSpeedLimit(Integer speedLimit) {
+        this.speedLimit = speedLimit;
+    }
+
+    public int getDirections() {
+        return directions;
+    }
+
+    public void setDirections(int directions) {
+        this.directions = directions;
+    }
+}
+package com.bsth.service.geo_data.impl.dto;
+
+/**
+ * 站点和路由级联入库
+ * Created by panzhao on 2017/12/21.
+ */
+public class CascadeSaveStation {
+
+    /**
+     * 路由id
+     */
+    private Integer routeId;
+
+    /**
+     * 线路id
+     */
+    private Integer line;
+
+    /**
+     * 上下行
+     */
+    private int directions;
+
+    /**
+     * 站点id
+     */
+    private Integer station;
+
+    /**
+     * 站点名称
+     */
+    private String stationName;
+
+    /**
+     * 路由顺序
+     */
+    private Integer stationRouteCode;
+
+    /**
+     * 线路编码
+     */
+    private String lineCode;
+
+    /**
+     * 站点编码
+     */
+    private String stationCode;
+
+    private String stationMark;
+
+    private Double distances;
+
+    private Double toTime;
+
+    private Integer stationId;
+
+    private String dbType;
+
+    private String bJwpoints;
+
+    private Float gLonx;
+
+    private Float gLaty;
+
+    private Integer radius;
+
+    private String shapesType;
+
+    private String gPolygonGrid;
+
+
+
+    public Integer getLine() {
+        return line;
+    }
+
+    public void setLine(Integer line) {
+        this.line = line;
+    }
+
+    public Integer getStation() {
+        return station;
+    }
+
+    public void setStation(Integer station) {
+        this.station = station;
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
+    public Integer getStationRouteCode() {
+        return stationRouteCode;
+    }
+
+    public void setStationRouteCode(Integer stationRouteCode) {
+        this.stationRouteCode = stationRouteCode;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getStationCode() {
+        return stationCode;
+    }
+
+    public void setStationCode(String stationCode) {
+        this.stationCode = stationCode;
+    }
+
+    public String getStationMark() {
+        return stationMark;
+    }
+
+    public void setStationMark(String stationMark) {
+        this.stationMark = stationMark;
+    }
+
+    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 Integer getStationId() {
+        return stationId;
+    }
+
+    public void setStationId(Integer stationId) {
+        this.stationId = stationId;
+    }
+
+    public String getDbType() {
+        return dbType;
+    }
+
+    public void setDbType(String dbType) {
+        this.dbType = dbType;
+    }
+
+    public String getbJwpoints() {
+        return bJwpoints;
+    }
+
+    public void setbJwpoints(String bJwpoints) {
+        this.bJwpoints = bJwpoints;
+    }
+
+    public Float getgLonx() {
+        return gLonx;
+    }
+
+    public void setgLonx(Float gLonx) {
+        this.gLonx = gLonx;
+    }
+
+    public Float getgLaty() {
+        return gLaty;
+    }
+
+    public void setgLaty(Float gLaty) {
+        this.gLaty = gLaty;
+    }
+
+    public Integer getRadius() {
+        return radius;
+    }
+
+    public void setRadius(Integer radius) {
+        this.radius = radius;
+    }
+
+    public String getShapesType() {
+        return shapesType;
+    }
+
+    public void setShapesType(String shapesType) {
+        this.shapesType = shapesType;
+    }
+
+    public String getgPolygonGrid() {
+        return gPolygonGrid;
+    }
+
+    public void setgPolygonGrid(String gPolygonGrid) {
+        this.gPolygonGrid = gPolygonGrid;
+    }
+
+    public int getDirections() {
+        return directions;
+    }
+
+    public void setDirections(int directions) {
+        this.directions = directions;
+    }
+
+    public Integer getRouteId() {
+        return routeId;
+    }
+
+    public void setRouteId(Integer routeId) {
+        this.routeId = routeId;
+    }
+}
-package com.bsth.service.geo_data.impl;
+package com.bsth.service.geo_data.impl.dto;
 import java.util.Date;
-package com.bsth.service.geo_data.impl;
+package com.bsth.service.geo_data.impl.dto;
 import java.util.Date;
@@ -325,7 +325,7 @@
                          <a href="javascript:;" class="btn btn-outline green button-next"> 下一步
                              <i class="fa fa-angle-right"></i>
                          </a>
-                         <a href="javascript:;" class="btn green button-submit" style="display: none;"> 提交
+                         <a href="javascript:;" class="btn green button-submit" style="display: none;" id="submintBtn"> 提交
                              <i class="fa fa-check"></i>
                          </a>
                      </div>
@@ -91,6 +91,8 @@ var FormWizard = function() {
 				 * 默认：default (native) form submit;当表单通过验证，提交表单。回调函数有个默认参数form
 				 */
 				submitHandler : function(f) {
+					// 防止用户多次提交
+					$("#submintBtn").addClass("disabled");
 					// 表单序列化
 					var params = form.serializeJSON();
 					if(params.shapesType=='圆形')
@@ -109,6 +111,7 @@ var FormWizard = function() {
 						// 返回list.html页面
 						loadPage('/pages/base/carpark/list.html');
 					});
+					$("#submintBtn").removeClass("disabled");
 				}
 			});
 			$.validator.addMethod("alnum", function(value, element) {
@@ -89,7 +89,7 @@
 			<div class="form-actions">
 				<div class="row">
 					<div class="col-md-offset-3 col-md-4">
-						<button type="submit" class="btn green" ><i class="fa fa-check"></i> 提交</button>
+						<button type="submit" class="btn green" id="submintBtn"><i class="fa fa-check"></i> 提交</button>
 						<a type="button" class="btn default" href="list.html" data-pjax><i class="fa fa-times"></i> 取消</a>
 					</div>
 				</div>
@@ -139,6 +139,8 @@ $(function(){
 			});
 			// 提交
 			function submit() {
+				// 防止用户多次提交
+				$("#submintBtn").addClass("disabled");
 				// 添加数据
 				$post('/business', params, function(result) {
 					// 如果返回结果不为空
@@ -155,6 +157,7 @@ $(function(){
 					// 返回list.html页面
 					loadPage('list.html');
 				});
+				$("#submintBtn").removeClass("disabled");
 			}
 		}
 	});
@@ -80,9 +80,14 @@ div#map_wrap{
     font-size: 14px;
     color: #0aae0a;
 }
-._version_dropdown_wrap li.uk-active>a{
+
+a._version_text:hover{
     color: #0aae0a;
 }
+
+._version_dropdown_wrap li.uk-active>a{
+    color: blue;
+}
 .uk-nav-header:not(:first-child) {
     margin-top: 10px;
 }
@@ -91,19 +96,43 @@ div#map_wrap{
     right: 18px;
     top: 10px;
 }
+
+.remove_line_version_icon{
+    position: absolute;
+    right: 46px;
+    top: 10px;
+}
+
+a.clock_enable_version,
+a.clock_enable_version:hover,
+a.clock_enable_version:active,
+a.clock_enable_version:focus{
+    color: #ef4f4f;
+}
+
 .clock_enable_version{
-    padding: 4px 0 0 15px;
-    font-size: 13px;
+    padding: 6px 0 0 13px;
+    font-size: 12px;
+    color: #ef4f4f;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    display: block;
+}
+
+.clock_enable_version .t_t_str{
+    font-size: 15px;
     color: #ef4f4f;
 }
 .clock_enable_version>a.uk-icon{
     vertical-align: top;
-    margin-top: 6px;
+    margin-top: 5px;
 }
 ._route_info_wrap{
     height: calc(100% - 90px);
     padding-top: 10px;
+    background: #fff;
 }
 ._route_info_wrap .uk-tab>li>a{
@@ -606,10 +635,110 @@ ul.context-menu-list.station-route-ct-menu.context-menu-root {
     pointer-events: auto;
 }
-#add_line_versions_modal form.uk-form-horizontal .uk-form-label{
+.lvm_wrap form.uk-form-horizontal .uk-form-label{
     width: 100px !important;
 }
-#add_line_versions_modal form.uk-form-horizontal .uk-form-controls{
+.lvm_wrap form.uk-form-horizontal .uk-form-controls{
     margin-left: 115px;
-}
 \ No newline at end of file
+}
+
+.rt_show_version_txt{
+    display: none;
+}
+
+.empty_add_icon{
+    width: 140px;
+    border: 1px dashed #e2e2e2 !important;
+    text-align: center;
+    padding: 5px 0;
+    margin-left: 57px;
+    cursor: pointer;
+}
+
+.empty_add_icon:hover{
+    border: 1px solid #e2e2e2;
+}
+
+.empty_add_icon>span.uk-icon{
+    vertical-align: top;
+    margin-top: 3px;
+}
+
+.empty_add_icon>a{
+    color: grey !important;
+    display: inline-block !important;
+    width: auto !important;
+    padding-left: 0 !important;
+}
+
+.road_route>ul.empty{
+    border-left: none;
+}
+
+.s_future_version_info ._line_info{
+    height: 95px;
+}
+
+.s_future_version_info ._route_info_wrap{
+    height: calc(100% - 105px);
+    background: #fff;
+}
+
+a.b_l_s_link{
+    color: red;
+    font-size: 13px;
+    display: inline-block;
+    vertical-align: bottom;
+    margin-right: 5px;
+}
+
+.clock_enable_version.green,
+.clock_enable_version.green:hover,
+.clock_enable_version.green:active,
+.clock_enable_version.green:focus{
+    color: green;
+}
+
+.clock_enable_version.green .t_t_str{
+    color: green !important;
+}
+
+
+.clock_enable_version.orange,
+.clock_enable_version.orange:hover,
+.clock_enable_version.orange:active,
+.clock_enable_version.orange:focus{
+    color: #c88408;
+}
+
+.clock_enable_version.orange .t_t_str{
+    color: #c88408 !important;
+}
+
+._version_text.e0{
+    color: grey !important;
+}
+
+._version_text.e2{
+    color: #c88408 !important;
+}
+
+.uk-tooltip.uk-active {
+    z-index: 99999;
+}
+
+div[id*='PanoramaFlashWraperTANGRAM']{
+    z-index: 99999;
+    background: #fff;
+    text-align: center;
+    color: red;
+}
+/*
+div[id*='PanoramaFlashWraperTANGRAM']:before{
+    content: "如果你使用的是chrome浏览器，请在设置里允许当前页面IP启用flash";
+    position: absolute;
+    top: 50px;
+    left: calc(50% - 220px);
+    font-size: 18px;
+}*/
 <div>
     <script id="geo_d_e_road_route-temp" type="text/html">
-        <ul class="uk-list">
+        <ul class="uk-list {{if list.length==0}}empty{{/if}}">
             {{each list as subArr i}}
             <li class="r_r_item f_r_a" data-id="{{subArr[0].id}}" data-code="{{subArr[0].sectionCode}}">
                 <a data-code="{{subArr[0].sectionCode}}" data-updown="{{subArr[0].directions}}">{{subArr[0].sectionName}}<span class="sub_name">{{subArr[0].crosesRoad}}</span></a>
@@ -17,6 +17,15 @@
                 {{/if}}
             </li>
             {{/each}}
+
+            {{if list.length==0}}
+            <li class="r_r_item">
+                <div class="empty_add_icon add_road_icon" data-updown="{{updown}}">
+                    <span uk-icon="icon: plus;ratio:.8"></span>
+                    <a>添加路段</a>
+                </div>
+            </li>
+            {{/if}}
         </ul>
     </script>
@@ -10,6 +10,15 @@
                 <a data-code="{{s.stationCode}}" data-updown="{{s.directions}}">{{s.stationName}}</a>
             </li>
             {{/each}}
+
+            {{if list.length==0}}
+                <li class="">
+                    <div class="empty_add_icon add_station_icon">
+                        <span uk-icon="icon: plus;ratio:.8"></span>
+                        <a data-updown="{{updown}}">添加站点</a>
+                    </div>
+                </li>
+            {{/if}}
         </ul>
     </script>
@@ -54,7 +63,7 @@
                 半径：{{radius}}
                 {{/if}}
             </li>
-            <li>站序：{{index + 1}}</li>
+            <li>站序：{{index}}</li>
             <li>路由序号：{{stationRouteCode}}</li>
         </ul>
     </script>
 <div>
+    <script id="geo_d_e_version_dropdown-temp" type="text/html">
+        {{if data[0]!=null}}
+            <li class="uk-nav-header">历史</li>
+            {{each data[0] as obj i}}
+                <li class="{{if obj.versions==cvs}}uk-active{{/if}} e0" data-version="{{obj.versions}}"><a>{{obj.name}}</a></li>
+            {{/each}}
+            <li class="uk-nav-divider"></li>
+        {{/if}}
+
+        {{if data[1]!=null}}
+            <li class="uk-nav-header">启用的</li>
+            {{each data[1] as obj i}}
+            <li class="{{if obj.versions==cvs}}uk-active{{/if}} e1" data-version="{{obj.versions}}"><a>{{obj.name}}</a></li>
+            {{/each}}
+        {{/if}}
+
+        {{if data[2]!=null}}
+            <li class="uk-nav-header">未来</li>
+            {{each data[2] as obj i}}
+            <li class="{{if obj.versions==cvs}}uk-active{{/if}} e2" data-version="{{obj.versions}}"><a>{{obj.name}}</a></li>
+            {{/each}}
+        {{/if}}
+    </script>
+
     <script id="geo_d_e_version_add-temp" type="text/html">
-        <div id="add_line_versions_modal" uk-modal esc-close="false" bg-close="false">
+        <div id="add_line_versions_modal" uk-modal esc-close="false" bg-close="false" class="lvm_wrap">
             <div class="uk-modal-dialog uk-modal-body">
                 <button class="uk-modal-close-default" type="button" uk-close></button>
                 <h2 class="uk-modal-title">添加走向版本</h2>
@@ -11,6 +35,8 @@
                         <div class="uk-form-controls">
                             <select class="uk-select" name="remark">
                                 <option>线路改道</option>
+                                <option>增加中途站</option>
+                                <option>站名更变</option>
                                 <option>其他</option>
                             </select>
                         </div>
@@ -19,7 +45,7 @@
                     <div class="uk-margin">
                         <label class="uk-form-label" >启用时间</label>
                         <div class="uk-form-controls">
-                            <input class="uk-input _flatpickr" type="text" name="startDate" placeholder="启用该版本走向的时间">
+                            <input class="uk-input _flatpickr" type="text" name="startDate" placeholder="启用这个走向的时间">
                         </div>
                     </div>
@@ -33,11 +59,11 @@
                     <div class="uk-margin">
                         <div class="uk-form-label">继承走向</div>
                         <div class="uk-form-controls">
-                            <select class="uk-select" >
-                                <option>不继承之前的走向</option>
+                            <select class="uk-select" name="extendsVersion">
+                                <option value="-1">不继承之前的走向</option>
                                 {{each array as obj i}}
-                                    <option data-id="{{obj.id}}" data-versions="{{obj.versions}}">{{obj.name}}</option>
+                                    <option value="{{obj.versions}}" data-id="{{obj.id}}">{{obj.name}}</option>
                                 {{/each}}
                             </select>
                         </div>
@@ -52,4 +78,80 @@
             </div>
         </div>
     </script>
+
+    <script id="geo_d_e_version_enable-temp" type="text/html">
+        <div id="enable_line_versions_modal" uk-modal esc-close="false" bg-close="false"  class="lvm_wrap">
+            <div class="uk-modal-dialog uk-modal-body">
+                <button class="uk-modal-close-default" type="button" uk-close></button>
+                <h2 class="uk-modal-title">启用版本（{{name}}）</h2>
+
+                <form class="uk-form-horizontal uk-margin-large">
+                    <div class="uk-margin">
+                        <label class="uk-form-label" >版本名称</label>
+                        <div class="uk-form-controls">
+                            <input class="uk-input" type="text" name="name" value="{{name}}" readonly>
+                        </div>
+                    </div>
+
+                    <div class="uk-margin">
+                        <label class="uk-form-label" >版本号</label>
+                        <div class="uk-form-controls">
+                            <input class="uk-input" type="text" name="versions" value="{{versions}}" readonly>
+                        </div>
+                    </div>
+
+                    <div class="uk-margin">
+                        <label class="uk-form-label" >启用时间</label>
+                        <div class="uk-form-controls">
+                            <input class="uk-input _flatpickr" type="text" name="startDate" placeholder="启用该版本走向的时间">
+                        </div>
+                    </div>
+                </form>
+
+                <p class="uk-text-right">
+                    <button class="uk-button uk-button-default uk-modal-close" type="button">取消</button>
+                    <button class="uk-button uk-button-primary _submit" type="button">提交</button>
+                </p>
+            </div>
+        </div>
+    </script>
+
+    <script id="g_d_e_v_enable_edit-temp" type="text/html">
+        <div id="enable_versions_edit_modal" uk-modal esc-close="false" bg-close="false" class="lvm_wrap">
+            <div class="uk-modal-dialog uk-modal-body">
+                <button class="uk-modal-close-default" type="button" uk-close></button>
+                <h2 class="uk-modal-title">待更新版本</h2>
+
+                <form class="uk-form-horizontal uk-margin-large">
+                    <div class="uk-margin">
+                        <label class="uk-form-label" >启用时间</label>
+                        <div class="uk-form-controls">
+                            <input class="uk-input _flatpickr" type="text" name="startDate" value="{{start_date_str}}">
+                        </div>
+                    </div>
+
+                    <div class="uk-margin">
+                        <label class="uk-form-label" >版本名称</label>
+                        <div class="uk-form-controls">
+                            <input class="uk-input" type="text" name="name" value="{{name}}" readonly>
+                        </div>
+                    </div>
+
+                    <div class="uk-margin">
+                        <label class="uk-form-label" >版本号</label>
+                        <div class="uk-form-controls">
+                            <input class="uk-input" type="text" name="versions" value="{{versions}}" readonly>
+                        </div>
+                    </div>
+                </form>
+
+                <p class="uk-text-right">
+                    <a class="b_l_s_link" title="日后再说" uk-tooltip="pos:top">撤销启用计划</a>
+                    <button class="uk-button uk-button-default uk-modal-close" type="button">取消</button>
+                    <!--<button class="uk-button uk-button-danger _cancel" type="button">撤销</button>-->
+                    <button class="uk-button uk-button-primary _submit" type="button">提交</button>
+                </p>
+            </div>
+        </div>
+    </script>
 </div>
 \ No newline at end of file
+var gb_common = (function () {
+
+    var flatpickrDateTimeConfig = {
+        enableTime: true,
+        time_24hr: true,
+        "locale": "zh",
+        onOpen: function () {
+            $(this.calendarContainer).addClass('showTimeInput');
+        }
+    };
+
+    var groupBy = function (list, field) {
+        var rs = {},
+            key;
+        $.each(list, function () {
+            key = this[field];
+            if (!rs[key])
+                rs[key] = [];
+
+            rs[key].push(this);
+        });
+
+        return rs;
+    };
+
+    var compileTempByDom = function (dom, opts) {
+        var tps = {},
+            id;
+        $('script[type="text/html"]', dom).each(function () {
+            id = $(this).attr('id');
+            if (id)
+                tps[id] = template.compile($(this).html(), opts);
+        });
+        return tps;
+    };
+
+    var $get = function (url, data, successFun) {
+        $.ajax({
+            url: url,
+            data: data,
+            complete: function (xhr, ts) {
+                ajaxComplete(xhr, ts, successFun);
+            }
+        });
+    };
+
+    var $post = function (url, data, successFun) {
+        $.ajax({
+            url: url,
+            method: 'POST',
+            data: data,
+            complete: function (xhr, ts) {
+                ajaxComplete(xhr, ts, successFun);
+            }
+        });
+    };
+
+    var $post_arr = function (url, data, successFun) {
+        $.ajax({
+            url: url,
+            method: 'POST',
+            traditional: true,
+            data: data,
+            complete: function (xhr, ts) {
+                ajaxComplete(xhr, ts, successFun);
+            }
+        });
+    };
+
+    var $del = function (url, successFun) {
+        $post(url, {'_method': 'delete'}, function (rs) {
+            successFun && successFun(rs);
+        });
+    };
+    
+    function hide_wait_modal() {
+        $('.main_left_panel_m_layer').hide();
+        $loadPanel.hide();
+        //gb_ct_map.resetMapStatus();
+    }
+
+    var errorHead = '<span style="color:red;">异常：</span>';
+
+    function successHandle(json, handle) {
+        var status = json.status;
+        if (status == 407) {
+            location.href = '/login.html';
+            return;
+        }
+
+        if (!status) {
+            handle && handle(json);
+            return;
+        }
+
+        if (status == 'ERROR'){
+            UIkit.modal.alert(errorHead + (json.msg ? json.msg : '未知异常'), {labels: {Ok: '确定'}});
+            //关闭wait窗口
+            hide_wait_modal();
+        }
+        else
+            handle && handle(json);
+    }
+
+    function ajaxComplete(xhr, ts, succ) {
+        if (ts == 'success') {
+            successHandle(JSON.parse(xhr.responseText), succ);
+        } else if (ts == 'error') {
+            UIkit.modal.alert(errorHead + xhr.responseText, {labels: {Ok: '确定'}});
+            //关闭wait窗口
+            hide_wait_modal();
+        }
+    }
+
+    var get_vals = function (json) {
+        var array = [];
+        for (var key in json) {
+            array.push(json[key]);
+        }
+
+        return array;
+    };
+
+    var get_keys = function (json) {
+        var array = [];
+        for (var key in json) {
+            array.push(key);
+        }
+        return array;
+    };
+
+    var accAdd = function (a, b) {
+        var c, d, e;
+        try {
+            c = a.toString().split(".")[1].length;
+        } catch (f) {
+            c = 0;
+        }
+        try {
+            d = b.toString().split(".")[1].length;
+        } catch (f) {
+            d = 0;
+        }
+        return e = Math.pow(10, Math.max(c, d)), (mul(a, e) + mul(b, e)) / e;
+    };
+
+    function accDiv(arg1,arg2){
+        var t1=0,t2=0,r1,r2;
+        try{t1=arg1.toString().split(".")[1].length}catch(e){}
+        try{t2=arg2.toString().split(".")[1].length}catch(e){}
+        with(Math){
+            r1=Number(arg1.toString().replace(".",""))
+            r2=Number(arg2.toString().replace(".",""))
+            return (r1/r2)*pow(10,t2-t1);
+        }
+    }
+
+    function mul(a, b) {
+        var c = 0,
+            d = a.toString(),
+            e = b.toString();
+        try {
+            c += d.split(".")[1].length;
+        } catch (f) {
+        }
+        try {
+            c += e.split(".")[1].length;
+        } catch (f) {
+        }
+        return Number(d.replace(".", "")) * Number(e.replace(".", "")) / Math.pow(10, c);
+    }
+
+    var numSubtr = function (a, b) {
+        var c, d, e;
+        try {
+            c = a.toString().split(".")[1].length;
+        } catch (f) {
+            c = 0;
+        }
+        try {
+            d = b.toString().split(".")[1].length;
+        } catch (f) {
+            d = 0;
+        }
+        return e = Math.pow(10, Math.max(c, d)), (a * e - b * e) / e;
+    };
+
+    var trim = function (str, is_global) {
+        var result;
+        result = str.replace(/(^\s+)|(\s+$)/g, "");
+        if (is_global.toLowerCase() == "g") {
+            result = result.replace(/\s/g, "");
+        }
+        return result;
+    };
+
+    var inverse = function (map) {
+        var rs = {};
+        for(var k in map){
+            rs[map[k]] = k;
+        }
+
+        return rs;
+    };
+    
+    var next_elem = function (clazz, e) {
+        var ne = e.next();
+        if(ne.length==0)
+            return [];
+        else if(ne.hasClass(clazz))
+            return ne;
+        else
+            return next_elem(clazz, ne);
+    };
+
+    var getDisabledVal = function (f) {
+        var rs = {};
+        $('input,select', f).each(function () {
+            if($(this).attr('disabled')){
+                rs[$(this).attr('name')]=$(this).val();
+            }
+        });
+        return rs;
+    };
+    
+    return {
+        groupBy: groupBy,
+        compileTempByDom: compileTempByDom,
+        $get: $get,
+        $post: $post,
+        $post_arr: $post_arr,
+        $del: $del,
+        get_vals: get_vals,
+        get_keys: get_keys,
+        accAdd: accAdd,
+        numSubtr: numSubtr,
+        trim: trim,
+        flatpickrDateTimeConfig: flatpickrDateTimeConfig,
+        inverse: inverse,
+        accDiv: accDiv,
+        mul: mul,
+        next_elem: next_elem,
+        getDisabledVal: getDisabledVal,
+    };
+})();
@@ -2,6 +2,8 @@
 var gb_ct_map = function () {
+    var initFlag;
+
     //初始化地图
     if (!window.BMap) {
         alert('地图没有加载成功，请确认是否能正常连接外网！！');
@@ -42,7 +44,7 @@ var gb_ct_map = function () {
     stCtrl.setOffset(new BMap.Size(20, 20));
     map.addControl(stCtrl);//添加全景控件
-    var roadPolylines = [], stationMarkers = [];
+    var roadPolylines = {0:[],1:[]}, stationMarkers = {0:[],1:[]};
     var _render = function (cb) {
         //绘制路段
         _renderRoads(gb_road_route.getData());
@@ -52,9 +54,15 @@ var gb_ct_map = function () {
         changeUpDown();
         //居中至上行中间站点
-        var cm = stationMarkers[0][parseInt(stationMarkers[0].length / 2)];
-        map.setCenter(cm.point);
+        if(!initFlag){
+            if(stationMarkers[0].length>0){
+                var cm = stationMarkers[0][parseInt(stationMarkers[0].length / 2)];
+                map.setCenter(cm.point);
+            }
+            initFlag=true;
+        }
+        $('.BMap_noprint.anchorTR').attr('title', '部分浏览器可能需要允许当前页面ip启用flash');
         cb && cb();
     };
@@ -62,20 +70,25 @@ var gb_ct_map = function () {
         return updown == 0 ? 'blue' : 'red';
     };
     var _renderRoads = function (data) {
-        _renderPolyline(data[0], updownColor(0));//上行路段
-        _renderPolyline(data[1], updownColor(1));//下行路段
+        if(data[0])
+            _renderPolyline(data[0], updownColor(0));//上行路段
+        if(data[1])
+            _renderPolyline(data[1], updownColor(1));//下行路段
     };
     var _renderStation = function (data) {
-        _renderStationMarket(data[0]);//上行站点
-        _renderStationMarket(data[1]);//下行站点
+        if(data[0])
+            _renderStationMarket(data[0]);//上行站点
+        if(data[1])
+            _renderStationMarket(data[1]);//下行站点
     };
     var _renderStationMarket = function (routes, color) {
+        if(routes.length==0)
+            return;
         var marker;
         var array = [];
         $.each(routes, function (i) {
-            this.index = i;
             transCoord(this);
             marker = createStationMark(this);
             marker.stationCode = this.stationCode;
@@ -96,6 +109,8 @@ var gb_ct_map = function () {
     }
     var _renderPolyline = function (routes, color) {
+        if(routes.length==0)
+            return;
         var pos, temps;
         var polyline, _pLines = [];
         var style = {strokeWeight: 7, strokeColor: color, strokeOpacity: .7};
@@ -228,8 +243,8 @@ var gb_ct_map = function () {
         ctx.fillStyle = '#fff';
         var i = station.index;
-        if(!isNaN(i))
-            i ++;
+       /* if(!isNaN(i))
+            i ++;*/
         var left = (i + '').length > 1 ? 3 : 7;
         ctx.fillText(i, left, 14);
@@ -275,6 +290,8 @@ var gb_ct_map = function () {
         if (marker) {
             openStationInfoWin(marker);
         }
+        //居中
+        map.setCenter(marker.point);
     };
     var getStationMarker = function (code, updown) {
@@ -548,7 +565,7 @@ var gb_ct_map = function () {
         var point;
         var pId = gb_road_route.getAddPrevId();
-        if(pId){
+        if(pId && pId !=-1){
             //从上一个路段继续绘制
             var prev = gb_road_route.getRoadById(pId),
                 coords = prev.bdCoords,
@@ -598,7 +615,7 @@ var gb_ct_map = function () {
                 var point;
                 if(!pos || pos.length==0){
                     var pId = gb_station_route.getAddPrevId();
-                    if(pId){
+                    if(pId && pId!=-1){
                         //百度没有定位到位置，默认靠近在上一个站
                         var prev = gb_station_route.getStationById(pId);
                         point = new BMap.Point(prev.bd_lon - 0.0001, prev.bd_lat - 0.0001);
@@ -691,6 +708,7 @@ var gb_ct_map = function () {
      * @param upDown
      */
     var reDrawStation = function (upDown) {
+        map_status = 0;
         $.each(stationMarkers[upDown], function () {
             map.removeOverlay(this);
         });
@@ -843,6 +861,17 @@ var gb_ct_map = function () {
         showAddRoadPanel: showAddRoadPanel,
         map: map,
         focus: focusPoint,
-        clearfocus: clearfocus
+        clearfocus: clearfocus,
+        clearAll: function () {
+            map_status = 0;
+            roadPolylines = {0:[],1:[]};
+            stationMarkers = {0:[],1:[]};
+            editCircle = null;
+            editPolygon = null;
+            dragMarker = null;
+
+            map.clearOverlays();
+
+        }
     };
 }();
 \ No newline at end of file
@@ -11,20 +11,25 @@ var gb_road_route = function () {
             road_maps = data;
             temps = temp;
-            //按顺序，名称分组
-            var ups = _group(road_maps[0]);
-            var downs = _group(road_maps[1]);
             //渲染
-            var upHtmlStr = temps['geo_d_e_road_route-temp']({list: ups});
-            $('.up_down_route_list>li:first>.road_route').html(upHtmlStr);
-            var downHtmlStr = temps['geo_d_e_road_route-temp']({list: downs});
-            $('.up_down_route_list>li:last>.road_route').html(downHtmlStr);
+            if(road_maps[0]){
+                var ups = _group(road_maps[0]);
+                var upHtmlStr = temps['geo_d_e_road_route-temp']({list: ups, updown: 0});
+                $('.up_down_route_list>li:first>.road_route').html(upHtmlStr);
+            }
+
+            if(road_maps[1]){
+                var downs = _group(road_maps[1]);
+                var downHtmlStr = temps['geo_d_e_road_route-temp']({list: downs, updown: 1});
+                $('.up_down_route_list>li:last>.road_route').html(downHtmlStr);
+            }
             cb && cb();
         });
         //加载数据
-        gb_common.$get('/_geo_data/findGeoRoad', {lineCode: lineCode}, function (rs) {
+        var version = storage.getItem("geo_data_edit_line_version");
+        gb_common.$get('/_geo_data/findGeoRoad', {lineCode: lineCode,version:version}, function (rs) {
             rs.list.sort(function (a, b) {
                 return parseInt(a.sectionrouteCode) - parseInt(b.sectionrouteCode);
             });
@@ -35,7 +40,10 @@ var gb_road_route = function () {
                 this.cp = geolib.getCenter(_pos);
                 this.len = geolib.getPathLength(_pos);
             });
-            ep.emit('data', gb_common.groupBy(rs.list, 'directions'));
+            var data = {0:[],1:[]};
+            if(rs.list.length > 0)
+                data = gb_common.groupBy(rs.list, 'directions');
+            ep.emit('data', data);
         });
         //加载模板片段
@@ -67,6 +75,9 @@ var gb_road_route = function () {
             tempArr.push(obj);
             name = obj.sectionName
         }
+
+        if(tempArr.length > 0)
+            rs.push(tempArr);
         return rs;
     };
@@ -126,7 +137,8 @@ var gb_road_route = function () {
     var addPrevId;//添加路段路由的上一个路由ID
     var insert_road_before = function (road) {
-        isPrevEnd(road);
+        if(!isPrevEnd(road))
+            return;
         //在之前插入路段
         var cell = getRoadLI(road);
@@ -138,16 +150,30 @@ var gb_road_route = function () {
         add_road(addCell);
     };
+    /**
+     *
+     * 路段添加按钮
+     */
+    $(document).on('click', '.add_road_icon', function () {
+        var cell = $(this);
+
+        if(!isPrevEnd({directions: cell.data('updown')}))
+            return;
+
+        var addCell = $(temps['geo_d_e_add_road_panel-temp']({sectionName: '', crosesRoad: ''}));
+        cell.after(addCell);
+        add_road(addCell);
+    });
+
     var insert_road_after = function (road) {
-        isPrevEnd(road);
+        if(!isPrevEnd(road))
+            return;
         //在之后插入路段
         var cell = getRoadLI(road);
         var addCell = $(temps['geo_d_e_add_road_panel-temp'](road));
-        //var next = cell.next('.r_r_item');
-        //cell.after(addCell);
         var $bksList = $('.bks_list', cell);
         if($bksList.length > 0)
             $bksList.prepend(addCell);
@@ -157,8 +183,11 @@ var gb_road_route = function () {
     };
     var isPrevEnd = function (r) {
-        if($('.up_down_route_list>li:eq('+r.directions+')>.road_route .road_li_transient').length > 0)
-            return UIkit.notification("你需要完成上一个路段新增！", {status: 'danger'});
+        if($('.up_down_route_list>li:eq('+r.directions+')>.road_route .road_li_transient').length > 0) {
+            UIkit.notification("你需要完成上一个路段新增！", {status: 'danger'});
+            return false;
+        }
+        return true;
     };
     var add_road = function (cell) {
@@ -281,7 +310,7 @@ var gb_road_route = function () {
     };
     var updateList = function (list) {
-        var updown = list[0].directions;
+        var updown = getUpDown();
         list.sort(function (a, b) {
             return parseInt(a.sectionrouteCode) - parseInt(b.sectionrouteCode);
         });
@@ -333,6 +362,15 @@ var gb_road_route = function () {
             }
         });
+        //取消
+        $('button.cancel', spp).on('click', function () {
+            $('.main_left_panel_m_layer').hide();
+            $(this).parents('.buffer_edit_body').parent().remove();
+            gb_ct_map.resetMapStatus();
+            //debugger
+            //gb_ct_map.exitEditRoadStatus(road);
+        });
+
         gb_ct_map.showAddRoadPanel(name, cName);
     };
@@ -27,7 +27,8 @@ var gb_ct_search = function () {
     });
     var searchComplete = function (e) {
-        var htmlStr = template('geo_d_e_search_result-temp', {list: e.wr});
+        //console.log('e.wr', e);
+        var htmlStr = template('geo_d_e_search_result-temp', {list: e.yr});
         $('.ct_search_result').html(htmlStr);
     };
+/**
+ * 服务器时间
+ * @type {{}}
+ */
+var gb_second_timer = (function () {
+
+    var now;
+    //var _this;
+    var secondTimer;
+    //var contextFlag;
+
+    var setVersionEnableTimeFun;
+
+    var init = function () {
+       //_this = $('.clock_enable_version .t_t_str')[0];
+        getServerTime(function (time) {
+            now = time;
+            /*$('div.north').bind("contextmenu", function () {
+                contextFlag = true;
+            });*/
+            //setTime();
+
+            secondTimer = window.setInterval(function () {
+                if (0 == now.getSeconds()) {
+                    minuteTimer();
+                    //contextFlag = false;
+                }
+
+                now = new Date(now.getTime() + 1e3);
+                //setTime();
+                setVersionEnableTimeFun && setVersionEnableTimeFun(now);
+            }, 1e3);
+        });
+    };
+
+    var getServerTime = function (callback) {
+        function oncallback(jqXHR) {
+            var time = jqXHR && jqXHR.getResponseHeader("Date");
+            if (time)
+                callback(new Date(time))
+        }
+
+        if ("function" == typeof callback)
+            $.ajax({
+                url: "/real_control_v2/assets/imgs/time.gif",
+                type: "HEAD"
+            }).done(function (data, textStatus, jqXHR) {
+                oncallback(jqXHR)
+            }).fail(function (jqXHR, textStatus, errorThrown) {
+                oncallback(jqXHR)
+            })
+    };
+
+/*    var timeFormat = function (str) {
+        return ("0" + str).slice(-2)
+    };*/
+
+ /*   var setTime = function () {
+        _this.innerHTML = timeFormat(now.getHours()) + ':' + timeFormat(now.getMinutes()) + '.' + timeFormat(now.getSeconds());
+    };*/
+
+    var minuteTimer = function () {
+        getServerTime(function (time) {
+            now = time;
+            //setTime()
+        })
+    };
+
+    window.setTimeout(init, 1000);
+
+    return {
+        now: function () {
+            return now;
+        },
+        initSetVersionEnableTimeFun: function (fun) {
+            setVersionEnableTimeFun = fun;
+        },
+        removeVersionEnableTimeFun: function () {
+            setVersionEnableTimeFun = null;
+        }
+    }
+})();
 \ No newline at end of file
@@ -10,23 +10,52 @@ var gb_station_route = function () {
         var ep = EventProxy.create("data", "temp", function (data, temp) {
             station_maps = data;
             temps = temp;
-            //当前使用的线路版本
-            storage.setItem("geo_data_edit_line_version" , data[0][0].versions);
+
             //渲染页面
-            var upHtmlStr = temps['geo_d_e_station_route-temp']({list: station_maps[0]});
+            if(!station_maps[0])
+                station_maps[0] = [];
+            var upHtmlStr = temps['geo_d_e_station_route-temp']({list: station_maps[0],updown:0});
             $('.up_down_route_list>li:first>.station_route').html(upHtmlStr);
-            var downHtmlStr = temps['geo_d_e_station_route-temp']({list: station_maps[1]});
+
+            if(!station_maps[1])
+                station_maps[1] = [];
+            var downHtmlStr = temps['geo_d_e_station_route-temp']({list: station_maps[1],updown:1});
             $('.up_down_route_list>li:last>.station_route').html(downHtmlStr);
             cb && cb();
         });
+        var version = storage.getItem("geo_data_edit_line_version");
         //加载数据
-        gb_common.$get('/_geo_data/findGeoStations', {lineCode: lineCode}, function (rs) {
+        gb_common.$get('/_geo_data/findGeoStations', {lineCode: lineCode, version: version}, function (rs) {
             rs.list.sort(function (a, b) {
                 return parseInt(a.stationRouteCode) - parseInt(b.stationRouteCode);
             });
-            ep.emit('data', gb_common.groupBy(rs.list, 'directions'));
+
+            //线路当前启用的线路版本
+            storage.setItem("geo_data_enable_version" , rs['currentVersion']);
+            //当前编辑的线路版本
+            storage.setItem("geo_data_edit_line_version" , rs['editVersion']);
+
+            var data = {0:[],1:[]};
+            if(rs.list.length > 0)
+                data = gb_common.groupBy(rs.list, 'directions');
+
+            //序号
+            if(data[0]){
+                for(var i=0,len=data[0].length;i<len;i++){
+                    data[0][i].index = i + 1;
+                }
+            }
+            if(data[1]){
+                for(var i=0,len=data[1].length;i<len;i++){
+                    data[1][i].index = i + 1;
+                }
+            }
+            /*for(var i=0,len=rs.list.length;i<len;i++){
+                rs.list[i].index = i + 1;
+            }*/
+            ep.emit('data', data);
         });
         //加载模板片段
@@ -140,7 +169,6 @@ var gb_station_route = function () {
             if(is_duplication(name))
                 return UIkit.notification("站点路由名称重复！！", {status: 'danger'});
-            debugger
             //上一个站点的ID
             var _cell = $(this).parents('.station_li_transient');
             var $prev = prevs(_cell, 's_r_item')
@@ -166,13 +194,14 @@ var gb_station_route = function () {
             prev = $(that).prev();
             if(prev.length == 0)
-                return null;
+                return [];
             if(prev.hasClass(clazz))
                 return prev;
             that = prev;
         }
+        return [];
     };
     /**
@@ -242,6 +271,19 @@ var gb_station_route = function () {
         }
     });
+    /**
+     * 新线路 添加第一个站点
+     */
+    $(document).on('click', '.add_station_icon', function () {
+        //在之后插入站点
+        var cell = $(this).parent();
+
+        var addCell = $(temps['geo_d_e_add_station_panel-temp']());
+        cell.after(addCell);
+
+        add_station(addCell);
+    });
+
     var showEditPanel = function (s) {
         var htmlStr = temps['geo_d_e_map_edit_buffer_panel-temp'](s);
         $('.ct_page').append(htmlStr);
@@ -289,7 +331,7 @@ var gb_station_route = function () {
         });
         //缓冲区编辑 切换绘制模式
-        $('.draw_polygon_switch', $editWrap).on('input', function (e) {
+        $('.draw_polygon_switch', $editWrap).on('click', function (e) {
             var type = $(this).data('type');
             if(type==1){
                 //退出绘制状态
@@ -388,12 +430,12 @@ var gb_station_route = function () {
             return parseInt(a.stationRouteCode) - parseInt(b.stationRouteCode);
         });
-        var upDown = list[0].directions;
+        var upDown = getUpDown();
         var dataMaps = {};
         //更新数据
-        for(var i=0,s;s=list[i++];){
-            s.index = i;
-            dataMaps[s.id] = s;
+        for(var i=0,len=list.length;i<len;i++){
+            list[i].index = i + 1;
+            dataMaps[list[i].id] = list[i];
         }
         station_maps[upDown] = list;
         //更新序号
@@ -429,6 +471,7 @@ var gb_station_route = function () {
         $('.main_left_panel_m_layer').hide();
         $('.add_station_search_point_wrap').remove();
+        $('.empty_add_icon.add_station_icon', wrap).remove();
     };
     /**
@@ -436,6 +479,13 @@ var gb_station_route = function () {
      * @param list
      */
     var destroyEnd = function (list, station) {
+        if(list.length==0){
+            var updown = getUpDown();
+            station_maps[updown] = [];
+            var upHtmlStr = temps['geo_d_e_station_route-temp']({list: [],updown:updown});
+            $('.up_down_route_list>li:'+(updown==0?'first':'last')+'>.station_route').empty().html(upHtmlStr);
+            return;
+        }
         //被撤销的
         $('.up_down_route_list .s_r_item[data-id='+station.id+']').remove();
         updateStationRouteData(list);
@@ -155,6 +155,25 @@ var gb_data_submit = function () {
         });
     });
+    /**
+     *
+     * 添加线路版本 add_line_versions_modal
+     */
+    $(document).on('click', '#add_line_versions_modal ._submit', function (e) {
+        var f = $('form', '#add_line_versions_modal');
+        var data = f.serializeJSON();
+        data.lineCode = storage.getItem('geo_data_edit_line_code');
+
+        UIkit.modal.confirm('确定线路版本【'+data.name+'】？').then(function() {
+            $loadPanel.show();
+            gb_common.$post('/_geo_data/addNewLineVersion', data, function (rs) {
+                storage.setItem("geo_data_edit_line_version", rs['newVersion']);
+                clearAll();
+                startup();
+            });
+        });
+    });
+
     var show_run_text = function (t) {
         $('.text', $loadPanel).text(t);
         $loadPanel.show();
@@ -171,6 +190,8 @@ var gb_data_submit = function () {
      */
     var destroyStation = function (station) {
+        station.bdCoords=null;
+        delete station.bdCoords;
         UIkit.modal.confirm('确定撤销站点【'+station.stationName+'】？').then(function() {
             show_run_text('正在撤销...');
@@ -5,50 +5,170 @@ var gb_version_manage = function () {
     var array;
     var lineName;
     var current;
+    var futureInfo;
     var temps;
-    var init = function (cVersion) {
+    var init = function (enableVersion) {
         var lineCode = storage.getItem("geo_data_edit_line_code");
+
+        var ep = EventProxy.create("data", "temp", function () {
+            if(!current){
+                alert('异常，无法选中当前线路版本！');
+            }
+
+            //线路名称
+            $('.main_left_panel>._line_info>._line_name>span').text(lineName);
+            //当前版本
+            $('.main_left_panel ._version_dropdown_wrap>._version_text')
+                .html(current.name + '<i uk-icon="icon: chevron-down;ratio:.6"></i>').removeClass('e0 e1 e2').addClass('e' + current.status);
+
+
+            //按status 分组
+            var data = gb_common.groupBy(array, 'status');
+            var htmlStr = temps['geo_d_e_version_dropdown-temp']({data: data, cvs: storage.getItem('geo_data_edit_line_version')});
+            $('._version_dropdown_wrap ul.all_version_list').html(htmlStr);
+
+
+            /**
+             * 展现的不是启用的版本，现在启用icon
+             */
+            $('.main_rt_tools_panel .t2_enable_icon').remove();
+            $('.remove_line_version_icon').hide();
+            var v_enable = storage.getItem('geo_data_enable_version');
+            var v_edit = storage.getItem('geo_data_edit_line_version');
+            if(v_enable != v_edit){
+                $('.remove_line_version_icon').show();
+                $('.main_rt_tools_panel')
+                    .prepend('<a data-version="'+v_edit+'" uk-icon="icon: future;ratio: .9" class="_icon t2_enable_icon uk-animation-slide-right-small" title="启用这个走向版本" uk-tooltip="pos:bottom"></a>');
+            }
+
+            /**
+             * 待启用的版本信息
+             */
+            init_futureInfo(lineCode);
+        });
+
         //获取线路版本信息
-        gb_common.$get('/_geo_data/findVersionInfo', {lineCode: lineCode}, function (rs) {
+        gb_common.$get('/_geo_data/findVersionInfo?t='+ Math.random(), {lineCode: lineCode}, function (rs) {
             array = rs.list;
             lineName = array[0].lineName;
             //当前使用版本
             for(var i=0,obj;obj=array[i++];){
-                if(obj.versions==cVersion){
+                if(obj.versions==enableVersion){
                     current = obj;
                     break;
                 }
             }
-
-            if(!current){
-                alert('异常，无法选中当前线路版本！');
-            }
-
-            //线路名称
-            $('.main_left_panel>._line_info>._line_name>span').text(lineName);
-            //当前版本
-            $('.main_left_panel ._version_dropdown_wrap>._version_text').html(current.name + '<i uk-icon="icon: chevron-down;ratio:.6"></i>');
+            ep.emit('data', array);
         });
         $.get('/pages/base/geo_data_edit/fragments/versions.html', function (dom) {
             temps = gb_common.compileTempByDom(dom, {
                 compress: true
             });
+            ep.emit('temp');
+        });
+    };
+
+    var init_futureInfo = function (lineCode) {
+        futureInfo = null;
+        $('.clock_enable_version').empty();
+        $('.main_left_panel').removeClass('s_future_version_info');
+        gb_common.$get('/_geo_data/findFutureVersion?t='+Math.random(), {lineCode: lineCode}, function (rs) {
+            if(rs.data.length > 0)
+                futureInfo = rs.data[0];
+
+            if(!futureInfo)
+                return;
+
+            futureInfo.start_date_str = moment(futureInfo['start_date']).format('YYYY-MM-DD HH:mm');
+
+            var htmlStr = '<span class="t_t_str">？</span> 后启用（'+futureInfo.name+'）';
+            $('.clock_enable_version').append(htmlStr);
+            $('.main_left_panel').addClass('s_future_version_info');
+            if(current.versions==futureInfo.versions)
+                $('.clock_enable_version').addClass('orange');
+            else
+                $('.clock_enable_version').removeClass('orange');
+
+
+            var _that = $('.clock_enable_version span.t_t_str')[0];
+            var st = new Date(futureInfo['start_date']);
+            gb_second_timer.initSetVersionEnableTimeFun(function (now) {
+                if(st.getTime() - now.getTime() <= 0) {
+                    $('.clock_enable_version').html('服务器即将切换版本，请稍后刷新页面！').data('status', '-1');
+                    gb_second_timer.removeVersionEnableTimeFun();
+                }
+                else{
+                    var s =getUseTime(st, now);
+                    _that.innerText = s;
+                }
+            });
         });
     };
     /**
+     * 点击版本启用倒计时
+     */
+    var v_e_edit_modal='#enable_versions_edit_modal';
+    $(document).on('click', '.clock_enable_version', function () {
+        if($(this).data('status')==-1)
+            return;
+        var htmlStr = temps['g_d_e_v_enable_edit-temp'](futureInfo);
+        $(document.body).append(htmlStr);
+        UIkit.modal(v_e_edit_modal).show();
+
+        var conf = {minDate: gb_second_timer.now()};
+        $.extend(conf, gb_common.flatpickrDateTimeConfig);
+        flatpickr(v_e_edit_modal + ' input._flatpickr', conf);
+    });
+    $(document).on('click', v_e_edit_modal + ' button._submit', function () {
+        var f = $('form', v_e_edit_modal);
+        var data = f.serializeJSON();
+        data.lineCode = storage.getItem('geo_data_edit_line_code');
+
+        gb_common.$post('/_geo_data/addEnableInfo', data, function () {
+            UIkit.modal(v_e_edit_modal).hide();
+            UIkit.notification("修改成功！", {status: 'success'});
+            init();
+        });
+    });
+
+
+    var findOne = function (no) {
+      for(var i=0,obj;obj=array[i++];){
+          if(obj.versions == no)
+              return obj;
+      }
+
+      return null;
+    };
+
+    /**
+     * 版本切换
+     */
+    $('._version_dropdown_wrap ul.all_version_list').on('click', 'li[data-version]', function () {
+        var version = $(this).data('version');
+
+        storage.setItem("geo_data_edit_line_version" , version);
+        $loadPanel.show();
+        clearAll();
+        startup();
+    });
+
+    /**
      * 新增
      */
     $('.add_line_version_icon').on('click', function () {
-        console.log('arrayarray', array);
         var htmlStr = temps['geo_d_e_version_add-temp']({array: array});
         $(document.body).append(htmlStr);
         UIkit.modal('#add_line_versions_modal').show();
-        flatpickr('#add_line_versions_modal input._flatpickr', gb_common.flatpickrDateTimeConfig);
+
+        var conf = {minDate: gb_second_timer.now()};
+        $.extend(conf, gb_common.flatpickrDateTimeConfig);
+        flatpickr('#add_line_versions_modal input._flatpickr', conf);
         var modal = '#add_line_versions_modal';
@@ -61,6 +181,26 @@ var gb_version_manage = function () {
         //自动填充版本名称
         $('[name=remark]', modal).on('change', reSetName);
         $('[name=startDate]', modal).on('input', reSetName);
+
+        //console.log('时间aaa', gb_second_timer.now().getTime());
+    });
+
+    /**
+     * 删除
+     */
+    $('.remove_line_version_icon').on('click', function () {
+        var version = storage.getItem('geo_data_edit_line_version');
+        var obj = findOne(version);
+
+        var txt = '<span style="color:#ff4444;">你确定要删除 【'+obj.lineName+'】【'+obj.name+'】走向版本？</span>';
+        UIkit.modal.confirm(txt).then(function() {
+            $loadPanel.show();
+            gb_common.$post('/_geo_data/deleteLineVersion', {lineCode: obj.lineCode, version: obj.versions}, function (rs) {
+                storage.removeItem("geo_data_edit_line_version");
+                clearAll();
+                startup();
+            });
+        });
     });
     $(document).on('hidden', '.uk-modal', function () {
@@ -68,12 +208,62 @@ var gb_version_manage = function () {
         $('.flatpickr-calendar').remove();
     });
+    function getUseTime(nowDate, startDate) {
+        var hour = nowDate.getHours();
+        var min = nowDate.getMinutes();
+        var sec = "";
+        var showMin = "";
+        var showHour = "";
+
+        if (nowDate.getSeconds() < startDate.getSeconds()) {
+            min = min - 1;
+            var sec_int = (nowDate.getSeconds() + 60) - startDate.getSeconds();
+            sec = sec_int >= 10 ? sec_int + "" : "0" + sec_int;
+        } else {
+            var sec_int = nowDate.getSeconds() - startDate.getSeconds();
+            sec = sec_int >= 10 ? sec_int + "" : "0" + sec_int;
+        }
+        if (min < startDate.getMinutes()) {
+            hour = hour - 1;
+            var min_int = (min + 60) - startDate.getMinutes();
+            showMin = min_int >= 10 ? min_int + "" : "0" + min_int;
+        } else {
+            var min_int = min - startDate.getMinutes();
+            showMin = min_int >= 10 ? min_int + "" : "0" + min_int;
+        }
+        if (hour < startDate.getHours()) {
+            var hour_int = (hour + 24) - startDate.getHours();
+            showHour = hour_int >= 10 ? hour_int + "" : "0" + hour_int;
+        } else {
+            var hour_int = hour - startDate.getHours();
+            showHour = hour_int >= 10 ? hour_int + "" : "0" + hour_int;
+        }
+        return showHour + "时" + showMin + "分" + sec;
+    }
     /**
-     * 提交新增的线路版本
+     * 启用走向版本
      */
-    $(document).on('click', '#add_line_versions_modal button._submit', function () {
+    $(document).on('click', '.main_rt_tools_panel .t2_enable_icon', function () {
+        var obj = findOne($(this).data('version'));
+        var htmlStr = temps['geo_d_e_version_enable-temp'](obj);
+        $(document.body).append(htmlStr);
+        UIkit.modal('#enable_line_versions_modal').show();
+
+        var conf = {minDate: gb_second_timer.now()};
+        $.extend(conf, gb_common.flatpickrDateTimeConfig);
+        flatpickr('#enable_line_versions_modal input._flatpickr', conf);
+    });
+    $(document).on('click', '#enable_line_versions_modal button._submit', function () {
+        var f = $('form', '#enable_line_versions_modal');
+        var data = f.serializeJSON();
+        data.lineCode = storage.getItem('geo_data_edit_line_code');
+        gb_common.$post('/_geo_data/addEnableInfo', data, function () {
+            UIkit.modal('#enable_line_versions_modal').hide();
+            UIkit.notification("操作成功！", {status: 'success'});
+            init();
+        });
     });
     res_load_ep.emitLater('load_version_manage');
@@ -26,25 +26,18 @@
         <div class="_line_info">
             <div class="_line_name">
                 <span></span>
-                <a uk-icon="icon: plus" class="add_line_version_icon" title="新增一个线路走向版本" uk-tooltip></a>
+
+                <a uk-icon="icon: trash" class="remove_line_version_icon uk-animation-slide-right-small" title="删除线路版本" style="display: none" uk-tooltip></a>
+                <a uk-icon="icon: plus" class="add_line_version_icon" title="新增一个线路版本" uk-tooltip></a>
             </div>
             <div class="_version_dropdown_wrap">
                 <a class="_version_text"></a>
                 <div uk-dropdown>
-                    <ul class="uk-nav uk-dropdown-nav">
-                        <li class="uk-nav-header">历史</li>
-                        <li><a>原始版本</a></li>
-                        <li class="uk-nav-divider"></li>
-                        <li class="uk-nav-header">启用</li>
-                        <li class="uk-active"><a>20171206线路改道</a></li>
-                        <li class="uk-nav-header">未来</li>
-                        <li><a>20180206线路改道</a></li>
+                    <ul class="uk-nav uk-dropdown-nav all_version_list">
                     </ul>
                 </div>
             </div>
-            <!--<span class="clock_enable_version">
-                <a uk-icon="icon: clock;ratio: .7" class=""></a> 25:30:20 启用（20180206线路改道）
-            </span>-->
+            <a class="clock_enable_version"></a>
         </div>
         <div class="_route_info_wrap">
@@ -52,9 +45,7 @@
                 <li><a>上行</a></li>
                 <li><a>下行</a></li>
-                <span class="rt_show_version_txt uk-badge uk-disabled">
-                    20180206线路改道
-                </span>
+                <!--<span class="rt_show_version_txt uk-badge uk-disabled uk-animation-slide-top-small"></span>-->
             </ul>
             <ul class="uk-switcher uk-margin up_down_route_list">
@@ -80,7 +71,9 @@
         <div class="ct_search_result"></div>
     </div>
     <div class="main_rt_tools_panel">
-        <a uk-icon="icon: info;ratio: .9" class="_icon"></a>
+        <!--<a style="color: red;" uk-icon="icon: unlock;ratio: .9" class="_icon" title="当前版本有变更未启用" uk-tooltip="pos:bottom"></a>-->
+
+        <a uk-icon="icon: bookmark;ratio: .9" class="_icon" title="变更日志，日后再说" uk-tooltip="pos:bottom"></a>
         <a uk-icon="icon: expand;ratio: .9" class="_icon full_screen_icon"></a>
     </div>
 </div>
@@ -113,7 +106,7 @@
 <!-- jquery.serializejson JSON序列化插件 -->
 <script src="/assets/plugins/jquery.serializejson.js"  merge="plugins"></script>
 <!-- common js -->
-<script src="/real_control_v2/js/common.js"></script>
+<script src="/pages/base/geo_data_edit/js/ct_common.js"></script>
 <script src="/assets/js/TransGPS.js" ></script>
 <!-- Geolib -->
 <script src="/real_control_v2/geolib/geolib.js" ></script>
@@ -136,37 +129,56 @@
     if (!top.$('body').hasClass('page-sidebar-closed')) {top.$('.menu-toggler.sidebar-toggler').click();}
     //全屏
     $('.full_screen_icon').on('click', function () {
-        window.parent.$('#geo_edit_wrap_iframe').addClass('full_screen');
+        var $iframe = window.parent.$('#geo_edit_wrap_iframe'),
+                icon;
+        if($(this).attr('uk-icon').indexOf('expand') != -1){
+            $iframe.addClass('full_screen');
+            icon = 'shrink';
+        }
+        else{
+            $iframe.removeClass('full_screen');
+            icon = 'expand';
+        }
+        $(this).attr('uk-icon', 'icon: '+icon+';ratio: .9');
     });
-    var gb_main_ep = new EventProxy();
+    var gb_main_ep;
     //文件加载
     var res_load_ep = EventProxy.create('load_common_data', 'load_station_route','load_road_route'
             , 'load_version_manage', 'load_history_edit_logs', 'load_map', function () {
-
-                //UIkit.notification('加载完成！！');
-                var eq = gb_main_ep;
-
-                //站点
-                gb_station_route.init(g_emit('init_road'));
-                //路段
-                eq.once('init_road', function () {
-                    gb_road_route.init(g_emit('init_map'))
-                });
-                //地图
-                eq.once('init_map', function () {
-                    gb_ct_map._render(g_emit('end'));
-                });
-
-                eq.once('end', function () {
-                    //线路版本信息
-                    gb_version_manage.init(gb_station_route.getData()[0][0].versions);
-
-                    $loadPanel.hide();
-                    gb_ct_search.init();
-                });
+                startup();
             });
+    var startup = function () {
+        gb_main_ep = new EventProxy();
+        var eq = gb_main_ep;
+
+        //站点
+        gb_station_route.init(g_emit('init_road'));
+        //路段
+        eq.once('init_road', function () {
+            gb_road_route.init(g_emit('init_map'))
+        });
+        //地图
+        eq.once('init_map', function () {
+            gb_ct_map._render(g_emit('end'));
+        });
+
+        eq.once('end', function () {
+            //线路版本信息
+            gb_version_manage.init(storage.getItem("geo_data_edit_line_version"));
+
+            $loadPanel.hide();
+            gb_ct_search.init();
+        });
+    };
+    
+    var clearAll = function () {
+        $('.up_down_route_list .station_route').empty();
+        $('.up_down_route_list .road_route').empty();
+        gb_ct_map.clearAll();
+    };
+
     function g_emit(id) {
         console.log('g_emit [' + id + ']');
         return function () {
@@ -198,6 +210,8 @@
     });
 </script>
+
+<script src="/pages/base/geo_data_edit/js/server_timer.js" ></script>
 <!--- js -->
 <script src="/pages/base/geo_data_edit/js/common_data.js" ></script>
 <script src="/pages/base/geo_data_edit/js/station_route.js" ></script>
@@ -80,7 +80,7 @@
 				<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>
+							<button type="submit" class="btn green" id="submintBtn"><i class="fa fa-check"></i> 提交</button>
 							<a type="button" class="btn default" href="list.html" data-pjax><i class="fa fa-times"></i> 取消</a>
 						</div>
 					</div>
@@ -108,6 +108,8 @@ $(function(){
 			submit();
 			// 提交
 			function submit() {
+				// 防止用户多次提交
+				$("#submintBtn").addClass("disabled");
 				// 添加数据
 				$post('/interval', params, function(result) {
 					// 如果返回结果不为空
@@ -125,6 +127,7 @@ $(function(){
 					//loadPage('list.html');
 					window.location.href = 'list.html';
 				});
+				$("#submintBtn").removeClass("disabled");
 			}
 		}
 	});
@@ -487,7 +487,7 @@
 			<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>
+						<button type="submit" class="btn green" id="submintBtn"><i class="fa fa-check"></i> 提交</button>
 						<a type="button" class="btn default" href="list.html" data-pjax><i class="fa fa-times"></i> 取消</a>
 					</div>
 				</div>
@@ -237,6 +237,9 @@ $(function(){
 			// 提交
 			function submit() {
+				// 防止用户多次提交
+				$("#submintBtn").addClass("disabled");
+				
 				// 添加数据
 				$post('/line', params, function(result) {
 					// 如果返回结果不为空
@@ -347,7 +347,7 @@
 				<a href="/pages/base/lineinformation/list.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a>
 			</td>
 			<td>
-				<a href="/pages/base/stationroute/list.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a>
+				<a href="javascript:window.localStorage.setItem('geo_data_edit_line_code' , '{{obj.lineCode}}');window.localStorage.removeItem('geo_data_edit_line_version');window.location.href='/pages/base/geo_data_edit/uk3_wrap.html';" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a>
 			</td>
 			<td>
 				<a href="details.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 详细 </a>
@@ -583,7 +583,7 @@
 			<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>
+						<button type="submit" class="btn green" id="submintBtn"><i class="fa fa-check"></i> 提交</button>
 						<a type="button" class="btn default lineinformation_back" href="lineinformation.html"  data-pjax><i class="fa fa-times"></i> 取消</a>
 					</div>
 				</div>
@@ -198,11 +198,13 @@ $(function(){
 				error.hide();
 				var params = form.serializeJSON();
+				// 防止用户多次提交
+				$("#submintBtn").addClass("disabled");
 				if (params.line) {
 					// 添加数据
-					$post('/lineInformation', params, function(result) {
+					$post('/lineInformation1', params, function(result) {
 						// 如果返回结果不为空
 						if(result){
@@ -226,6 +228,7 @@ $(function(){
 					});
 				}
+				$("#submintBtn").removeClass("disabled");
 			}
 		});
@@ -129,7 +129,7 @@
 			<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>
+						<button type="submit" class="btn green" id="submintBtn"><i class="fa fa-check"></i> 提交</button>
 						<a type="button" class="btn default" href="list.html" data-pjax><i class="fa fa-times"></i> 取消</a>
 					</div>
 				</div>
@@ -195,6 +195,8 @@
 			submit();
 			// 提交
 			function submit() {
+				// 防止用户多次提交
+				$("#submintBtn").addClass("disabled");
 				// 添加数据
 				$post('/lineVersions/add', params, function(result) {
 					// 如果返回结果不为空
@@ -211,6 +213,7 @@
 					// 返回list.html页面
 					loadPage('list.html');
 				});
+				$("#submintBtn").removeClass("disabled");
 			}
 		}
 	});
@@ -251,7 +251,7 @@
                          <a href="javascript:;" class="btn btn-outline green button-next"> 下一步
                              <i class="fa fa-angle-right"></i>
                          </a>
-                         <a href="javascript:;" class="btn green button-submit" style="display: none;"> 提交
+                         <a href="javascript:;" class="btn green button-submit" style="display: none;" id="submintBtn"> 提交
                              <i class="fa fa-check"></i>
                          </a>
                      </div>
@@ -76,6 +76,9 @@ var FormWizard = function() {
 				 * 默认：default (native) form submit;当表单通过验证，提交表单。回调函数有个默认参数form.
 				 */
 				submitHandler : function(f) {
+					// 防止用户多次提交
+					$("#submintBtn").addClass("disabled");
+					debugger
 					var params = form.serializeJSON();// 表单序列化.
 					if(params.roadVector=='') {
 						layer.msg('路段几何图形为空~请先在路段位置步骤中绘制出线路走向!');
@@ -90,6 +93,7 @@ var FormWizard = function() {
 						}
 						loadPage('list.html');// 返回list.html页面.
 					});
+					$("#submintBtn").removeClass("disabled");
 				}
 			});
@@ -63,11 +63,11 @@ var SectionVmapWorlds = function() {
             		  		marker.setAnimation(BMAP_ANIMATION_BOUNCE); 
 						}else {
 							// 弹出添加成功提示消息
-							layer.msg('无法获取停车场【'+Address+'】地理位置！');
+							layer.msg('无法获取【'+Address+'】地理位置！');
 						}
 					}else {
 						// 弹出添加成功提示消息
-						layer.msg('无法获取停车场【'+Address+'】地理位置！');
+						layer.msg('无法获取【'+Address+'】地理位置！');
 					}
 				});
 				// 根据检索词发起检索。
@@ -376,7 +376,7 @@
                          <a href="javascript:;" class="btn btn-outline green button-next"> 下一步
                              <i class="fa fa-angle-right"></i>
                          </a>
-                         <a href="javascript:;" class="btn green button-submit" style="display: none;"> 提交
+                         <a href="javascript:;" class="btn green button-submit" style="display: none;" id="submintBtn"> 提交
                              <i class="fa fa-check"></i>
                          </a>
                      </div>
@@ -81,6 +81,8 @@ var FormWizard = function() {
 				 * 默认：default (native) form submit;当表单通过验证，提交表单。回调函数有个默认参数form.
 				 */
 				submitHandler : function(f) {
+					// 防止用户多次提交
+					$("#submintBtn").addClass("disabled");
 					var params = form.serializeJSON();// 表单序列化.
 					if(params.bsectionVector=='') {
 						layer.msg('路段几何图形为空~请先在路段位置步骤中绘制出线路走向!');
@@ -95,6 +97,7 @@ var FormWizard = function() {
 						}
 						loadPage('list.html');// 返回list.html页面.
 					});
+					$("#submintBtn").removeClass("disabled");
 				}
 			});
@@ -151,8 +154,8 @@ var FormWizard = function() {
                     	var stationStartValue = $('#stationStartInput').val();
                     	var stationEndValue = $('#stationEndInput').val();
                     	var paramsStationsArray = [];
-                    	paramsStationsArray[0] = stationStartValue+'公交车站';
-                    	paramsStationsArray[1]= stationEndValue+'公交车站';
+                    	paramsStationsArray[0] = stationStartValue;
+                    	paramsStationsArray[1]= stationEndValue;
                     	$('#sectionNameInput').val(stationStartValue + '至' + stationEndValue );
                     	if(baseResValue == 0) {
                     		$('.leftUtils').hide();
@@ -166,8 +169,8 @@ var FormWizard = function() {
                 				});
                 			});
                     	}else if(baseResValue ==1) {
-                    		SectionVmapWorlds.localSearchFromAdreesToPoint(stationStartValue+'公交车站');
-                        	SectionVmapWorlds.localSearchFromAdreesToPoint(stationEndValue+'公交车站');
+                    		SectionVmapWorlds.localSearchFromAdreesToPoint(stationStartValue);
+                        	SectionVmapWorlds.localSearchFromAdreesToPoint(stationEndValue);
 //                    		SectionVmapWorlds.drawingManagerOpen();
                     	}
                     	$('html,body').animate({scrollTop: ($('#form-wizard-info').offset().top-5) + "px"},500);
@@ -63,11 +63,11 @@ var SectionVmapWorlds = function() {
             		  		marker.setAnimation(BMAP_ANIMATION_BOUNCE); 
 						}else {
 							// 弹出添加成功提示消息
-							layer.msg('无法获取停车场【'+Address+'】地理位置！');
+							layer.msg('无法获取【'+Address+'】地理位置！');
 						}
 					}else {
 						// 弹出添加成功提示消息
-						layer.msg('无法获取停车场【'+Address+'】地理位置！');
+						layer.msg('无法获取【'+Address+'】地理位置！');
 					}
 				});
 				// 根据检索词发起检索。
@@ -174,7 +174,7 @@ var SectionVmapWorlds = function() {
 					 var f = arguments.callee;
 					 var poiOne =  new BMap.Point(stationsPoint[index].potion.lng,stationsPoint[index].potion.lat);
 					 var poiTwo =  new BMap.Point(stationsPoint[index+1].potion.lng,stationsPoint[index+1].potion.lat);
-					 var transit = new BMap.DrivingRoute(mapB, {renderOptions: {map: mapB},onPolylinesSet: searchPolylinesSet});
+					 var transit = new BMap.DrivingRoute(mapB, {renderOptions: {map: mapB,enableDragging : true},onPolylinesSet: searchPolylinesSet});
 					 function searchPolylinesSet(results){
 						 if (transit.getStatus() != BMAP_STATUS_SUCCESS){
 						 }else {
@@ -425,7 +425,7 @@
                          <a href="javascript:;" class="btn btn-outline green button-next"> 下一步
                              <i class="fa fa-angle-right"></i>
                          </a>
-                         <a href="javascript:;" class="btn green button-submit" style="display: none;"> 提交
+                         <a href="javascript:;" class="btn green button-submit" style="display: none;" id="submintBtn"> 提交
                              <i class="fa fa-check"></i>
                          </a>
                      </div>
@@ -90,6 +90,8 @@ var FormWizard = function() {
 				 * 默认：default (native) form submit;当表单通过验证，提交表单。回调函数有个默认参数form
 				 */
 				submitHandler : function(f) {
+					// 防止用户多次提交
+					$("#submintBtn").addClass("disabled");
 					// 表单序列化
 					var params = form.serializeJSON();
 					if(params.shapesType=='圆形')
@@ -108,6 +110,7 @@ var FormWizard = function() {
 						// 返回list.html页面
 						loadPage('list.html');
 					});
+					$("#submintBtn").removeClass("disabled");
 				}
 			});
 			// 当站点类型为中途站或者终点站时,上一站点为必填项！
@@ -81,7 +81,7 @@
 	</div>
 </div>
-<script type="text/javascript" src="js/jquery.table2excel.min.js"></script>
+<script type="text/javascript" src="/pages/forms/statement/js/jquery.table2excel.min.js"></script>
 <script>
 	$(function(){
 		$('#export').attr('disabled', "true");
@@ -220,7 +220,13 @@
 			$("#sumMap tr").addClass("hidden");
 			$get('/pcpc/firstAndLastBus_sum', params, function(result){
 				// 把数据填充到模版中
-				var tbodyHtml = template('list_firstAndLastBus_delay',{list:result[result.length - 1].map});
+				var list;
+				if(result.length - 1 > 0){
+					list = result[result.length - 1].map;
+				} else {
+					list = result;
+				}
+				var tbodyHtml = template('list_firstAndLastBus_delay',{list:list});
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms tbody').html(tbodyHtml);
@@ -262,4 +268,9 @@
 			<td>{{obj.remarks1}}</td>
 		</tr>
 	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="20"><h6 class="muted">没有相关数据</h6></td>
+		</tr>
+	{{/if}}
 </script>
 \ No newline at end of file
@@ -135,7 +135,7 @@
 	</div>
 </div>
-<script type="text/javascript" src="js/jquery.table2excel.min.js"></script>
+<script type="text/javascript" src="/pages/forms/statement/js/jquery.table2excel.min.js"></script>
 <script>
 	$(function(){
 		$('#export').attr('disabled', "true");
@@ -302,6 +302,8 @@
 			$("#forms .hidden").removeClass("hidden");
 			$("#map tr").addClass("hidden");
 			$("#sumMap tr").addClass("hidden");
+			$("#exportMap").addClass("hidden");
+			$("#exportSumMap").addClass("hidden");
 			$get('/pcpc/firstAndLastBus_sum', params, function(result){
 				// 把数据填充到模版中
 				var tbodyHtml = template('list_firstAndLastBus_sum',{list:result});
@@ -432,6 +434,11 @@
 			{{/if}}
 		</tr>
 	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="20"><h6 class="muted">没有相关数据</h6></td>
+		</tr>
+	{{/if}}
 </script>
 <script type="text/html" id="list_sumMaps">
 	{{each list as obj i}}
@@ -447,4 +454,9 @@
 			<td>{{obj.remarks1}}</td>
 		</tr>
 	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="20"><h6 class="muted">没有相关数据</h6></td>
+		</tr>
+	{{/if}}
 </script>
 \ No newline at end of file
@@ -96,7 +96,11 @@
         <dl>
             <dd>
                 {{if item.abnormalType == 'speed'}}
-                超速({{item.speed}})
+                    {{if item.speed>=100}}
+                        速度异常
+                    {{else}}
+                        超速({{item.speed}})
+                    {{/if}}
                 {{else if item.abnormalType == 'outbound'}}
                 越界
                 {{/if}}