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 1cd31d72 c66ee69b
Showing 69 changed files with 3909 additions and 437 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/controller/geo_data/GeoDataController.java
src/main/java/com/bsth/controller/schedule/core/TTInfoController.java
src/main/java/com/bsth/controller/schedule/core/TTInfoDetailController.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/gpsdata_v2/utils/GpsDataRecovery.java
src/main/java/com/bsth/data/safe_driv/SafeDrivDataLoadThread.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
src/main/java/com/bsth/data/schedule/thread/SchedulePstThread.java
src/main/java/com/bsth/entity/geo_data/GeoLineVersionInfo.java
src/main/java/com/bsth/entity/geo_data/GeoStation.java
src/main/java/com/bsth/entity/schedule/TTInfo.java
src/main/java/com/bsth/entity/schedule/TTInfoBackup.java
src/main/java/com/bsth/entity/schedule/TTInfoDetail.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/SaveRoadRouteDTO.java
src/main/java/com/bsth/service/geo_data/impl/SaveStationRouteDTO.java
@@ -10,6 +10,7 @@ import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread;
 import com.bsth.data.gpsdata_v2.thread.OfflineMonitorThread;
 import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.msg_queue.WebSocketPushQueue;
+import com.bsth.data.safe_driv.SafeDrivDataLoadThread;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.auto_exec.AutoExecScanThread;
 import com.bsth.data.schedule.edit_logs.SeiPstThread;
@@ -75,6 +76,9 @@ public class XDApplication implements CommandLineRunner {
     @Autowired
     LineVersionsData lineVersionsData;
+    @Autowired
+    SafeDrivDataLoadThread safeDrivDataLoadThread;
+
     private static long timeDiff;
     private static long timeDiffTraffic;
@@ -122,7 +126,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);
         //班次修正日志延迟入库
@@ -131,11 +135,16 @@ public class XDApplication implements CommandLineRunner {
         //sexec.scheduleWithFixedDelay(directivesPstThread, 180, 180, TimeUnit.SECONDS);
         //线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
         //sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);
+
+        //安全驾驶
+        //sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 40, 30, TimeUnit.SECONDS);
     }
     public void prodInit(){
         log.info("prodInit...");
         ScheduledExecutorService sexec = Application.mainServices;
+        //安全驾驶
+        sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
         /** 线调业务 */
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程
 package com.bsth.controller.geo_data;
+import com.bsth.entity.geo_data.GeoRoad;
 import com.bsth.entity.geo_data.GeoStation;
 import com.bsth.service.geo_data.GeoDataService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,4 +36,41 @@ public class GeoDataController {
     public Map<String, Object> updateBufferInfo(GeoStation station){
         return geoDataService.updateBufferInfo(station);
     }
-}
+
+    @RequestMapping(value = "updateStationName",method = RequestMethod.POST)
+    public Map<String, Object> updateStationName(@RequestParam Map<String, Object> map){
+        return geoDataService.updateStationName(map);
+    }
+
+    @RequestMapping(value = "addNewStationRoute",method = RequestMethod.POST)
+    public Map<String, Object> addNewStationRoute(@RequestParam String lineCode,@RequestParam int versions,@RequestParam int upDown
+            ,@RequestParam String stationName,@RequestParam Float lat,@RequestParam Float lng,@RequestParam int prevRouteId){
+        return geoDataService.addNewStationRoute(lineCode, upDown, versions, stationName, lat, lng, prevRouteId);
+    }
+
+    @RequestMapping(value = "addNewRoadRoute",method = RequestMethod.POST)
+    public Map<String, Object> addNewRoadRoute(@RequestParam String lineCode,@RequestParam int versions,@RequestParam int upDown
+            ,@RequestParam String sectionName,@RequestParam String crosesRoad,@RequestParam String coords,@RequestParam int prevRouteId){
+        return geoDataService.addNewRoadRoute(lineCode, upDown, versions, sectionName, crosesRoad, coords, prevRouteId);
+    }
+
+    @RequestMapping(value = "destroyStation",method = RequestMethod.POST)
+    public Map<String, Object> destroyStation(GeoStation station){
+        return geoDataService.destroyStation(station);
+    }
+
+    @RequestMapping(value = "updateRoadInfo",method = RequestMethod.POST)
+    public Map<String, Object> updateRoadInfo(GeoRoad road){
+        return geoDataService.updateRoadInfo(road);
+    }
+
+    @RequestMapping(value = "destroyRoad",method = RequestMethod.POST)
+    public Map<String, Object> destroyRoad(GeoRoad road){
+        return geoDataService.destroyRoad(road);
+    }
+
+    @RequestMapping("findVersionInfo")
+    public Map<String, Object> findVersionInfo(@RequestParam String lineCode){
+        return geoDataService.findVersionInfo(lineCode);
+    }
+}
 \ No newline at end of file
@@ -2,16 +2,14 @@ package com.bsth.controller.schedule.core;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
-import com.bsth.entity.LineVersions;
 import com.bsth.entity.schedule.TTInfo;
-import com.bsth.service.LineVersionsService;
 import com.bsth.service.schedule.TTInfoService;
 import com.bsth.service.schedule.exception.ScheduleException;
-import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
 /**
  * Created by xu on 16/12/20.
@@ -21,47 +19,13 @@ import java.util.*;
 public class TTInfoController extends BController<TTInfo, Long> {
     @Autowired
     private TTInfoService ttInfoService;
-    @Autowired
-    private LineVersionsService lineVersionsService;
     @RequestMapping(value = "/stationroute/{lineid}", method = RequestMethod.GET)
     public Map<String, Object> getLineStationRouteVersions(@PathVariable(value = "lineid") Integer lineid) {
         Map<String, Object> rtn = new HashMap<>();
         try {
-            List<LineVersions> lineVersionses = lineVersionsService.findByLineCode(lineid);
-            Collections.sort(lineVersionses, new Comparator<LineVersions>() {
-                @Override
-                public int compare(LineVersions o1, LineVersions o2) {
-                    if (o1.getVersions() > o2.getVersions()) {
-                        return -1;
-                    } else if (o1.getVersions() < o2.getVersions()) {
-                        return 1;
-                    } else {
-                        return 0;
-                    }
-                }
-            });
-
-            // 取最近2条记录
-            List<Map<String, Object>> mapList = new ArrayList<>();
-            for (LineVersions lv: lineVersionses) {
-                String vname = lv.getName();
-                String rq = lv.getStartDate() == null ? "未知启用日期" : new DateTime(lv.getStartDate()).toString("YYYY年MM月dd日");
-                String sdesc = lv.getStatus() == 0 ? "历史" : (lv.getStatus() == 1 ? "当前" : "待更新");
-
-                Map<String, Object> value = new HashMap<>();
-                value.put("desc", vname + "-" + rq + "-" + sdesc);
-                value.put("version", lv.getVersions());
-
-                mapList.add(value);
-
-                if (mapList.size() == 2) {
-                    break;
-                }
-            }
-
             rtn.put("status", ResponseCode.SUCCESS);
-            rtn.put("data", mapList);
+            rtn.put("data", ttInfoService.getLineStationRouteVersions(lineid));
         } catch (Exception exp) {
             rtn.put("status", ResponseCode.ERROR);
@@ -72,6 +36,25 @@ public class TTInfoController extends BController&lt;TTInfo, Long&gt; {
     }
+    @RequestMapping(value = "/versiondesc/{lineid}/{version}")
+    public Map<String, Object> getLineVersionDesc(
+            @PathVariable(value = "lineid") Integer lineid,
+            @PathVariable(value = "version") Integer version) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            Map<String, String> desc = new HashMap<>();
+            desc.put("desc", ttInfoService.getLineVersionDesc(lineid, version));
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("data", desc);
+
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
     @RequestMapping(value = "/validate_name", method = RequestMethod.GET)
     public Map<String, Object> validate_name(@RequestParam Map<String, Object> param) {
         Map<String, Object> rtn = new HashMap<>();
@@ -108,10 +108,10 @@ public class TTInfoDetailController extends BController&lt;TTInfoDetail, Long&gt; {
     }
     @RequestMapping(value = "/zd_tcc", method = RequestMethod.GET)
-    public Map<String, Object> getZdAndTccInfo(Integer lineid, Integer xldir) {
+    public Map<String, Object> getZdAndTccInfo(Integer lineid, Integer xldir, Integer lineversion) {
         Map<String, Object> rtn = new HashMap<>();
         try {
-            List<Map<String, Object>> list = ttInfoDetailService.findZdAndTcc(lineid, xldir);
+            List<Map<String, Object>> list = ttInfoDetailService.findZdAndTcc(lineid, xldir, lineversion);
             rtn.put("status", ResponseCode.SUCCESS);
             rtn.put("data", list);
         } catch (Exception exp) {
 package com.bsth.data.car_out_info;
 import com.bsth.data.BasicData;
+import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
+import com.bsth.data.gpsdata_v2.entity.StationRoute;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.ScheduleComparator;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -166,6 +168,11 @@ public class CarOutInfoHandler {
      * @param list
      * @return
      */
+    private static String[] fls = new String[]{"in","out","ldks","venting","major"};
+    private static List<String> clearTypes;
+    static {
+        clearTypes = Arrays.asList(fls);
+    }
     private ScheduleRealInfo[] nexts(List<ScheduleRealInfo> list) {
         ScheduleRealInfo[] array = new ScheduleRealInfo[3];
         Collections.sort(list, schDFSJComparator);
@@ -181,11 +188,16 @@ public class CarOutInfoHandler {
                 continue;
             //进场、出场、2点间空驶
-            if (sch.getBcType().equals("in")
-                    || sch.getBcType().equals("out")
-                    || sch.getBcType().equals("ldks"))
+            if (clearTypes.contains(sch.getBcType()))
                 continue;
+            //区间
+            if (sch.getBcType().equals("region")){
+                //是否起点发出
+                if(!isStartOut(sch))
+                    continue;
+            }
+
             //有实发实达时间的
             if (StringUtils.isNotEmpty(sch.getFcsjActual())
                     || StringUtils.isNotEmpty(sch.getZdsjActual()))
@@ -199,4 +211,30 @@ public class CarOutInfoHandler {
         }
         return array;
     }
+
+    private static StationRouteComp sComp = new StationRouteComp();
+    private boolean isStartOut(ScheduleRealInfo sch) {
+        try{
+            List<StationRoute> list = GeoCacheData.getStationRoute(sch.getXlBm(), Integer.parseInt(sch.getXlDir()));
+
+            if(null == list && list.size() == 0)
+                return false;
+            //排序
+            Collections.sort(list, sComp);
+
+            if(sch.getQdzName().equals(list.get(0).getName()))
+                return true;
+        }catch (Exception e){
+            logger.error("", e);
+        }
+        return false;
+    }
+
+    private static class StationRouteComp implements Comparator<StationRoute> {
+
+        @Override
+        public int compare(StationRoute s1, StationRoute s2) {
+            return s1.getRouteSort() - s2.getRouteSort();
+        }
+    }
 }
@@ -4,18 +4,14 @@ import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.gpsdata_v2.handlers.*;
 import com.google.common.collect.ArrayListMultimap;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadFactory;
+import java.util.*;
+import java.util.concurrent.*;
 /**
  * 实时信号数据处理
@@ -24,12 +20,6 @@ import java.util.concurrent.ThreadFactory;
 @Component
 public class DataHandleProcess {
-    static Logger logger = LoggerFactory.getLogger(DataHandleProcess.class);
-    final static int POOL_SIZE = 25;
-
-    static ExecutorService threadPool = Executors.newFixedThreadPool(POOL_SIZE + 1, new HandlerThreadFactory());
-    public static CountDownLatch count;
-
     @Autowired
     GpsStateProcess gpsStateProcess;
     @Autowired
@@ -42,10 +32,17 @@ public class DataHandleProcess {
     OutStationProcess outStationProcess;
     @Autowired
     ReverseRouteProcess reverseRouteProcess;
-
     @Autowired
     GpsRealData gpsRealData;
+
+    static Logger logger = LoggerFactory.getLogger(DataHandleProcess.class);
+
+    final static int POOL_SIZE = 25;
+
+    static ExecutorService threadPool = Executors.newFixedThreadPool(POOL_SIZE + 1);
+    public static CountDownLatch count;
+
     static long lastTime;
     public static boolean isBlock() {
@@ -54,7 +51,7 @@ public class DataHandleProcess {
     public void handle(List<GpsEntity> list) {
         try {
-            if(list.size() == 0)
+            if (list.size() == 0)
                 return;
             lastTime = System.currentTimeMillis();
             //按设备号分组数据（一个设备的多条数据，必须在一个线程里跑）
@@ -76,21 +73,50 @@ public class DataHandleProcess {
             logger.info("analyse gps size: " + list.size() + ", ks: " + ks.size());
             count = new CountDownLatch(ks.size());
+            List<Future> fRs = new ArrayList<>(ks.size());
             for (Integer index : ks) {
-                threadPool.execute(new SignalHandleThread(dataListMap.get(index), count));
+                fRs.add(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);
+
+            logger.info("time , " + (System.currentTimeMillis() - lastTime));
         } catch (Exception e) {
             logger.error("", e);
         }
     }
+    static GpsComp comp = new GpsComp();
+
     public class SignalHandleThread implements Runnable {
         List<GpsEntity> list;
@@ -104,9 +130,12 @@ public class DataHandleProcess {
         @Override
         public void run() {
             try {
+                Collections.sort(list, comp);
                 for (GpsEntity gps : list) {
-                    try{
-                        if(Math.abs(gps.getTimestamp() - gps.getServerTimestamp()) > 1000 * 60 * 20)
+                    try {
+                        if (StringUtils.isEmpty(gps.getNbbm()))
+                            continue;
+                        if (Math.abs(gps.getTimestamp() - gps.getServerTimestamp()) > 1000 * 60 * 20)
                             continue;
                         gpsStateProcess.process(gps);//状态处理
@@ -118,30 +147,24 @@ public class DataHandleProcess {
                         outStationProcess.process(gps);//出站
                         GpsCacheData.putGps(gps);//历史gps缓存
-                    }catch (Exception e){
+                    } catch (Exception e) {
                         logger.error("", e);
                     }
                 }
+
             } finally {
                 if (count != null)
                     count.countDown();
+                logger.info(Thread.currentThread().getName() + " -countDown : " + count.getCount());
             }
         }
     }
-    static class MyUncaughtExceptionHandler implements Thread.UncaughtExceptionHandler {
-        @Override
-        public void uncaughtException(Thread t, Throwable e) {
-            logger.error("caught " , e);
-        }
-    }
+    public static class GpsComp implements Comparator<GpsEntity> {
-    static class HandlerThreadFactory implements ThreadFactory {
         @Override
-        public Thread newThread(Runnable r) {
-            Thread t = new Thread(r);
-            t.setUncaughtExceptionHandler(new MyUncaughtExceptionHandler());
-            return t;
+        public int compare(GpsEntity g1, GpsEntity g2) {
+            return g1.getTimestamp().compareTo(g2.getTimestamp());
         }
     }
 }
 \ No newline at end of file
@@ -84,7 +84,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         Calendar calendar = Calendar.getInstance();
         int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR);
-        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE,SERVER_TS from bsth_c_gps_info where days_year=329"; //+ dayOfYear;
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE,SERVER_TS from bsth_c_gps_info where days_year=346"; //+ dayOfYear;
         JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
         List<GpsEntity> list =
@@ -21,7 +21,7 @@ import java.util.List;
 @Component
 public class SafeDrivDataLoadThread extends Thread{
-    private final static String url = "http://118.178.187.115/bsth-safedriving/Crlcxb/realtimeInterface.do";
+    private final static String url = "http://180.166.5.82:9005/bsth-safedriving/Crlcxb/realtimeInterface.do";
     Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -70,6 +70,8 @@ public class DayOfSchedule {
     // 排序器
     private static ScheduleComparator.FCSJ schFCSJComparator;
+    private static ScheduleComparator.DFSJ schDFSJComparator;
+
     private static Long sch_max_id=-1L;
     @Autowired
@@ -102,6 +104,7 @@ public class DayOfSchedule {
         id2SchedulMap = new ConcurrentHashMap<>();
         pstBuffer = new ConcurrentLinkedQueue<>();
         schFCSJComparator = new ScheduleComparator.FCSJ();
+        schDFSJComparator = new ScheduleComparator.DFSJ();
         currSchDateMap = new HashMap<>();
         carExecutePlanMap = new ConcurrentHashMap<>();
@@ -580,6 +583,8 @@ public class DayOfSchedule {
      */
     public ScheduleRealInfo next(ScheduleRealInfo sch) {
         List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+        //排序
+        Collections.sort(list, schDFSJComparator);
         return next(list, sch);
     }
@@ -916,7 +921,7 @@ public class DayOfSchedule {
     public void reCalcExecPlan(String nbbm) {
         List<ScheduleRealInfo> list = nbbmScheduleMap.get(nbbm);
-        Collections.sort(list, schFCSJComparator);
+        Collections.sort(list, schDFSJComparator);
         ScheduleRealInfo sch = schAttrCalculator.calcCurrentExecSch(list);
         if(null != sch)
@@ -68,10 +68,17 @@ public class LateAdjustHandle implements ApplicationContextAware{
                 ScheduleRealInfo cancel = null;
                 //之前存在误点班次没有发出
                 ScheduleRealInfo old = lateSchMap.get(sch.getClZbh());
+
                 if(old != null && old.getDfsjT() < sch.getDfsjT()){
-                    remove(old);
-                    cancel = old;
-                    logger.info("【应发未到】old 班次 " + old.getId() + " -被覆盖！");
+                    //如果之前班次的 待发应到时间已经过了 3 分钟
+                    long t = System.currentTimeMillis();
+                    long dfEndTime = old.getDfsjT() + (old.getBcsj() * 60 * 1000);
+                    if((t - dfEndTime) > 1000 * 60 * 3){
+
+                        remove(old);
+                        cancel = old;
+                        logger.info("【应发未到】old 班次 " + old.getId() + " -被覆盖！");
+                    }
                 }
                 lateSchMap.put(sch.getClZbh(), sch);
@@ -164,7 +171,7 @@ public class LateAdjustHandle implements ApplicationContextAware{
             }
         }catch (Exception e){
             e.printStackTrace();
-            logger.error("", e);
+            logger.error("late2 car arrive", e);
         }
     }
@@ -152,7 +152,7 @@ public class SchedulePstThread extends Thread {
                     ps.setBoolean(40, sch.isOnline());
                     ps.setString(41, sch.getAdjustExps());
                     ps.setBoolean(42, sch.isReissue());
-                    ps.setDouble(43, sch.getJhlcOrig());
+                    ps.setDouble(43, sch.getJhlcOrig()==null?0:sch.getJhlcOrig());
                     ps.setInt(44, sch.getSiginCompate());
                     ps.setInt(45, sch.getDriftStatus());
                     ps.setBoolean(46, sch.isCcService());
+package com.bsth.entity.geo_data;
+
+import java.util.Date;
+
+/**
+ * 线路版本信息
+ * Created by panzhao on 2017/12/18.
+ */
+public class GeoLineVersionInfo {
+    /** ID 主键(唯一标识符) int length(11) */
+    private Integer id;
+
+    /** 线路版本名字 varchar length(50)
+     * 	给排版人员选版本使用
+     *  */
+    private String name;
+
+    /** 线路ID  int length(11) */
+    private Integer line;
+
+    /** 线路编码 varchar length(50) */
+    private String lineCode;
+
+    /** 版本号  int length(11)  */
+    private int versions;
+
+    /** 启用日期 timestamp  */
+    private Date startDate;
+
+    /** 终止日期 timestamp  */
+    private Date endDate;
+
+    /** 创建日期 timestamp  */
+    private Date createDate;
+
+    /** 修改日期 timestamp */
+    private Date updateDate;
+
+    /** 备注 varchar length(50) */
+    private String remark;
+
+    /** 版本状态 int length(11)
+     *  0（历史版本），1（当前版本），2（待更新版本）
+     */
+    private int status;
+
+    /**
+     * 是否发布 int length(1)
+     * 0（没有），1（发布）
+     */
+    private int isupdate;
+
+    private String lineName;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public int getVersions() {
+        return versions;
+    }
+
+    public void setVersions(int versions) {
+        this.versions = versions;
+    }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public int getIsupdate() {
+        return isupdate;
+    }
+
+    public void setIsupdate(int isupdate) {
+        this.isupdate = isupdate;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public Integer getLine() {
+        return line;
+    }
+
+    public void setLine(Integer line) {
+        this.line = line;
+    }
+}
 package com.bsth.entity.geo_data;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import java.util.List;
+
 /**
  * Created by panzhao on 2017/12/7.
  */
@@ -19,14 +23,17 @@ public class GeoStation {
     private String stationMark;
-    private Integer version;
+    private Integer versions;
     private Float gLonx;
     private Float gLaty;
+    @JsonIgnore
     private String gPolygonGrid;
+    private List<String> bdCoords;
+
     private Integer radius;
     private String shapesType;
@@ -87,14 +94,6 @@ public class GeoStation {
         this.stationMark = stationMark;
     }
-    public Integer getVersion() {
-        return version;
-    }
-
-    public void setVersion(Integer version) {
-        this.version = version;
-    }
-
     public Float getgLonx() {
         return gLonx;
     }
@@ -134,4 +133,20 @@ public class GeoStation {
     public void setShapesType(String shapesType) {
         this.shapesType = shapesType;
     }
-}
+
+    public List<String> getBdCoords() {
+        return bdCoords;
+    }
+
+    public void setBdCoords(List<String> bdCoords) {
+        this.bdCoords = bdCoords;
+    }
+
+    public Integer getVersions() {
+        return versions;
+    }
+
+    public void setVersions(Integer versions) {
+        this.versions = versions;
+    }
+}
 \ No newline at end of file
@@ -67,6 +67,10 @@ public class TTInfo extends BEntity {
     /** 最近备份日期 */
     private Date lastBackUpDate;
+    /** 线路版本（bsth_c_line_versions表对应字段） */
+    @Column(nullable = false)
+    private int lineVersion;
+
     public TTInfo() {}
     public TTInfo(Object id, Object xlid, Object name, Object nds, Object sds) {
         if (id != null) {
@@ -109,7 +113,9 @@ public class TTInfo extends BEntity {
                 .setUpdateUser(getUpdateBy() == null ? 0 : getUpdateBy().getId())
                 .setUpdateUserName(getUpdateBy() == null ? "" : getUpdateBy().getUserName())
                 .setCreateDate(getCreateDate() == null ? 0l : getCreateDate().getTime())
-                .setUpdateDate(getUpdateDate() == null ? 0l : getUpdateDate().getTime());
+                .setUpdateDate(getUpdateDate() == null ? 0l : getUpdateDate().getTime())
+                .setLineVersion(lineVersion)
+                ;
     }
@@ -216,4 +222,12 @@ public class TTInfo extends BEntity {
     public void setLastBackUpDate(Date lastBackUpDate) {
         this.lastBackUpDate = lastBackUpDate;
     }
+
+    public int getLineVersion() {
+        return lineVersion;
+    }
+
+    public void setLineVersion(int lineVersion) {
+        this.lineVersion = lineVersion;
+    }
 }
@@ -36,6 +36,10 @@ public class TTInfoBackup {
     @Lob
     private byte[] backUpInfo;
+    /** 线路版本（bsth_c_line_versions表对应字段） */
+    @Column(nullable = false)
+    private int lineVersion;
+
     public Long getId() {
         return id;
     }
@@ -91,4 +95,12 @@ public class TTInfoBackup {
     public void setBackUpInfo(byte[] backUpInfo) {
         this.backUpInfo = backUpInfo;
     }
+
+    public int getLineVersion() {
+        return lineVersion;
+    }
+
+    public void setLineVersion(int lineVersion) {
+        this.lineVersion = lineVersion;
+    }
 }
@@ -100,6 +100,10 @@ public class TTInfoDetail extends BEntity {
     /** 备注 */
     private String remark;
+    /** 线路版本（bsth_c_line_versions表对应字段） */
+    @Column(nullable = false)
+    private int lineVersion;
+
     /**
      * 输出proto生成的builder
      * @return
@@ -126,6 +130,7 @@ public class TTInfoDetail extends BEntity {
                 .setIsFB(isFB == null ? false : isFB)
                 .setIsTS(isTS == null ? false : isTS)
                 .setRemark(remark == null ? "" : remark)
+                .setLineVersion(lineVersion)
                 ;
     }
@@ -320,4 +325,12 @@ public class TTInfoDetail extends BEntity {
     public void setIsTS(Boolean isTS) {
         this.isTS = isTS;
     }
+
+    public int getLineVersion() {
+        return lineVersion;
+    }
+
+    public void setLineVersion(int lineVersion) {
+        this.lineVersion = lineVersion;
+    }
 }
 package com.bsth.service.geo_data;
+import com.bsth.entity.geo_data.GeoRoad;
 import com.bsth.entity.geo_data.GeoStation;
 import java.util.Map;
@@ -15,5 +16,19 @@ public interface GeoDataService {
     Map<String, Object> findGeoRoad(String lineCode);
-    Map<String,Object> updateBufferInfo(GeoStation station);
+    Map<String, Object> updateBufferInfo(GeoStation station);
+
+    Map<String, Object> updateStationName(Map<String, Object> map);
+
+    Map<String,Object> addNewStationRoute(String lineCode, int upDown,int versions, String stationName, Float lat, Float lng, int prevRouteId);
+
+    Map<String,Object> destroyStation(GeoStation station);
+
+    Map<String,Object> updateRoadInfo(GeoRoad road);
+
+    Map<String,Object> destroyRoad(GeoRoad road);
+
+    Map<String,Object> addNewRoadRoute(String lineCode, int upDown, int versions, String sectionName,String crosesRoad, String coords, int prevRouteId);
+
+    Map<String,Object> findVersionInfo(String lineCode);
 }
 package com.bsth.service.geo_data.impl;
 import com.bsth.common.ResponseCode;
+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.util.GetUIDAndCode;
 import com.bsth.util.TransGPS;
 import com.google.common.base.Splitter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.*;
 /**
  * Created by panzhao on 2017/12/8.
@@ -33,15 +39,19 @@ public class GeoDataServiceImpl implements GeoDataService {
     public Map<String, Object> findGeoStations(String lineCode) {
         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";
+        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";
             List<GeoStation> list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(GeoStation.class));
+            for (GeoStation station : list) {
+                if (station.getShapesType().equals("d"))
+                    station.setBdCoords(multiWgsToBd(station.getgPolygonGrid(), 9, 3));
+            }
             map.put("status", ResponseCode.SUCCESS);
             map.put("list", list);
-        }catch (Exception e){
+        } catch (Exception e) {
             logger.error("", e);
             map.put("status", ResponseCode.ERROR);
             map.put("msg", "服务器出现异常");
@@ -52,18 +62,18 @@ public class GeoDataServiceImpl implements GeoDataService {
     @Override
     public Map<String, Object> findGeoRoad(String lineCode) {
         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";
+        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";
             List<GeoRoad> list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(GeoRoad.class));
-            for(GeoRoad road : list){
-                road.setBdCoords(multiWgsToBd(road.getGsectionVector()));
+            for (GeoRoad road : list) {
+                road.setBdCoords(multiWgsToBd(road.getGsectionVector(), 11, 2));
             }
             map.put("status", ResponseCode.SUCCESS);
             map.put("list", list);
-        }catch (Exception e){
+        } catch (Exception e) {
             logger.error("", e);
             map.put("status", ResponseCode.ERROR);
             map.put("msg", "服务器出现异常");
@@ -73,13 +83,14 @@ public class GeoDataServiceImpl implements GeoDataService {
     /**
      * 编辑缓冲区信息
+     *
      * @param station
      * @return
      */
     @Override
     public Map<String, Object> updateBufferInfo(GeoStation station) {
         Map<String, Object> rs = new HashMap<>();
-        try{
+        try {
             //坐标转换
             TransGPS.Location loc = TransGPS.LocationMake(station.getgLonx(), station.getgLaty());
             loc = TransGPS.bd_decrypt(loc);
@@ -88,20 +99,167 @@ public class GeoDataServiceImpl implements GeoDataService {
             station.setgLonx(Float.parseFloat(String.valueOf(loc.getLng())));
             String sql;
-            if(station.getShapesType().equals("r")){
-                sql = "update bsth_c_station set g_lonx=?, g_laty=?, radius=? where station_cod=?";
-                int rsCount = jdbcTemplate.update(sql, station.getgLonx(), station.getgLaty(), station.getRadius(), station.getStationCode());
+            String shapesType = station.getShapesType();
+            int rsCount = -1;
+            if (shapesType.equals("r")) {
+                sql = "update bsth_c_station set g_lonx=?, g_laty=?, radius=?,shapes_type='r' where station_cod=?";
+                rsCount = jdbcTemplate.update(sql, station.getgLonx(), station.getgLaty(), station.getRadius(), station.getStationCode());
+            } else if (shapesType.equals("d")) {
+                //多边形坐标转换
+                String bdPolygon = "POLYGON((" + station.getgPolygonGrid() + "))";
+                String wgsPolygon = "POLYGON((" + bdPolygon2Wgs(station.getgPolygonGrid()) + "))";
+                sql = "update bsth_c_station set g_lonx=?, g_laty=?,shapes_type='d', radius=null,b_polygon_grid=ST_GeomFromText('" + bdPolygon + "'),g_polygon_grid=ST_GeomFromText('" + wgsPolygon + "') where station_cod=?";
+
+                rsCount = jdbcTemplate.update(sql, station.getgLonx(), station.getgLaty(), station.getStationCode());
+            }
+
+            //从数据库里重新查询对象
+            if (rsCount > 0) {
+                rs.put("station", findOne(station.getId()));
+                rs.put("status", ResponseCode.SUCCESS);
+            }
+
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", "服务器出现异常");
+        }
+        return rs;
+    }
+
+    /**
+     * 修改站点路由和站点名称
+     *
+     * @param map
+     * @return
+     */
+    @Override
+    public Map<String, Object> updateStationName(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 {
+
+            int id = Integer.parseInt(map.get("id").toString());
+            String name = map.get("stationName").toString();
+            String code = map.get("stationCode").toString();
+            //String lineCode = map.get("lineCode").toString();
+            //String stationMark = map.get("stationMark").toString();
-                if(rsCount > 0){
-                    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 id="+station.getId()+" AND destroy = 0) t1 LEFT JOIN bsth_c_station t2 ON t1.station_code = t2.station_cod";
-                    List list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(GeoStation.class));
+            //更新历史站点路由
+            jdbcTemplate.update("update bsth_c_ls_stationroute set station_name=? where id=?", name, id);
+            //更新站点
+            jdbcTemplate.update("update bsth_c_station set station_name=? where station_cod=?", name, code);
-                    rs.put("station", list.get(0));
-                    rs.put("status", ResponseCode.SUCCESS);
+            tran.commit(status);
+
+            rs.put("station", findOne(id));
+            rs.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            tran.rollback(status);
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", "服务器出现异常");
+        }
+        return rs;
+    }
+
+    @Override
+    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<>();
+
+        //编程式事务
+        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
+        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
+        TransactionStatus status = tran.getTransaction(def);
+        try {
+            //根据站点编码，查询站点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;
+            List<SaveRoadRouteDTO> routes = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(SaveRoadRouteDTO.class));
+
+            Collections.sort(routes, new RoadRouteComp());
+
+            long sCode = GetUIDAndCode.getSectionId();
+            //转wgs
+            String wgsCoord = "LINESTRING(" + bdPolygon2Wgs(coords) + ")";
+            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(),?)";
+
+            jdbcTemplate.update(sql, sCode, sCode, sectionName, crosesRoad, 1);
+
+
+            SaveRoadRouteDTO srr;
+            int currentNo = -1,
+                    no = 100, step = 100;
+
+            if (prevRouteId == -1) {
+                //起点站
+                currentNo = no;
+                no += step;
+            }
+            //重新排序路由
+            for (int i = 0, size = routes.size(); i < size; i++) {
+                srr = routes.get(i);
+                srr.setSectionrouteCode(no += step);
+                if (srr.getId().intValue() == prevRouteId) {
+                    no += step;
+                    currentNo = no;
                 }
             }
-        }catch (Exception e){
+            srr = new SaveRoadRouteDTO();
+            srr.setLine(lineId);
+            srr.setLineCode(lineCode);
+            srr.setDirections(upDown);
+            srr.setVersions(versions);
+
+            srr.setSectionrouteCode(currentNo);
+            srr.setSection(sCode);
+            srr.setSectionCode(sCode + "");
+            srr.setIsRoadeSpeed(0);
+            srr.setDestroy(0);
+            Date d = new Date();
+            srr.setCreateDate(d);
+            srr.setUpdateDate(d);
+
+            final List<SaveRoadRouteDTO> saveList = routes;
+            //insert 新路由 （ID自增）
+            jdbcTemplate.update("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(?,?,?,?,?,?,?,?,?,?,?)", srr.getLineCode(), srr.getSectionCode(), srr.getSectionrouteCode(), srr.getDirections(), srr.getLine(), srr.getSection(), srr.getCreateDate(), srr.getUpdateDate(), versions, srr.getDestroy(), srr.getIsRoadeSpeed());
+
+            // update 原路由
+            jdbcTemplate.batchUpdate("update bsth_c_ls_sectionroute set sectionroute_code=? where id=?"
+                    , new BatchPreparedStatementSetter() {
+                        @Override
+                        public void setValues(PreparedStatement ps, int i) throws SQLException {
+                            SaveRoadRouteDTO srr = saveList.get(i);
+                            ps.setInt(1, srr.getSectionrouteCode());
+                            ps.setInt(2, srr.getId());
+                        }
+
+                        @Override
+                        public int getBatchSize() {
+                            return saveList.size();
+                        }
+                    });
+
+            tran.commit(status);
+
+            //返回更新之后的数据
+            List<GeoRoad> list = findRoadByUpdown(lineCode, upDown, versions);
+            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", "服务器出现异常");
@@ -110,24 +268,334 @@ public class GeoDataServiceImpl implements GeoDataService {
     }
     /**
+     * 获取线路版本信息
+     * @param lineCode
+     * @return
+     */
+    @Override
+    public Map<String, Object> findVersionInfo(String lineCode) {
+        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+"'";
+
+            List<GeoLineVersionInfo> list =
+            jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(GeoLineVersionInfo.class));
+
+            rs.put("list", 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> addNewStationRoute(String lineCode, int upDown, int versions, String stationName, Float lat, Float lng, int prevRouteId) {
+        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 {
+            //根据线路编码，查询线路ID
+            int lineId = jdbcTemplate.queryForObject("select id from bsth_c_line where line_code=" + lineCode, Integer.class);
+
+            String sql = "select * from bsth_c_ls_stationroute where line_code='" + lineCode + "' and line=" + lineId + " and directions=" + upDown + " and destroy=0 and versions=" + versions;
+            List<SaveStationRouteDTO> routes = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(SaveStationRouteDTO.class));
+
+            for (SaveStationRouteDTO s : routes) {
+                if (s.getStationName().equals(stationName)) {
+
+                    rs.put("status", ResponseCode.ERROR);
+                    rs.put("msg", "重复的站点路由名称！");
+                    return rs;
+                }
+            }
+            //按路由顺序排列
+            Collections.sort(routes, new StationRouteComp());
+
+            //转WGS
+            TransGPS.Location wgsLoc = TransGPS.transformFromGCJToWGS(TransGPS.bd_decrypt(TransGPS.LocationMake(Double.parseDouble(String.valueOf(lng)), Double.parseDouble(String.valueOf(lat)))));
+
+            //insert 站点
+            long sCode = GetUIDAndCode.getStationId();
+            jdbcTemplate.update("insert into bsth_c_station(id, station_cod, station_name, db_type, b_jwpoints, g_lonx, g_laty, destroy, radius, shapes_type, versions) " +
+                    " values(?,?,?,?,?,?,?,?,?,?,?)", sCode, sCode, stationName, "b", lng + " " + lat, wgsLoc.getLng(), wgsLoc.getLat(), 0, 88, "r", 1);
+
+
+            SaveStationRouteDTO sr;
+            int currentNo = -1,
+                    no = 100, step = 100;
+
+            if (prevRouteId == -1) {
+                //起点站
+                currentNo = no;
+                no += step;
+            }
+            //重新排序路由
+            for (int i = 0, size = routes.size(); i < size; i++) {
+                sr = routes.get(i);
+                sr.setStationRouteCode(no += step);
+                if (sr.getId().intValue() == prevRouteId) {
+                    no += step;
+                    currentNo = no;
+                }
+            }
+
+            SaveStationRouteDTO nsr = new SaveStationRouteDTO();
+            nsr.setLine(lineId);
+            nsr.setLineCode(lineCode);
+            nsr.setDirections(upDown);
+            nsr.setVersions(versions);
+            nsr.setStationRouteCode(currentNo);
+            nsr.setStation(sCode);
+            nsr.setStationCode(sCode + "");
+            nsr.setStationName(stationName);
+            nsr.setDistances(0d);
+            nsr.setToTime(0d);
+            Date d = new Date();
+            nsr.setCreateDate(d);
+            nsr.setUpdateDate(d);
+            nsr.setDestroy(0);
+
+            //routes.add(sr);
+
+            //重新标记mark
+            Collections.sort(routes, new StationRouteComp());
+            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");
+
+            final List<SaveStationRouteDTO> saveList = routes;
+            //insert 新路由 （ID自增）
+            jdbcTemplate.update("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(?,?,?,?,?,?,?,?,?,?,?,?,?,?)"
+                    , nsr.getLine(), nsr.getStation(), nsr.getStationName(), nsr.getStationRouteCode(), nsr.getLineCode(), nsr.getStationCode(), nsr.getStationMark()
+                    , nsr.getDistances(), nsr.getToTime(), nsr.getDestroy(), nsr.getVersions(), nsr.getCreateDate(), nsr.getUpdateDate(), nsr.getDirections());
+
+            // 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(lineCode, upDown, versions);
+
+            rs.put("list", list);
+            rs.put("newStationRouteCode", currentNo);
+            rs.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            tran.rollback(status);
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", "服务器出现异常");
+        }
+        return rs;
+    }
+
+    private List<GeoStation> findByUpdown(String lineCode, int upDown, int versions) {
+        //返回更新之后的数据
+        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 directions=" + upDown + " and destroy=0 and versions=" + versions + ") t1 LEFT JOIN bsth_c_station t2 on t1.station_code=t2.station_cod";
+        List<GeoStation> list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(GeoStation.class));
+
+        for (GeoStation station : list) {
+            if (station.getShapesType().equals("d"))
+                station.setBdCoords(multiWgsToBd(station.getgPolygonGrid(), 9, 3));
+        }
+        return list;
+    }
+
+    private List<GeoRoad> findRoadByUpdown(String lineCode, int upDown, int versions) {
+        //返回更新之后的数据
+        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 directions=" + upDown + " and destroy=0 and versions=" + versions + ") t1 LEFT JOIN bsth_c_section t2 on t1.section_code=t2.section_code";
+        List<GeoRoad> list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(GeoRoad.class));
+
+        for (GeoRoad road : list) {
+            road.setBdCoords(multiWgsToBd(road.getGsectionVector(), 11, 2));
+        }
+        return list;
+    }
+
+    @Override
+    public Map<String, Object> destroyStation(GeoStation station) {
+        Map<String, Object> rs = new HashMap<>();
+
+        try {
+            String sql = "update bsth_c_ls_stationroute set destroy=1 where id=?";
+            jdbcTemplate.update(sql, station.getId());
+
+            //返回更新之后的数据
+            List<GeoStation> list = findByUpdown(station.getLineCode(), station.getDirections(), station.getVersions());
+            rs.put("list", 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> destroyRoad(GeoRoad road) {
+        Map<String, Object> rs = new HashMap<>();
+
+        try {
+            String sql = "update bsth_c_ls_sectionroute set destroy=1 where id=?";
+            jdbcTemplate.update(sql, road.getId());
+
+            //返回更新之后的数据
+            List<GeoRoad> list = findRoadByUpdown(road.getLineCode(), road.getDirections(), road.getVersions());
+            rs.put("list", 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> updateRoadInfo(GeoRoad road) {
+        Map<String, Object> rs = new HashMap<>();
+
+        try {
+            //坐标转换
+            String bdPolyline = "LINESTRING(" + road.getGsectionVector() + ")";
+            String wgsPolyline = "LINESTRING(" + bdPolygon2Wgs(road.getGsectionVector()) + ")";
+
+            String sql = "update bsth_c_section set section_name=?, croses_road=?, bsection_vector=ST_GeomFromText('" + bdPolyline + "'),gsection_vector=ST_GeomFromText('" + wgsPolyline + "'),update_date=sysdate() where section_code=?";
+
+            int rsCount = jdbcTemplate.update(sql, road.getSectionName(), road.getCrosesRoad(), road.getSectionCode());
+
+            //从数据库里重新查询对象
+            if (rsCount > 0) {
+                rs.put("road", findOneRoad(road.getId()));
+                rs.put("status", ResponseCode.SUCCESS);
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", "服务器出现异常");
+        }
+        return rs;
+    }
+
+
+    /**
+     * 根据路由ID 获取站点
+     *
+     * @param id
+     * @return
+     */
+    private GeoStation findOne(int id) {
+        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 id=" + id + " AND destroy = 0) t1 LEFT JOIN bsth_c_station t2 ON t1.station_code = t2.station_cod";
+        List<GeoStation> list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(GeoStation.class));
+
+        GeoStation s = list.get(0);
+        if (s.getShapesType().equals("d"))
+            s.setBdCoords(multiWgsToBd(s.getgPolygonGrid(), 9, 3));
+
+        return s;
+    }
+
+    private GeoRoad findOneRoad(int id) {
+        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 id=" + id + ") t1 LEFT JOIN bsth_c_section t2 ON t1.section_code = t2.section_code";
+        List<GeoRoad> list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(GeoRoad.class));
+
+        for (GeoRoad road : list) {
+            road.setBdCoords(multiWgsToBd(road.getGsectionVector(), 11, 2));
+        }
+        return list.size() > 0 ? list.get(0) : null;
+    }
+
+    private String bdPolygon2Wgs(String bdPolygon) {
+        StringBuilder wgsPolygon = new StringBuilder();
+        List<String> list = Splitter.on(",").splitToList(bdPolygon);
+        String[] array;
+
+        TransGPS.Location location;
+        for (String p : list) {
+            array = p.split(" ");
+            location = TransGPS.transformFromGCJToWGS(TransGPS.bd_decrypt(TransGPS.LocationMake(Double.parseDouble(array[0]), Double.parseDouble(array[1]))));
+
+            wgsPolygon.append(location.getLng() + " " + location.getLat() + ",");
+        }
+
+        if (wgsPolygon.length() > 0) {
+            wgsPolygon.deleteCharAt(wgsPolygon.length() - 1);
+        }
+        return wgsPolygon.toString();
+    }
+
+    /**
      * wgs 坐标数组转 百度
      *
      * @return
      */
-    private List<String> multiWgsToBd(String crdStr) {
+    private List<String> multiWgsToBd(String crdStr, int si, int ei) {
         List<String> bdList = new ArrayList<>();
-        List<String> gList = Splitter.on(",").splitToList(crdStr.substring(11, crdStr.length() - 2));
+        List<String> gList = Splitter.on(",").splitToList(crdStr.substring(si, crdStr.length() - ei));
         TransGPS.Location location;
-        //StringBuilder itemStr = new StringBuilder();
         String[] cds;
-        for(String gs : gList){
+        for (String gs : gList) {
             cds = gs.split(" ");
             location = TransGPS.bd_encrypt(TransGPS.transformFromWGSToGCJ(TransGPS.LocationMake(Double.parseDouble(cds[0]), Double.parseDouble(cds[1]))));
-            //itemStr.append(location.getLng() + " " + location.getLat() + ",");
             bdList.add(location.getLng() + " " + location.getLat());
         }
         return bdList;
     }
-}
+
+    private static class StationRouteComp implements Comparator<SaveStationRouteDTO> {
+
+        @Override
+        public int compare(SaveStationRouteDTO s1, SaveStationRouteDTO s2) {
+            return s1.getStationRouteCode() - s2.getStationRouteCode();
+        }
+    }
+
+    private static class RoadRouteComp implements Comparator<SaveRoadRouteDTO> {
+
+        @Override
+        public int compare(SaveRoadRouteDTO s1, SaveRoadRouteDTO s2) {
+            return s1.getSectionrouteCode() - s2.getSectionrouteCode();
+        }
+    }
+}
 \ No newline at end of file
+package com.bsth.service.geo_data.impl;
+
+import java.util.Date;
+
+/**
+ * Created by panzhao on 2017/12/17.
+ */
+public class SaveRoadRouteDTO {
+
+    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 long section;
+
+    // 线路ID
+    private int 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 long getSection() {
+        return section;
+    }
+
+    public void setSection(long section) {
+        this.section = section;
+    }
+
+    public int getLine() {
+        return line;
+    }
+
+    public void setLine(int line) {
+        this.line = line;
+    }
+}
+package com.bsth.service.geo_data.impl;
+
+import java.util.Date;
+
+/**
+ * 站点路由 jdbc 入库数据
+ * Created by panzhao on 2017/12/14.
+ */
+public class SaveStationRouteDTO {
+
+    //站点路由ID
+    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;
+
+    // 站点ID
+    private long station;
+
+    // 线路ID
+    private int 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 long getStation() {
+        return station;
+    }
+
+    public void setStation(long station) {
+        this.station = station;
+    }
+
+    public int getLine() {
+        return line;
+    }
+
+    public void setLine(int line) {
+        this.line = line;
+    }
+}
@@ -1252,6 +1252,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 //入库
                 dayOfSchedule.save(sch);
+                //重新计算当前执行班次
+                dayOfSchedule.reCalcExecPlan(sch.getClZbh());
                 rs.put("status", ResponseCode.SUCCESS);
                 rs.put("t", sch);
@@ -54,5 +54,5 @@ public interface TTInfoDetailService extends BService&lt;TTInfoDetail, Long&gt; {
     Map<String, Object> skbDetailMxSave(Map<String, Object> map);
-    List<Map<String, Object>> findZdAndTcc(int lineid, int xldir);
+    List<Map<String, Object>> findZdAndTcc(int lineid, int xldir, int lineversion);
 }
@@ -3,6 +3,9 @@ package com.bsth.service.schedule;
 import com.bsth.entity.schedule.TTInfo;
 import com.bsth.service.schedule.exception.ScheduleException;
+import java.util.List;
+import java.util.Map;
+
 /**
  * Created by xu on 16/5/12.
  */
@@ -14,4 +17,8 @@ public interface TTInfoService extends BService&lt;TTInfo, Long&gt; {
     void backUp(Long ttInfoId) throws ScheduleException;
+    List<Map<String, Object>> getLineStationRouteVersions(Integer lineId);
+
+    String getLineVersionDesc(Integer lineId, Integer version);
+
 }
@@ -94,17 +94,17 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
      * @param xldir 线路上下行
      * @return
      */
-    public List<Map<String, Object>> findZdAndTcc(int lineid, int xldir) {
+    public List<Map<String, Object>> findZdAndTcc(int lineid, int xldir, int lineversion) {
         String sql = "select * from " +
                 "(" +
-                "select station_code as zcode, station_name as zname, concat(station_name, '(站点)') as aname from bsth_c_stationroute " +
-                "where destroy = 0 and line = ? and directions = ? " +
+                "select station_code as zcode, station_name as zname, concat(station_name, '(站点)') as aname from bsth_c_ls_stationroute " +
+                "where destroy = 0 and line = ? and directions = ? and versions = ? " +
                 "union all " +
                 "select park_code as zcode, park_name as zname, concat(park_name, '(停车场)') as aname from bsth_c_car_park " +
                 "where destroy = 0 " +
                 ") a ";
-        return jdbcTemplate.queryForList(sql, lineid, xldir);
+        return jdbcTemplate.queryForList(sql, lineid, xldir, lineversion);
     }
     @Override
 package com.bsth.service.schedule.impl;
+import com.bsth.entity.LineVersions;
 import com.bsth.entity.schedule.TTInfo;
 import com.bsth.entity.schedule.TTInfoBackup;
 import com.bsth.entity.schedule.TTInfoDetail;
 import com.bsth.repository.schedule.TTInfoBackupRepository;
 import com.bsth.repository.schedule.TTInfoDetailRepository;
 import com.bsth.repository.schedule.TTInfoRepository;
+import com.bsth.service.LineVersionsService;
 import com.bsth.service.schedule.TTInfoService;
 import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.utils.TimeTableProto;
 import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,10 +24,7 @@ import org.springframework.util.CollectionUtils;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 /**
  * Created by xu on 16/12/20.
@@ -40,6 +40,8 @@ public class TTInfoServiceImpl extends BServiceImpl&lt;TTInfo, Long&gt; implements TTI
     private TTInfoDetailRepository ttInfoDetailRepository;
     @Autowired
     private TTInfoBackupRepository ttInfoBackupRepository;
+    @Autowired
+    private LineVersionsService lineVersionsService;
     @Override
     public void validate_name(TTInfo ttInfo) throws ScheduleException {
@@ -137,7 +139,70 @@ public class TTInfoServiceImpl extends BServiceImpl&lt;TTInfo, Long&gt; implements TTI
     }
     @Override
-    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
+    public List<Map<String, Object>> getLineStationRouteVersions(Integer lineId) {
+        // 获取线路版本
+        List<LineVersions> lineVersionsList = lineVersionsService.findByLineCode(lineId);
+        // 按照version版本降序排序
+        Collections.sort(lineVersionsList, new Comparator<LineVersions>() {
+            @Override
+            public int compare(LineVersions o1, LineVersions o2) {
+                if (o1.getVersions() > o2.getVersions()) {
+                    return -1;
+                } else if (o1.getVersions() < o2.getVersions()) {
+                    return 1;
+                } else {
+                    return 0;
+                }
+            }
+        });
+
+        // 取最开始的2条记录
+        List<Map<String, Object>> mapList = new ArrayList<>();
+        for (LineVersions lv: lineVersionsList) {
+            String vname = lv.getName();
+            String rq = lv.getStartDate() == null ? "未知启用日期" : new DateTime(lv.getStartDate()).toString("YYYY年MM月dd日");
+            String sdesc = lv.getStatus() == 0 ? "历史" : (lv.getStatus() == 1 ? "当前" : "待更新");
+
+            Map<String, Object> value = new HashMap<>();
+            value.put("desc", vname + "-" + rq + "-" + sdesc);
+            value.put("version", lv.getVersions());
+
+            mapList.add(value);
+
+            if (mapList.size() == 2) {
+                break;
+            }
+        }
+
+        return mapList;
+    }
+
+    @Override
+    public String getLineVersionDesc(Integer lineId, Integer version) {
+        // 查找指定版本，并判定
+        Map<String, Object> param = new HashMap<>();
+        param.put("line_eq", lineId);
+        param.put("versions_eq", version);
+        List<LineVersions> lineVersionsList = (List<LineVersions>) lineVersionsService.list(param);
+
+        LineVersions lv;
+        if (CollectionUtils.isEmpty(lineVersionsList)) {
+            return "未知版本";
+        } else if (lineVersionsList.size() > 1) {
+            return "重复版本";
+        } else {
+            lv = lineVersionsList.get(0);
+        }
+
+        String vname = lv.getName();
+        String rq = lv.getStartDate() == null ? "未知启用日期" : new DateTime(lv.getStartDate()).toString("YYYY年MM月dd日");
+        String sdesc = lv.getStatus() == 0 ? "历史" : (lv.getStatus() == 1 ? "当前" : "待更新");
+
+        return String.format("%s-%s-%s", vname, rq, sdesc);
+    }
+
+    @Override
+    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.REPEATABLE_READ)
     public void backUp(Long ttInfoId) throws ScheduleException {
         LOG.info(">>>>>>开始备份时刻表<<<<<<");
@@ -165,6 +230,7 @@ public class TTInfoServiceImpl extends BServiceImpl&lt;TTInfo, Long&gt; implements TTI
             ttInfoBackup.setXlName(ttInfo.getXl().getName());
             ttInfoBackup.setTtInfo(ttInfoId);
             ttInfoBackup.setTtInfoName(ttInfo.getName());
+            ttInfoBackup.setLineVersion(ttInfo.getLineVersion());
             ttInfoBackup.setBackUpDate(backupdate);
             ttInfoBackup.setBackUpInfo(backupbytes);
@@ -268,6 +268,15 @@ public final class TimeTableProto {
      */
     com.bsth.service.schedule.utils.TimeTableProto.TTInfoDetailOrBuilder getBcInfoOrBuilder(
         int index);
+
+    /**
+     * <pre>
+     * 线路版本
+     * </pre>
+     *
+     * <code>uint32 lineVersion = 18;</code>
+     */
+    int getLineVersion();
   }
   /**
    * Protobuf type {@code timetable.TTInfo}
@@ -298,6 +307,7 @@ public final class TimeTableProto {
       createDate_ = 0L;
       updateDate_ = 0L;
       bcInfo_ = java.util.Collections.emptyList();
+      lineVersion_ = 0;
     }
     @java.lang.Override
@@ -421,6 +431,11 @@ public final class TimeTableProto {
                   input.readMessage(com.bsth.service.schedule.utils.TimeTableProto.TTInfoDetail.parser(), extensionRegistry));
               break;
             }
+            case 144: {
+
+              lineVersion_ = input.readUInt32();
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -914,6 +929,19 @@ public final class TimeTableProto {
       return bcInfo_.get(index);
     }
+    public static final int LINEVERSION_FIELD_NUMBER = 18;
+    private int lineVersion_;
+    /**
+     * <pre>
+     * 线路版本
+     * </pre>
+     *
+     * <code>uint32 lineVersion = 18;</code>
+     */
+    public int getLineVersion() {
+      return lineVersion_;
+    }
+
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -977,6 +1005,9 @@ public final class TimeTableProto {
       for (int i = 0; i < bcInfo_.size(); i++) {
         output.writeMessage(17, bcInfo_.get(i));
       }
+      if (lineVersion_ != 0) {
+        output.writeUInt32(18, lineVersion_);
+      }
     }
     public int getSerializedSize() {
@@ -1045,6 +1076,10 @@ public final class TimeTableProto {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(17, bcInfo_.get(i));
       }
+      if (lineVersion_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(18, lineVersion_);
+      }
       memoizedSize = size;
       return size;
     }
@@ -1095,6 +1130,8 @@ public final class TimeTableProto {
           == other.getUpdateDate());
       result = result && getBcInfoList()
           .equals(other.getBcInfoList());
+      result = result && (getLineVersion()
+          == other.getLineVersion());
       return result;
     }
@@ -1147,6 +1184,8 @@ public final class TimeTableProto {
         hash = (37 * hash) + BCINFO_FIELD_NUMBER;
         hash = (53 * hash) + getBcInfoList().hashCode();
       }
+      hash = (37 * hash) + LINEVERSION_FIELD_NUMBER;
+      hash = (53 * hash) + getLineVersion();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1315,6 +1354,8 @@ public final class TimeTableProto {
         } else {
           bcInfoBuilder_.clear();
         }
+        lineVersion_ = 0;
+
         return this;
       }
@@ -1364,6 +1405,7 @@ public final class TimeTableProto {
         } else {
           result.bcInfo_ = bcInfoBuilder_.build();
         }
+        result.lineVersion_ = lineVersion_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
@@ -1487,6 +1529,9 @@ public final class TimeTableProto {
             }
           }
         }
+        if (other.getLineVersion() != 0) {
+          setLineVersion(other.getLineVersion());
+        }
         onChanged();
         return this;
       }
@@ -2790,6 +2835,44 @@ public final class TimeTableProto {
         }
         return bcInfoBuilder_;
       }
+
+      private int lineVersion_ ;
+      /**
+       * <pre>
+       * 线路版本
+       * </pre>
+       *
+       * <code>uint32 lineVersion = 18;</code>
+       */
+      public int getLineVersion() {
+        return lineVersion_;
+      }
+      /**
+       * <pre>
+       * 线路版本
+       * </pre>
+       *
+       * <code>uint32 lineVersion = 18;</code>
+       */
+      public Builder setLineVersion(int value) {
+        
+        lineVersion_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * 线路版本
+       * </pre>
+       *
+       * <code>uint32 lineVersion = 18;</code>
+       */
+      public Builder clearLineVersion() {
+        
+        lineVersion_ = 0;
+        onChanged();
+        return this;
+      }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return this;
@@ -3103,6 +3186,15 @@ public final class TimeTableProto {
      */
     com.google.protobuf.ByteString
         getRemarkBytes();
+
+    /**
+     * <pre>
+     * 线路版本
+     * </pre>
+     *
+     * <code>uint32 lineVersion = 20;</code>
+     */
+    int getLineVersion();
   }
   /**
    * Protobuf type {@code timetable.TTInfoDetail}
@@ -3135,6 +3227,7 @@ public final class TimeTableProto {
       isFB_ = false;
       isTS_ = false;
       remark_ = "";
+      lineVersion_ = 0;
     }
     @java.lang.Override
@@ -3267,6 +3360,11 @@ public final class TimeTableProto {
               remark_ = s;
               break;
             }
+            case 160: {
+
+              lineVersion_ = input.readUInt32();
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -3827,6 +3925,19 @@ public final class TimeTableProto {
       }
     }
+    public static final int LINEVERSION_FIELD_NUMBER = 20;
+    private int lineVersion_;
+    /**
+     * <pre>
+     * 线路版本
+     * </pre>
+     *
+     * <code>uint32 lineVersion = 20;</code>
+     */
+    public int getLineVersion() {
+      return lineVersion_;
+    }
+
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -3896,6 +4007,9 @@ public final class TimeTableProto {
       if (!getRemarkBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 19, remark_);
       }
+      if (lineVersion_ != 0) {
+        output.writeUInt32(20, lineVersion_);
+      }
     }
     public int getSerializedSize() {
@@ -3969,6 +4083,10 @@ public final class TimeTableProto {
       if (!getRemarkBytes().isEmpty()) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(19, remark_);
       }
+      if (lineVersion_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(20, lineVersion_);
+      }
       memoizedSize = size;
       return size;
     }
@@ -4025,6 +4143,8 @@ public final class TimeTableProto {
           == other.getIsTS());
       result = result && getRemark()
           .equals(other.getRemark());
+      result = result && (getLineVersion()
+          == other.getLineVersion());
       return result;
     }
@@ -4078,6 +4198,8 @@ public final class TimeTableProto {
           getIsTS());
       hash = (37 * hash) + REMARK_FIELD_NUMBER;
       hash = (53 * hash) + getRemark().hashCode();
+      hash = (37 * hash) + LINEVERSION_FIELD_NUMBER;
+      hash = (53 * hash) + getLineVersion();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -4245,6 +4367,8 @@ public final class TimeTableProto {
         remark_ = "";
+        lineVersion_ = 0;
+
         return this;
       }
@@ -4286,6 +4410,7 @@ public final class TimeTableProto {
         result.isFB_ = isFB_;
         result.isTS_ = isTS_;
         result.remark_ = remark_;
+        result.lineVersion_ = lineVersion_;
         onBuilt();
         return result;
       }
@@ -4394,6 +4519,9 @@ public final class TimeTableProto {
           remark_ = other.remark_;
           onChanged();
         }
+        if (other.getLineVersion() != 0) {
+          setLineVersion(other.getLineVersion());
+        }
         onChanged();
         return this;
       }
@@ -5651,6 +5779,44 @@ public final class TimeTableProto {
         onChanged();
         return this;
       }
+
+      private int lineVersion_ ;
+      /**
+       * <pre>
+       * 线路版本
+       * </pre>
+       *
+       * <code>uint32 lineVersion = 20;</code>
+       */
+      public int getLineVersion() {
+        return lineVersion_;
+      }
+      /**
+       * <pre>
+       * 线路版本
+       * </pre>
+       *
+       * <code>uint32 lineVersion = 20;</code>
+       */
+      public Builder setLineVersion(int value) {
+        
+        lineVersion_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * 线路版本
+       * </pre>
+       *
+       * <code>uint32 lineVersion = 20;</code>
+       */
+      public Builder clearLineVersion() {
+        
+        lineVersion_ = 0;
+        onChanged();
+        return this;
+      }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return this;
@@ -5719,7 +5885,7 @@ public final class TimeTableProto {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\017timetable.proto\022\ttimetable\"\332\002\n\006TTInfo\022" +
+      "\n\017timetable.proto\022\ttimetable\"\357\002\n\006TTInfo\022" +
       "\n\n\002id\030\001 \001(\004\022\014\n\004name\030\002 \001(\t\022\n\n\002xl\030\003 \001(\r\022\016\n" +
       "\006xlName\030\004 \001(\t\022\r\n\005xlDir\030\005 \001(\t\022\014\n\004qyrq\030\006 \001" +
       "(\004\022\033\n\023isEnableDisTemplate\030\007 \001(\010\022\020\n\010isCan" +
@@ -5728,16 +5894,17 @@ public final class TimeTableProto {
       "erName\030\014 \001(\t\022\022\n\nupdateUser\030\r \001(\r\022\026\n\016upda" +
       "teUserName\030\016 \001(\t\022\022\n\ncreateDate\030\017 \001(\004\022\022\n\n" +
       "updateDate\030\020 \001(\004\022\'\n\006bcInfo\030\021 \003(\0132\027.timet" +
-      "able.TTInfoDetail\"\246\002\n\014TTInfoDetail\022\n\n\002id",
-      "\030\001 \001(\004\022\n\n\002xl\030\002 \001(\r\022\016\n\006xlName\030\003 \001(\t\022\n\n\002lp" +
-      "\030\004 \001(\004\022\016\n\006lpName\030\005 \001(\t\022\014\n\004fcno\030\006 \001(\r\022\r\n\005" +
-      "xlDir\030\007 \001(\t\022\017\n\007qdzCode\030\010 \001(\t\022\017\n\007qdzName\030" +
-      "\t \001(\t\022\017\n\007zdzCode\030\n \001(\t\022\017\n\007zdzName\030\013 \001(\t\022" +
-      "\014\n\004fcsj\030\014 \001(\t\022\013\n\003bcs\030\r \001(\r\022\014\n\004jhlc\030\016 \001(\001" +
-      "\022\014\n\004bcsj\030\017 \001(\r\022\016\n\006bcType\030\020 \001(\t\022\014\n\004isFB\030\021" +
-      " \001(\010\022\014\n\004isTS\030\022 \001(\010\022\016\n\006remark\030\023 \001(\tB1\n\037co" +
-      "m.bsth.service.schedule.utilsB\016TimeTable" +
-      "Protob\006proto3"
+      "able.TTInfoDetail\022\023\n\013lineVersion\030\022 \001(\r\"\273",
+      "\002\n\014TTInfoDetail\022\n\n\002id\030\001 \001(\004\022\n\n\002xl\030\002 \001(\r\022" +
+      "\016\n\006xlName\030\003 \001(\t\022\n\n\002lp\030\004 \001(\004\022\016\n\006lpName\030\005 " +
+      "\001(\t\022\014\n\004fcno\030\006 \001(\r\022\r\n\005xlDir\030\007 \001(\t\022\017\n\007qdzC" +
+      "ode\030\010 \001(\t\022\017\n\007qdzName\030\t \001(\t\022\017\n\007zdzCode\030\n " +
+      "\001(\t\022\017\n\007zdzName\030\013 \001(\t\022\014\n\004fcsj\030\014 \001(\t\022\013\n\003bc" +
+      "s\030\r \001(\r\022\014\n\004jhlc\030\016 \001(\001\022\014\n\004bcsj\030\017 \001(\r\022\016\n\006b" +
+      "cType\030\020 \001(\t\022\014\n\004isFB\030\021 \001(\010\022\014\n\004isTS\030\022 \001(\010\022" +
+      "\016\n\006remark\030\023 \001(\t\022\023\n\013lineVersion\030\024 \001(\rB1\n\037" +
+      "com.bsth.service.schedule.utilsB\016TimeTab" +
+      "leProtob\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -5756,13 +5923,13 @@ public final class TimeTableProto {
     internal_static_timetable_TTInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_timetable_TTInfo_descriptor,
-        new java.lang.String[] { "Id", "Name", "Xl", "XlName", "XlDir", "Qyrq", "IsEnableDisTemplate", "IsCancel", "RuleDays", "SpecialDays", "CreateUser", "CreateUserName", "UpdateUser", "UpdateUserName", "CreateDate", "UpdateDate", "BcInfo", });
+        new java.lang.String[] { "Id", "Name", "Xl", "XlName", "XlDir", "Qyrq", "IsEnableDisTemplate", "IsCancel", "RuleDays", "SpecialDays", "CreateUser", "CreateUserName", "UpdateUser", "UpdateUserName", "CreateDate", "UpdateDate", "BcInfo", "LineVersion", });
     internal_static_timetable_TTInfoDetail_descriptor =
       getDescriptor().getMessageTypes().get(1);
     internal_static_timetable_TTInfoDetail_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_timetable_TTInfoDetail_descriptor,
-        new java.lang.String[] { "Id", "Xl", "XlName", "Lp", "LpName", "Fcno", "XlDir", "QdzCode", "QdzName", "ZdzCode", "ZdzName", "Fcsj", "Bcs", "Jhlc", "Bcsj", "BcType", "IsFB", "IsTS", "Remark", });
+        new java.lang.String[] { "Id", "Xl", "XlName", "Lp", "LpName", "Fcno", "XlDir", "QdzCode", "QdzName", "ZdzCode", "ZdzName", "Fcsj", "Bcs", "Jhlc", "Bcsj", "BcType", "IsFB", "IsTS", "Remark", "LineVersion", });
   }
   // @@protoc_insertion_point(outer_class_scope)
+var BMapLib=window.BMapLib=BMapLib||{};(function(){var a=6370996.81;var b=BMapLib.GeoUtils=function(){};b.isPointInRect=function(f,g){if(!(f instanceof BMap.Point)||!(g instanceof BMap.Bounds)){return false}var e=g.getSouthWest();var h=g.getNorthEast();return(f.lng>=e.lng&&f.lng<=h.lng&&f.lat>=e.lat&&f.lat<=h.lat)};b.isPointInCircle=function(e,h){if(!(e instanceof BMap.Point)||!(h instanceof BMap.Circle)){return false}var i=h.getCenter();var g=h.getRadius();var f=b.getDistance(e,i);if(f<=g){return true}else{return false}};b.isPointOnPolyline=function(f,h){if(!(f instanceof BMap.Point)||!(h instanceof BMap.Polyline)){return false}var e=h.getBounds();if(!this.isPointInRect(f,e)){return false}var m=h.getPath();for(var k=0;k<m.length-1;k++){var l=m[k];var j=m[k+1];if(f.lng>=Math.min(l.lng,j.lng)&&f.lng<=Math.max(l.lng,j.lng)&&f.lat>=Math.min(l.lat,j.lat)&&f.lat<=Math.max(l.lat,j.lat)){var g=(l.lng-f.lng)*(j.lat-f.lat)-(j.lng-f.lng)*(l.lat-f.lat);if(g<2e-10&&g>-2e-10){return true}}}return false};b.isPointInPolygon=function(o,l){if(!(o instanceof BMap.Point)||!(l instanceof BMap.Polygon)){return false}var k=l.getBounds();if(!this.isPointInRect(o,k)){return false}var t=l.getPath();var h=t.length;var n=true;var j=0;var g=2e-10;var s,q;var e=o;s=t[0];for(var f=1;f<=h;++f){if(e.equals(s)){return n}q=t[f%h];if(e.lat<Math.min(s.lat,q.lat)||e.lat>Math.max(s.lat,q.lat)){s=q;continue}if(e.lat>Math.min(s.lat,q.lat)&&e.lat<Math.max(s.lat,q.lat)){if(e.lng<=Math.max(s.lng,q.lng)){if(s.lat==q.lat&&e.lng>=Math.min(s.lng,q.lng)){return n}if(s.lng==q.lng){if(s.lng==e.lng){return n}else{++j}}else{var r=(e.lat-s.lat)*(q.lng-s.lng)/(q.lat-s.lat)+s.lng;if(Math.abs(e.lng-r)<g){return n}if(e.lng<r){++j}}}}else{if(e.lat==q.lat&&e.lng<=q.lng){var m=t[(f+1)%h];if(e.lat>=Math.min(s.lat,m.lat)&&e.lat<=Math.max(s.lat,m.lat)){++j}else{j+=2}}}s=q}if(j%2==0){return false}else{return true}};b.degreeToRad=function(e){return Math.PI*e/180};b.radToDegree=function(e){return(180*e)/Math.PI};function d(g,f,e){if(f!=null){g=Math.max(g,f)}if(e!=null){g=Math.min(g,e)}return g}function c(g,f,e){while(g>e){g-=e-f}while(g<f){g+=e-f}return g}b.getDistance=function(j,h){if(!(j instanceof BMap.Point)||!(h instanceof BMap.Point)){return 0}j.lng=c(j.lng,-180,180);j.lat=d(j.lat,-74,74);h.lng=c(h.lng,-180,180);h.lat=d(h.lat,-74,74);var f,e,i,g;f=b.degreeToRad(j.lng);i=b.degreeToRad(j.lat);e=b.degreeToRad(h.lng);g=b.degreeToRad(h.lat);return a*Math.acos((Math.sin(i)*Math.sin(g)+Math.cos(i)*Math.cos(g)*Math.cos(e-f)))};b.getPolylineDistance=function(f){if(f instanceof BMap.Polyline||f instanceof Array){var l;if(f instanceof BMap.Polyline){l=f.getPath()}else{l=f}if(l.length<2){return 0}var j=0;for(var h=0;h<l.length-1;h++){var k=l[h];var g=l[h+1];var e=b.getDistance(k,g);j+=e}return j}else{return 0}};b.getPolygonArea=function(t){if(!(t instanceof BMap.Polygon)&&!(t instanceof Array)){return 0}var R;if(t instanceof BMap.Polygon){R=t.getPath()}else{R=t}if(R.length<3){return 0}var w=0;var D=0;var C=0;var L=0;var J=0;var F=0;var E=0;var S=0;var H=0;var p=0;var T=0;var I=0;var q=0;var e=0;var M=0;var v=0;var K=0;var N=0;var s=0;var O=0;var l=0;var g=0;var z=0;var Q=0;var G=0;var j=0;var A=0;var o=0;var m=0;var y=0;var x=0;var h=0;var k=0;var f=0;var n=a;var B=R.length;for(var P=0;P<B;P++){if(P==0){D=R[B-1].lng*Math.PI/180;C=R[B-1].lat*Math.PI/180;L=R[0].lng*Math.PI/180;J=R[0].lat*Math.PI/180;F=R[1].lng*Math.PI/180;E=R[1].lat*Math.PI/180}else{if(P==B-1){D=R[B-2].lng*Math.PI/180;C=R[B-2].lat*Math.PI/180;L=R[B-1].lng*Math.PI/180;J=R[B-1].lat*Math.PI/180;F=R[0].lng*Math.PI/180;E=R[0].lat*Math.PI/180}else{D=R[P-1].lng*Math.PI/180;C=R[P-1].lat*Math.PI/180;L=R[P].lng*Math.PI/180;J=R[P].lat*Math.PI/180;F=R[P+1].lng*Math.PI/180;E=R[P+1].lat*Math.PI/180}}S=Math.cos(J)*Math.cos(L);H=Math.cos(J)*Math.sin(L);p=Math.sin(J);T=Math.cos(C)*Math.cos(D);I=Math.cos(C)*Math.sin(D);q=Math.sin(C);e=Math.cos(E)*Math.cos(F);M=Math.cos(E)*Math.sin(F);v=Math.sin(E);K=(S*S+H*H+p*p)/(S*T+H*I+p*q);N=(S*S+H*H+p*p)/(S*e+H*M+p*v);s=K*T-S;O=K*I-H;l=K*q-p;g=N*e-S;z=N*M-H;Q=N*v-p;m=(g*s+z*O+Q*l)/(Math.sqrt(g*g+z*z+Q*Q)*Math.sqrt(s*s+O*O+l*l));m=Math.acos(m);G=z*l-Q*O;j=0-(g*l-Q*s);A=g*O-z*s;if(S!=0){o=G/S}else{if(H!=0){o=j/H}else{o=A/p}}if(o>0){y+=m;k++}else{x+=m;h++}}var u,r;u=y+(2*Math.PI*h-x);r=(2*Math.PI*k-y)+x;if(y>x){if((u-(B-2)*Math.PI)<1){f=u}else{f=r}}else{if((r-(B-2)*Math.PI)<1){f=r}else{f=u}}w=(f-(B-2)*Math.PI)*n*n;return w}})();
 \ No newline at end of file
@@ -19,7 +19,7 @@ div#map_wrap{
     position: absolute;
     z-index: 999;
     height: calc(100% - 20px);
-    width: 300px;
+    width: 310px;
     background: #fffffff5;
     top: 7px;
     left: 5px;
@@ -30,14 +30,12 @@ div#map_wrap{
     z-index: 99;
     top: 10px;
     left: 330px;
-    background: #fffffff5;
-    box-shadow: 5px 5px 15px rgba(90, 90, 90, 0.48);
 }
 .main_rt_tools_panel{
     position: absolute;
     z-index: 99;
-    top: 7px;
-    right: 7px;
+    top: 20px;
+    right: 77px;
     background: #ffffff;
     box-shadow: -5px 4px 15px rgba(90, 90, 90, 0.48);
     padding: 0 12px;
@@ -61,7 +59,7 @@ div#map_wrap{
 ._line_info{
     width: 100%;
-    height: 90px;
+    height: 80px;
     background: white;
     box-shadow: 0px -2px 15px rgba(90, 90, 90, 0.48);
 }
@@ -104,7 +102,7 @@ div#map_wrap{
     margin-top: 6px;
 }
 ._route_info_wrap{
-    height: calc(100% - 100px);
+    height: calc(100% - 90px);
     padding-top: 10px;
 }
@@ -134,7 +132,7 @@ div#map_wrap{
     width: calc(100% - 38px);
 }
-.station_route>ul.uk-list>li:nth-child(n+2), .uk-list>li>ul {
+.up_down_route_list ul.uk-list>li:nth-child(n+2), .uk-list>li>ul {
     margin-top: 0;
 }
@@ -250,20 +248,20 @@ ul.uk-list.station_info_win&gt;li.s_name{
     background: #91d9fa;
 }
-.up_down_route_list li.ct_active.first_road_active{
+.up_down_route_list li.ct_active.f_r_a{
     background: #fff;
 }
-.up_down_route_list li.ct_active.first_road_active>a{
+.up_down_route_list li.ct_active.f_r_a>a{
     background: #91d9fa;
 }
 .road_route .uk-list ul{
-    padding-left: 22px;
+    padding-left: 0;
 }
 .road_route>ul>li>ul>li{
-    padding-left: 8px;
+    padding-left: 22px;
 }
 .ct_coord_str{
@@ -297,7 +295,7 @@ ul.context-menu-list.station-route-ct-menu.context-menu-root {
 .buffer_edit_panel{
     position: absolute;
     top: 5px;
-    width: 360px;
+    width: 390px;
     height: 120px;
     background: #ffffff;
     left: calc(50% - 170px);
@@ -306,7 +304,7 @@ ul.context-menu-list.station-route-ct-menu.context-menu-root {
     display: none;
 }
 .buffer_edit_body{
-    padding: 5px;
+    padding: 5px 0 0 15px;
 }
 .buffer_edit_body>.name{
@@ -316,7 +314,7 @@ ul.context-menu-list.station-route-ct-menu.context-menu-root {
 }
 .buffer_edit_body .ct_row .uk-inline{
-    width: 167px;
+    width: 175px;
     height: 30px;
     margin-right: 7px;
 }
@@ -420,4 +418,198 @@ ul.context-menu-list.station-route-ct-menu.context-menu-root {
 .shapes_type.st_d .draw_polygon_switch>a{
     color: red;
+}
+
+.ul_li_input{
+    display: inline-block;
+    padding: 4px 0;
+    width: calc(100% - 53px);
+    background: #f7f7f7;
+}
+
+.ul_li_input input{
+    width: 140px;
+    height: 28px;
+    margin-left: 5px;
+}
+
+.save_icon_btn{
+    color: #2121d1;
+    margin-right: 4px;
+}
+
+.ul_li_input .uk-icon:hover{
+    background: #dfdfdf;
+}
+
+.station_li_transient .ct_route_badge{
+    background: #ddcd3f;
+    vertical-align: middle;
+}
+
+.station_li_transient .search_point_icon_btn{
+    color: #FF9800;
+    margin-right: 5px;
+}
+
+.station_route ._edit_name .ct_route_badge{
+    vertical-align: middle;
+}
+
+.add_station_search_point_wrap{
+    width: 390px;
+    height: 126px;
+    position: absolute;
+    top: 10px;
+    left: calc(50% - 200px);
+    z-index: 999;
+    background: #ffface;
+    box-shadow: 5px 5px 15px rgba(90, 90, 90, 0.48);
+}
+
+.add_station_search_point_wrap ._title {
+    text-align: center;
+    font-size: 17px;
+    color: #2b2b2b;
+    padding: 2px 0 0 0;
+    font-weight: 600;
+}
+
+.add_station_search_point_wrap .buffer_edit_body .ct_row {
+    margin-top: 8px;
+}
+
+.road_edit_panel{
+    position: absolute;
+    z-index: 999;
+    top: 10px;
+    left: calc(50% - 190px);
+    width: 380px;
+    background: #fff;
+    height: 120px;
+    box-shadow: 5px 5px 15px rgba(90, 90, 90, 0.48);
+}
+
+.road_li_transient .ul_li_input input:first-child{
+    width: 110px;
+    margin-left: 2px;
+}
+
+.road_li_transient .ul_li_input input:nth-of-type(2){
+    width: 100px;
+    margin-left: 0;
+    font-size: 12px;
+}
+
+.bks_list li.road_li_transient{
+    margin-left: -15px;
+}
+
+.road_li_transient .search_point_icon_btn {
+    color: #FF9800;
+    margin-right: 5px;
+}
+
+.road_li_transient .ul_li_input{
+    width: 100%;
+
+}
+
+.road_li_transient .ul_li_input input{
+    color: #c5862a;
+}
+
+
+.add_road_search_point_wrap{
+    width: 390px;
+    height: 120px;
+    position: absolute;
+    top: 10px;
+    left: calc(50% - 200px);
+    z-index: 999;
+    background: #ffface;
+    box-shadow: 5px 5px 15px rgba(90, 90, 90, 0.48);
+}
+
+.add_road_search_point_wrap ._title {
+    text-align: center;
+    font-size: 17px;
+    color: #2b2b2b;
+    padding: 2px 0 0 0;
+    font-weight: 600;
+}
+
+.add_road_search_point_wrap .buffer_edit_body .ct_row {
+    margin-top: 8px;
+}
+
+.draw_polyline_switch{
+    display: inline-block;
+    font-size: 12px;
+    vertical-align: bottom;
+    margin-left: 5px;
+}
+
+.draw_polyline_switch>a{
+    color: red;
+}
+
+.ct_search_input::placeholder{
+    font-size: 13px;
+}
+
+.ct_search_result>ul.s_list ._title{
+    display: block;
+    color: #009688;
+    font-size: 14px;
+}
+
+.ct_search_result>ul.s_list ._address{
+    font-size: 12px;
+}
+
+.ct_s_i_wrap{
+    box-shadow: 0px 4px 12px rgba(145, 145, 145, 0.48);
+}
+
+.ct_search_result{
+    background: #fff;
+    margin-top: 10px;
+    box-shadow: 5px 5px 15px rgba(90, 90, 90, 0.48);
+    max-width: 300px;
+}
+
+.ct_search_result .s_list>li{
+    padding: 5px 15px;
+    cursor: pointer;
+    margin-top: 0;
+
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.ct_search_result .s_list>li:hover{
+    background: #e1e1e1;
+}
+
+.ct_search_result ._empty{
+    font-size: 12px;
+    color: #656464;
+}
+
+.ct_search_result .uk-icon{
+    cursor: pointer;
+}
+
+.main_lt_search_panel .uk-form-icon:not(a):not(button):not(input){
+    pointer-events: auto;
+}
+
+#add_line_versions_modal form.uk-form-horizontal .uk-form-label{
+    width: 100px !important;
+}
+
+#add_line_versions_modal form.uk-form-horizontal .uk-form-controls{
+    margin-left: 115px;
 }
 \ No newline at end of file
@@ -2,18 +2,18 @@
     <script id="geo_d_e_road_route-temp" type="text/html">
         <ul class="uk-list">
             {{each list as subArr i}}
-            <li class="road_li_{{subArr[0].sectionCode}} first_road_active">
+            <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>
-
                 {{if subArr.length > 1}}
+                    <ul class="uk-list bks_list">
                     {{each subArr as obj j}}
-                    <ul class="uk-list">
                         {{if j > 0}}
-                        <li class="road_li_{{obj.sectionCode}}">
+                        <li class="r_r_item" data-id="{{obj.id}}" data-code="{{obj.sectionCode}}">
                             <a data-code="{{obj.sectionCode}}" data-updown="{{obj.directions}}">{{obj.sectionName}}<span class="sub_name">{{obj.crosesRoad}}</span></a></li>
                         {{/if}}
-                    </ul>
+
                     {{/each}}
+                    </ul>
                 {{/if}}
             </li>
             {{/each}}
@@ -26,13 +26,94 @@
             <li>交叉路名： {{crosesRoad}}</li>
             <li>路段编号：{{sectionCode}}</li>
             <li>路由序号：{{sectionrouteCode}}</li>
-            <li>坐标：
+            <!--<li>坐标：
                 <div class="ct_coord_str">
                 {{each bdCoords as coord i}}
                     <code>{{coord}}</code><br>
                 {{/each}}
                 </div>
-            </li>
+            </li>-->
         </ul>
     </script>
+
+    <script id="geo_d_e_road_edit_panel-temp" type="text/html">
+    <div class="road_edit_panel uk-animation-slide-top-small">
+        <div class="buffer_edit_body" >
+            <h6 class="name">{{sectionName}} （路段编辑）</h6>
+            <form>
+                <input type="hidden" value="{{id}}" name="id">
+                <input type="hidden" value="{{sectionCode}}" name="sectionCode">
+
+                <div class="ct_row">
+                    <div class="uk-inline">
+                        <span class="uk-form-icon uk-form-icon-flip" >路段名</span>
+                        <input class="uk-input" name="sectionName" type="text" value="{{sectionName}}" >
+                    </div>
+                    <div class="uk-inline">
+                        <span class="uk-form-icon uk-form-icon-flip" >交叉路</span>
+                        <input class="uk-input" name="crosesRoad" type="text" value="{{crosesRoad}}" style="font-size: 13px;">
+                    </div>
+                </div>
+
+                <div class="ct_row">
+                    <div class="uk-inline" >
+                        <kbd>长度: <span>{{len}}</span> 米</kbd>
+                    </div>
+                    <div class="uk-inline btns">
+                        <button class="uk-button uk-button-primary submit">确定</button>
+                        <button class="uk-button uk-button-default cancel">取消</button>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+    </script>
+
+    <script id="geo_d_e_add_road_panel-temp" type="text/html">
+        <li class="road_li_transient">
+            <div class="ul_li_input">
+                <form>
+                    <input class="uk-input" value="{{sectionName}}" autocomplete="off"  placeholder="路段名称" name="sectionName">
+                    <input class="uk-input" value="{{crosesRoad}}" autocomplete="off"  placeholder="交叉路" name="crosesRoad">
+                    <span uk-icon="icon: location;ratio:.8" title="绘制路段" uk-tooltip class="search_point_icon_btn"></span>
+                    <span uk-icon="icon: close;" title="取消" uk-tooltip class="cancel_icon_btn"></span>
+                </form>
+            </div>
+        </li>
+    </script>
+
+
+    <script id="geo_d_e_add_draw_polyline-temp" type="text/html">
+    <div class="add_road_search_point_wrap uk-animation-slide-top-small">
+        <div class="buffer_edit_body" >
+            <div class="_title">绘制 {{name}}（{{cName}}）</div>
+            <form>
+                <input type="hidden" value="{{id}}" name="id">
+                <input type="hidden" value="{{sectionCode}}" name="sectionCode">
+
+                <div class="ct_row">
+                    <div class="uk-inline">
+                        <span class="uk-form-icon uk-form-icon-flip" >路段名</span>
+                        <input class="uk-input" name="sectionName" type="text" value="{{name}}" >
+                    </div>
+                    <div class="uk-inline">
+                        <span class="uk-form-icon uk-form-icon-flip" >交叉路</span>
+                        <input class="uk-input" name="crosesRoad" type="text" value="{{cName}}" style="font-size: 13px;">
+                    </div>
+                </div>
+
+                <div class="ct_row">
+                    <div class="uk-inline" >
+                        <span class="draw_polyline_switch"><a>暂停绘制</a></span>
+                    </div>
+
+                    <div class="uk-inline btns">
+                        <button class="uk-button uk-button-primary submit">确定</button>
+                        <button class="uk-button uk-button-default cancel">取消</button>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+    </script>
 </div>
 \ No newline at end of file
@@ -2,17 +2,27 @@
     <script id="geo_d_e_station_route-temp" type="text/html">
         <ul class="uk-list">
             {{each list as s i}}
-                <li class="station_li_{{s.stationCode}}">
-                    <div class="ct_route_badge_wrap">
-                    <span class="uk-badge ct_route_badge {{if s.stationMark=='B'}}start{{else if s.stationMark=='E'}}end{{/if}} {{if shapesType=='d'}}polygon{{/if}}">
+            <li class="s_r_item" data-code="{{s.stationCode}}" data-id="{{s.id}}">
+                <div class="ct_route_badge_wrap">
+                    <span class="uk-badge ct_route_badge {{if s.stationMark=='B'}}start{{else if s.stationMark=='E'}}end{{/if}} {{if s.shapesType=='d'}}polygon{{/if}}">
                     {{if s.stationMark=='B'}}起点站{{else if s.stationMark=='E'}}终点站{{else}}{{i + 1}}{{/if}}</span>
-                    </div>
-                    <a data-code="{{s.stationCode}}" data-updown="{{s.directions}}">{{s.stationName}}</a>
-                </li>
+                </div>
+                <a data-code="{{s.stationCode}}" data-updown="{{s.directions}}">{{s.stationName}}</a>
+            </li>
             {{/each}}
         </ul>
     </script>
+    <script id="geo_d_e_station_route_one-temp" type="text/html">
+        <li class="s_r_item"  data-code="{{stationCode}}" data-id="{{id}}">
+            <div class="ct_route_badge_wrap">
+                    <span class="uk-badge ct_route_badge {{if stationMark=='B'}}start{{else if stationMark=='E'}}end{{/if}} {{if shapesType=='d'}}polygon{{/if}}">
+                    {{if stationMark=='B'}}起点站{{else if stationMark=='E'}}终点站{{else}}{{index}}{{/if}}</span>
+            </div>
+            <a class="uk-animation-shake" data-code="{{stationCode}}" data-updown="{{directions}}">{{stationName}}</a>
+        </li>
+    </script>
+
     <script id="geo_d_e_station_info_win-temp" type="text/html">
         <ul class="uk-list station_info_win">
@@ -58,34 +68,96 @@
                     <input type="hidden" value="{{directions}}" name="directions">
                     <input type="hidden" value="{{stationCode}}" name="stationCode">
                     <input type="hidden" value="{{stationName}}" name="stationName">
-                <div class="ct_row">
-                    <div class="uk-inline">
-                        <span class="uk-form-icon uk-form-icon-flip" >经度</span>
-                        <input class="uk-input" name="gLaty" type="text" value="{{bd_lat}}" readonly>
+                    <div class="ct_row">
+                        <div class="uk-inline">
+                            <span class="uk-form-icon uk-form-icon-flip" >经度</span>
+                            <input class="uk-input" name="gLaty" type="text" value="{{bd_lat}}" readonly>
+                        </div>
+                        <div class="uk-inline">
+                            <span class="uk-form-icon uk-form-icon-flip" >纬度</span>
+                            <input class="uk-input" name="gLonx" type="text" value="{{bd_lon}}" readonly>
+                        </div>
                     </div>
-                    <div class="uk-inline">
-                        <span class="uk-form-icon uk-form-icon-flip" >纬度</span>
-                        <input class="uk-input" name="gLonx" type="text" value="{{bd_lon}}" readonly>
-                    </div>
-                </div>
-                <div class="ct_row shapes_type {{shapesType=='d'?'st_d':''}}">
-                    <div class="uk-inline" >
-                        <select name="shapesType" class="uk-select">
-                            <option value="r" {{shapesType=='r'?'selected':''}}>圆形</option>
-                            <option value="d" {{shapesType=='d'?'selected':''}}>多边形</option>
-                        </select>
-                        <span class="draw_polygon_switch" data-type="1"><a>暂停绘制</a></span>
+                    <div class="ct_row shapes_type {{shapesType=='d'?'st_d':''}}">
+                        <div class="uk-inline" >
+                            <select name="shapesType" class="uk-select">
+                                <option value="r" {{shapesType=='r'?'selected':''}}>圆形</option>
+                                <option value="d" {{shapesType=='d'?'selected':''}}>多边形</option>
+                            </select>
+                            <span class="draw_polygon_switch" data-type="{{shapesType=='d'?'3':'1'}}"><a>{{shapesType=='d'?'重新绘制':'暂停绘制'}}</a></span>
+                        </div>
+                        <div class="uk-inline">
+                            <span class="uk-form-icon uk-form-icon-flip" >半径</span>
+                            <input class="uk-input" name="radius" type="text" value="{{radius}}">
+                        </div>
+                        <div class="uk-inline btns">
+                            <button class="uk-button uk-button-primary submit">确定</button>
+                            <button class="uk-button uk-button-default cancel">取消</button>
+                        </div>
                     </div>
-                    <div class="uk-inline">
-                        <span class="uk-form-icon uk-form-icon-flip" >半径</span>
-                        <input class="uk-input" name="radius" type="text" value="{{radius}}">
+                </form>
+            </div>
+        </div>
+    </script>
+
+    <script id="geo_d_e_edit_name_panel-temp" type="text/html">
+        <div class="ul_li_input">
+            <form>
+                <input type="hidden" value="{{id}}" name="id">
+                <input type="hidden" value="{{stationCode}}" name="stationCode">
+                <input type="hidden" value="{{lineCode}}" name="lineCode">
+                <input type="hidden" value="{{stationMark}}" name="stationMark">
+                <input class="uk-input" autocomplete="off" value="{{stationName}}" name="stationName">
+                <span uk-icon="icon: check" title="确定" uk-tooltip class="save_icon_btn"></span>
+                <span uk-icon="icon: close" title="取消" uk-tooltip class="cancel_icon_btn"></span>
+            </form>
+        </div>
+    </script>
+
+    <script id="geo_d_e_add_station_panel-temp" type="text/html">
+        <li class="station_li_transient">
+            <div class="ct_route_badge_wrap">
+                <span class="uk-badge ct_route_badge ">?</span>
+            </div>
+            <div class="ul_li_input">
+                <form>
+                    <input class="uk-input" value="" autocomplete="off"  placeholder="输入站点名称" name="stationName">
+                    <span uk-icon="icon: location;ratio:.8" title="选择一个坐标位置" uk-tooltip class="search_point_icon_btn"></span>
+                    <span uk-icon="icon: close" title="取消" uk-tooltip class="cancel_icon_btn"></span>
+                </form>
+            </div>
+        </li>
+    </script>
+
+    <script id="geo_d_e_add_search_point_panel-temp" type="text/html">
+        <div class="add_station_search_point_wrap uk-animation-slide-top-small">
+            <div class="_title">为 {{name}} 选择一个坐标位置</div>
+            <div class="buffer_edit_body">
+                <form>
+                    <input type="hidden" value="{{name}}" name="stationName">
+                    <div class="ct_row">
+                        <div class="uk-inline">
+                            <span class="uk-form-icon uk-form-icon-flip" >经度</span>
+                            <input class="uk-input" name="gLaty" type="text" readonly>
+                        </div>
+                        <div class="uk-inline">
+                            <span class="uk-form-icon uk-form-icon-flip" >纬度</span>
+                            <input class="uk-input" name="gLonx" type="text" readonly>
+                        </div>
                     </div>
-                    <div class="uk-inline btns">
-                        <button class="uk-button uk-button-primary submit">确定</button>
-                        <button class="uk-button uk-button-default cancel">取消</button>
+                    <div class="ct_row ">
+                        <div class="uk-inline" >
+                            <div class="ct_row" style="color: #5e5d5d;font-size: 12px;">
+                                <span uk-icon="icon: question;ratio:.7;" style="vertical-align: top;margin-top: 2px;"></span>
+                                双击地图可拾取坐标点位
+                            </div>
+                        </div>
+                        <div class="uk-inline btns">
+                            <button class="uk-button uk-button-primary submit">确定</button>
+                            <button class="uk-button uk-button-default cancel">取消</button>
+                        </div>
                     </div>
-                </div>
                 </form>
             </div>
         </div>
+<div>
+    <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 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">
+                            <select class="uk-select" name="remark">
+                                <option>线路改道</option>
+                                <option>其他</option>
+                            </select>
+                        </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>
+
+                    <div class="uk-margin">
+                        <label class="uk-form-label" >版本名称</label>
+                        <div class="uk-form-controls">
+                            <input class="uk-input" type="text" name="name" placeholder="版本名称">
+                        </div>
+                    </div>
+
+                    <div class="uk-margin">
+                        <div class="uk-form-label">继承走向</div>
+                        <div class="uk-form-controls">
+                            <select class="uk-select" >
+                                <option>不继承之前的走向</option>
+
+                                {{each array as obj i}}
+                                    <option data-id="{{obj.id}}" data-versions="{{obj.versions}}">{{obj.name}}</option>
+                                {{/each}}
+                            </select>
+                        </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>
+</div>
 \ No newline at end of file
 <!-- 数据 -->
 var gb_common_data = function () {
+    /**
+     * 加载线路基础信息
+     */
+
     res_load_ep.emitLater('load_common_data');
     return {};
@@ -3,7 +3,7 @@
 var gb_ct_map = function () {
     //初始化地图
-    if(!window.BMap){
+    if (!window.BMap) {
         alert('地图没有加载成功，请确认是否能正常连接外网！！');
     }
     var gb_map_consts = {
@@ -14,20 +14,35 @@ var gb_ct_map = function () {
         }
     };
+    var styleOptions = {
+        strokeColor:"#E91E63",    //边线颜色。
+        fillColor:"#E91E63",      //填充颜色。当参数为空时，圆形将没有填充效果。
+        strokeWeight: 6,       //边线的宽度，以像素为单位。
+        strokeOpacity: 0.8,	   //边线透明度，取值范围0 - 1。
+        fillOpacity: 0.6,      //填充的透明度，取值范围0 - 1。
+        strokeStyle: 'solid' //边线的样式，solid或dashed。
+    }
+
+
     /**
      * 地图状态
      * 1: 站点缓冲区编辑
      */
-    var map_status=0;
+    var map_status = 0;
     var editCircle;
     var editPolygon;
+    var dragMarker;
     map = new BMap.Map($(gb_map_consts.mapContainer)[0], {enableMapClick: false});
     //中心点和缩放级别
     map.centerAndZoom(new BMap.Point(gb_map_consts.center_point.lng, gb_map_consts.center_point.lat), 14);
     map.enableScrollWheelZoom();
-    var roadPolylines = [], stationMarkers=[];
+    var stCtrl = new BMap.PanoramaControl(); //构造全景控件
+    stCtrl.setOffset(new BMap.Size(20, 20));
+    map.addControl(stCtrl);//添加全景控件
+
+    var roadPolylines = [], stationMarkers = [];
     var _render = function (cb) {
         //绘制路段
         _renderRoads(gb_road_route.getData());
@@ -44,7 +59,7 @@ var gb_ct_map = function () {
     };
     var updownColor = function (updown) {
-        return updown==0?'blue':'red';
+        return updown == 0 ? 'blue' : 'red';
     };
     var _renderRoads = function (data) {
         _renderPolyline(data[0], updownColor(0));//上行路段
@@ -55,22 +70,23 @@ var gb_ct_map = function () {
         _renderStationMarket(data[0]);//上行站点
         _renderStationMarket(data[1]);//下行站点
     };
-    
+
     var _renderStationMarket = function (routes, color) {
         var marker;
-        var array=[];
+        var array = [];
         $.each(routes, function (i) {
             this.index = i;
             transCoord(this);
-            marker=createStationMark(this);
+            marker = createStationMark(this);
             marker.stationCode = this.stationCode;
             marker.ct_data = this;
+            marker.ct_source = '1';
             map.addOverlay(marker);
             array.push(marker);
         });
-        stationMarkers.push(array);
+        stationMarkers[routes[0].directions] = array;
     };
     function transCoord(obj) {
@@ -81,8 +97,8 @@ var gb_ct_map = function () {
     var _renderPolyline = function (routes, color) {
         var pos, temps;
-        var polyline, _pLines=[];
-        var style = {strokeWeight:7, strokeColor: color, strokeOpacity: .7};
+        var polyline, _pLines = [];
+        var style = {strokeWeight: 7, strokeColor: color, strokeOpacity: .7};
         $.each(routes, function (i, item) {
             pos = [];
@@ -93,41 +109,50 @@ var gb_ct_map = function () {
             polyline = new BMap.Polyline(pos, style);
             polyline.ct_data = item;
             polyline.ct_data.oldColor = color;
+            polyline.ct_source = '1';
             map.addOverlay(polyline);
-            polyline.addEventListener('mouseover', function(){
-                this.setStrokeColor('#20bd26');
+            polyline.addEventListener('mouseover', function () {
+                //if (map_status != 1)
+                if(this!=editPolyline)
+                    this.setStrokeColor('#20bd26');
             });
-            polyline.addEventListener('mouseout', function(){
-                if(this!=road_win_show_p)
-                    this.setStrokeColor(color);
+            polyline.addEventListener('mouseout', function () {
+                //if (map_status != 1 && this != road_win_show_p)
+                if(this!=editPolyline && this != road_win_show_p)
+                    this.setStrokeColor(updownColor(this.ct_data.directions));
             });
-            polyline.addEventListener('click', function(e){
-                if(map_status!=1)
+            polyline.addEventListener('click', function (e) {
+                if (map_status != 1)
                     openRoadInfoWin(this, e.point);
             });
             _pLines.push(polyline);
         });
-        roadPolylines.push(_pLines);
+        roadPolylines[routes[0].directions]= _pLines;
     };
     var road_win_show_p;
+
     function openRoadInfoWin(p, point) {
         var data = p.ct_data;
         var win = new BMap.InfoWindow(gb_road_route.getTemps()['geo_d_e_road_info_win-temp'](data));
         //close event
         win.addEventListener('close', function (e) {
-            p.setStrokeColor(p.ct_data.oldColor);
-            gb_road_route.clearFocus();
-            road_win_show_p = null;
+            if(map_status != 1) {
+                p.setStrokeColor(updownColor(p.ct_data.directions));
+                gb_road_route.clearFocus();
+                road_win_show_p = null;
+            }
         });
         //open event
         win.addEventListener('open', function (e) {
-            gb_road_route.focus(data);
-            p.setStrokeColor('#20bd26');
-            road_win_show_p = p;
+            if(map_status !=1){
+                gb_road_route.focus(data);
+                p.setStrokeColor('#20bd26');
+                road_win_show_p = p;
+            }
         });
         map.openInfoWindow(win, point);
@@ -139,31 +164,18 @@ var gb_ct_map = function () {
         //根据站点名称 计算marker 宽度
         var w = statio.stationName.length * 12 + 38
-            ,iw=w-2;
-        var icon = new BMap.Icon(createStationIcon(statio, w), new BMap.Size(iw,24), {anchor: new BMap.Size(iw/2,25)})
+            , iw = w - 2;
+        var icon = new BMap.Icon(createStationIcon(statio, w), new BMap.Size(iw, 24), {anchor: new BMap.Size(iw / 2, 25)})
         marker.setIcon(icon);
         marker.setShadow(null);
-        //信息窗口
-        //var infoWin=new BMap.InfoWindow(gb_station_route.getTemps()['geo_d_e_station_info_win-temp'](statio), {offset: new BMap.Size(0,-13)});
-        //infoWin.ct_data = statio;//绑定数据
-        //marker.infoWin = infoWin;
-        marker.addEventListener('click', function(){
-            if(map_status!=1)
+
+        marker.addEventListener('click', function () {
+            if (map_status != 1)
                 openStationInfoWin(this);
-                //map.openInfoWindow(this.infoWin, this.point);
-        });
-        //close event
-        /*infoWin.addEventListener('close', function (e) {
-            //if(map_status!=1)
-            gb_station_route.clearFocus();
         });
-        //open event
-        infoWin.addEventListener('open', function (e) {
-            gb_station_route.focus(this.ct_data);
-        });*/
         //mouseover
-        marker.addEventListener('mouseover', function(){
+        marker.addEventListener('mouseover', function () {
             setTop(this);
         });
         return marker;
@@ -171,7 +183,7 @@ var gb_ct_map = function () {
     var openStationInfoWin = function (m) {
         //ct_data
-        var win=new BMap.InfoWindow(gb_station_route.getTemps()['geo_d_e_station_info_win-temp'](m.ct_data), {offset: new BMap.Size(0,-13)});
+        var win = new BMap.InfoWindow(gb_station_route.getTemps()['geo_d_e_station_info_win-temp'](m.ct_data), {offset: new BMap.Size(0, -13)});
         //close event
         win.addEventListener('close', function (e) {
             gb_station_route.clearFocus();
@@ -185,20 +197,21 @@ var gb_ct_map = function () {
     };
     //绘制站点icon
-    function createStationIcon(station, w) {
+    function createStationIcon(station, w, bg) {
         var canvas = $('<canvas></canvas>')[0];
         var ctx = canvas.getContext('2d');
-        var bg = station.directions == 0 ? '#5757fc' : '#fc4c4c';
+        if(!bg)
+            bg = station.directions == 0 ? '#5757fc' : '#fc4c4c';
         //矩形
         //ctx.roundRect(0, 0, w, 17, 1).stroke();
-        ctx.lineWidth="3";
+        ctx.lineWidth = "3";
         ctx.rect(0, 0, w - 2, 19);
         ctx.fillStyle = '#fff';
         ctx.fill();
         ctx.strokeStyle = bg;
         ctx.stroke();
-        ctx.lineWidth="1";
+        ctx.lineWidth = "1";
         //文字
         ctx.font = "12px arial";
@@ -213,8 +226,11 @@ var gb_ct_map = function () {
         ctx.font = "12px arial";
         ctx.fillStyle = '#fff';
-        var i = station.index + 1;
-        var left = (i + '').length > 1?3:7;
+
+        var i = station.index;
+        if(!isNaN(i))
+            i ++;
+        var left = (i + '').length > 1 ? 3 : 7;
         ctx.fillText(i, left, 14);
         //角
@@ -234,7 +250,7 @@ var gb_ct_map = function () {
     var changeUpDown = function () {
         var upDown = getUpDown();
-        $.each(roadPolylines[upDown==0?1:0], function () {
+        $.each(roadPolylines[upDown == 0 ? 1 : 0], function () {
             this.hide();
         });
         $.each(roadPolylines[upDown], function () {
@@ -242,7 +258,7 @@ var gb_ct_map = function () {
         });
-        $.each(stationMarkers[upDown==0?1:0], function () {
+        $.each(stationMarkers[upDown == 0 ? 1 : 0], function () {
             this.hide();
         });
         $.each(stationMarkers[upDown], function () {
@@ -256,22 +272,22 @@ var gb_ct_map = function () {
      */
     var focusStation = function (code, updown) {
         var marker = getStationMarker(code, updown);
-        if(marker){
+        if (marker) {
             openStationInfoWin(marker);
         }
     };
-    
+
     var getStationMarker = function (code, updown) {
         var array = stationMarkers[updown],
             marker;
-        for(var i=0,m;m=array[i++];){
-            if(m.stationCode==code){
+        for (var i = 0, m; m = array[i++];) {
+            if (m.stationCode == code) {
                 marker = m;
                 break;
             }
         }
         return marker;
-    }
+    };
     /**
      * 定位到路段
@@ -281,33 +297,28 @@ var gb_ct_map = function () {
     var focusRoad = function (code, updown) {
         var array = roadPolylines[updown],
             polyline;
-        for(var i=0,p;p=array[i++];){
-            if(p.ct_data.sectionCode==code){
+        for (var i = 0, p; p = array[i++];) {
+            if (p.ct_data.sectionCode == code) {
                 polyline = p;
                 break;
             }
         }
-        var cp = calcCenterPoint(p.ct_data.bdCoords);
-        openRoadInfoWin(p, new BMap.Point(cp.longitude, cp.latitude));
-    }
-
-    var calcCenterPoint = function (coords) {
-        var array = [], strs;
-        for(var i=0,item;item=coords[i++];){
-            strs = item.split(' ');
-            array.push({latitude: strs[1], longitude: strs[0]});
-        }
+        openRoadInfoWin(p, new BMap.Point(p.ct_data.cp.longitude, p.ct_data.cp.latitude));
+    };
-        return geolib.getCenter(array);
-    }
-    
     var exitEditBufferStatus = function (s) {
         map_status = 0;
-        enabledOtherElem();
-        gb_station_route.hideEditPanel();
+        $('.main_left_panel_m_layer').hide();
+        $('.buffer_edit_panel').remove();
+        //enabledOtherElem();
+        //gb_station_route.hideEditPanel();
-        map.removeOverlay(editCircle);
+        clearOtherOverlay();
+        reSetDragMarker();//关闭marker 拖拽
+
+        clearEditBuffer();
+        //map.removeOverlay(editCircle);
         openStationInfoWin(getStationMarker(s.stationCode, s.directions));
     };
@@ -321,52 +332,95 @@ var gb_ct_map = function () {
         map.closeInfoWindow();//关闭infoWindow
         gb_station_route.clearFocus();
         gb_station_route.focus(s);
-        clearOldOverlay();
         disabledOtherElem();
         gb_station_route.showEditPanel(s);
         var marker = getStationMarker(s.stationCode, s.directions);
+        setDragMarker(marker);//站点 点位可拖拽
+
         map.centerAndZoom(marker.point, 18);
         var bElem = openBufferOverlay(marker);
-        if(s.shapesType=='r'){
+        if (s.shapesType == 'r') {
             //lineupdate
             bElem.addEventListener('lineupdate', function (e) {
-                //console.log('lineupdatelineupdate', e);
-                //var ec = e.target;
-                //var radius = ec.getRadius().toFixed(2);
-                //console.log('getRadius', ec.getRadius(), radius);
+                //console.log('lineupdatelineupdate 1111', e);
                 gb_station_route.reWriteEditPanel(e.target);
             });
         }
+        else if (s.shapesType == 'd') {
+            //调整多边形
+
+        }
+    };
+
+    var setDragMarker = function (marker) {
+        marker.enableDragging();
+        dragMarker = marker;
+        dragMarker._old_point = dragMarker.point;
+        //监听拖拽事件 dragging
+        dragMarker.addEventListener('dragging', dragMarkerDragEvent);
     };
-    
-    var clearOldOverlay = function () {
-        map.removeOverlay(editCircle);
-        map.removeOverlay(editPolygon);
-    }
+
+    var dragMarkerDragEvent = function () {
+        if (editPolygon) {
+            if (!BMapLib.GeoUtils.isPointInPolygon(this.point, editPolygon))
+                dragMarker.setPosition(dragMarker._old_point);//还原位置
+
+            gb_station_route.reWriteEditPanel(this, true);
+        }
+        else if (editCircle) {
+            editCircle.disableEditing();
+            //缓冲区跟随点位运动
+            editCircle.setCenter(this.point);
+            editCircle.enableEditing();
+        }
+    };
+
+    var reSetDragMarker = function () {
+        if (dragMarker) {
+            dragMarker.setPosition(dragMarker._old_point);
+            dragMarker.removeEventListener('dragging', dragMarkerDragEvent);
+            dragMarker.disableDragging();
+            dragMarker = null;
+        }
+    };
+
+
+    /*    var removeDragMarkerEvent = function () {
+     dragMarker.removeEventListener('dragging', dragMarkerDragEvent);
+     };*/
     /**
      * 禁用其他元素
      */
     var disabledOtherElem = function () {
         $('.main_left_panel_m_layer').show();
-    }
-
-    var enabledOtherElem = function () {
-        $('.main_left_panel_m_layer').hide();
-    }
+    };
     var openBufferOverlay = function (m) {
         var elem;
         var data = m.ct_data;
-        if(data.shapesType=='r'){
-            var circle = new BMap.Circle(m.point,data.radius, {strokeColor: '#E91E63'/*updownColor(data.directions)*/});
-            map.addOverlay(circle);
-            circle.enableEditing();
+        if (data.shapesType == 'r') {
+            elem = new BMap.Circle(m.point, data.radius, {strokeColor: '#E91E63'/*updownColor(data.directions)*/});
+            editCircle = elem;
+        }
+        else if (data.shapesType == 'd') {
+            var array = data.bdCoords;
+            var pos = [];
+            var temp = [];
+            for (var i = 0, c; c = array[i++];) {
+                temp = c.split(' ');
+                pos.push(new BMap.Point(temp[0], temp[1]));
+            }
+
+            elem = new BMap.Polygon(pos);
+            editPolygon = elem;
         }
-        editCircle = circle;
-        return circle;
+
+        map.addOverlay(elem);
+        elem.enableEditing();
+        return elem;
     };
     /**
@@ -379,11 +433,14 @@ var gb_ct_map = function () {
         transCoord(s);
         m.ct_data = s;
         m.setPosition(new BMap.Point(s.bd_lon, s.bd_lat));
+        m._old_point = this.point;
+        m.disableDragging();
     }
     var topOverlay;
-    function setTop(overlay){
-        if(topOverlay)
+
+    function setTop(overlay) {
+        if (topOverlay)
             topOverlay.setTop(false);
         overlay.setTop(true);
         topOverlay = overlay;
@@ -395,34 +452,367 @@ var gb_ct_map = function () {
      */
     var _drawingManager;
     var changeShapeType = function (v) {
-        if(v == 'd'){
-            map.removeOverlay(editCircle);
+        clearEditBuffer();
-            _drawingManager = new BMapLib.DrawingManager(map,{});
+        if (v == 'd') {
+            _drawingManager = new BMapLib.DrawingManager(map, {polygonOptions: styleOptions});
             _drawingManager.open();
+            _drawingManager.enableCalculate();
             _drawingManager.setDrawingMode('polygon');
             //绘制结束事件
-            _drawingManager.addEventListener('polygoncomplete', function (e) {
-                console.log('end ', e);
+            _drawingManager.addEventListener('overlaycomplete', function (e) {
+                editPolygon = e.overlay;
                 gb_station_route.drawEnd();
             });
         }
+        else if (v == 'r') {
+            updateDragRadius(80);
+
+            //圆形编辑事件 reWriteEditPanel
+            editCircle.addEventListener('lineupdate', function (e) {
+                gb_station_route.reWriteEditPanel(e.target);
+            });
+            /*map.removeOverlay(editCircle);
+             map.removeOverlay(editPolygon);
+
+             //以站点为中心，生成一个默认的圆
+             var marker = getStationMarker(s.stationCode, s.directions);
+             editCircle = new BMap.Circle(marker.point,s.radius?s.radius:50, {strokeColor: '#E91E63'});
+             editCircle.enableEditing();
+             map.addOverlay(editCircle);*/
+        }
+    };
+
+    var clearEditBuffer = function () {
+        map.removeOverlay(editCircle);
+        map.removeOverlay(editPolygon);
+        editCircle = null;
+        editPolygon = null;
+    };
+
+    var updateDragRadius = function (radius) {
+        if (!editCircle) {
+            clearOtherOverlay();
+            var s = gb_station_route.getRealEditStation();
+
+            //以站点为中心，生成一个默认的圆
+            var marker = getStationMarker(s.stationCode, s.directions);
+            var circle = new BMap.Circle(marker.point, s.radius ? s.radius : 80, {strokeColor: '#E91E63'});
+
+            setTimeout(function () {
+                circle.enableEditing();
+            }, 200);
+            map.addOverlay(circle);
+
+            editCircle = circle;
+        }
+
+        editCircle.setRadius(radius);
     };
     var exitDrawStatus = function () {
-        if(_drawingManager)
+        if (_drawingManager) {
+            clearOtherOverlay();
             _drawingManager.close();
+        }
     };
     var openDrawStatus = function () {
-        if(_drawingManager)
+        if (_drawingManager) {
+            clearOtherOverlay();
             _drawingManager.open();
+        }
+    };
+
+    var clearOtherOverlay = function () {
+        var all = map.getOverlays();
+        for (var i = 0, obj; obj = all[i++];) {
+            if (obj.ct_source && obj.ct_source == '1')
+                continue;
+            map.removeOverlay(obj);
+            //obj = null;
+        }
+    };
+
+    var closeInfoWin = function () {
+        map.closeInfoWindow();
+    };
+
+    /**
+     * 绘制新增路段
+     * @param name
+     */
+    var showAddRoadPanel = function (name, cName) {
+        map_status = 1;
+
+        var point;
+        var pId = gb_road_route.getAddPrevId();
+        if(pId){
+            //从上一个路段继续绘制
+            var prev = gb_road_route.getRoadById(pId),
+                coords = prev.bdCoords,
+                lastCoord = coords[coords.length-1].split(' ');
+
+            point = new BMap.Point(lastCoord[0], lastCoord[1]);
+        }
+
+        map.centerAndZoom(point, 18);
+
+        //开启鼠标绘制
+        _drawingManager = new BMapLib.DrawingManager(map, {
+            polylineOptions: styleOptions
+        });
+
+        _drawingManager.open();
+        //_drawingManager.enableCalculate();
+        _drawingManager.setDrawingMode('polyline');
+
+        //绘制完成
+        _drawingManager.addEventListener('polylinecomplete', function (e) {
+            console.log('eee', e, e.getPath());
+            _drawingManager.close();
+
+            var polyline = new BMap.Polyline(e.getPath(), {strokeWeight: 7, strokeColor: '#E91E63', strokeOpacity: .7});
+
+            map.removeOverlay(e);
+            map.addOverlay(polyline);
+            polyline.enableEditing();
+
+            editPolyline = polyline;
+        });
+    };
+
+    /**
+     * 为新增的站点选择一个位置
+     */
+    var showAddPointPanel = function (name) {
+        map_status = 1;
+        var spp = gb_station_route.getTemps()['geo_d_e_add_search_point_panel-temp']({name: name});
+        $('body').append(spp);
+
+        //按名称定位地图位置
+        var local = new BMap.LocalSearch(map, {
+            renderOptions: {map: map},
+            onMarkersSet: function (pos) {
+                var point;
+                if(!pos || pos.length==0){
+                    var pId = gb_station_route.getAddPrevId();
+                    if(pId){
+                        //百度没有定位到位置，默认靠近在上一个站
+                        var prev = gb_station_route.getStationById(pId);
+                        point = new BMap.Point(prev.bd_lon - 0.0001, prev.bd_lat - 0.0001);
+                    }
+                    else{
+                        //没有上一个站点，默认在地图中间
+                        point = map.getCenter()
+                    }
+                }
+                else{
+                    var old_m = pos[0].marker;
+                    point = old_m.point;
+                    //清除默认的点
+                    map.removeOverlay(old_m);
+                }
+                //进入新增点位 地图选点模式
+                startSearchPoint(point, name);
+            }
+        });
+        local.setPageCapacity(1);
+        local.search(name + "-公交车站");
+    };
+
+    var a_s_p_maeker;
+    var startSearchPoint = function (point, name) {
+        var m = createYellowStation(point, name);
+        m.enableDragging();
+        map.addOverlay(m);
+        map.setCenter(point);
+
+        if(map.getZoom() < 16)
+            map.setZoom(16);
+
+        _updateSearchPoint(m);
+        m.addEventListener('dragging', function () {
+            _updateSearchPoint(this);
+        });
+
+        //监听地图双击事件
+        map.disableDoubleClickZoom();
+        map.addEventListener('dblclick', pickupPoint);
+
+        a_s_p_maeker = m;
+    };
+
+    /**
+     * 拾取坐标点位
+     */
+    var pickupPoint = function (e) {
+        var point = e.point;
+
+        a_s_p_maeker.setPosition(point);
+        _updateSearchPoint(a_s_p_maeker);
+    };
+
+    var _updateSearchPoint = function (m) {
+        gb_station_route.reWriteSearchPointPanel(m.point);
+    };
+    /**
+     * 创建一个黄色的，带添加的站点marker
+     * @param point
+     * @returns {BMap.Marker}
+     */
+    function createYellowStation(point, name) {
+        var marker = new BMap.Marker(point);
+
+        //根据站点名称 计算marker 宽度
+        var w = name.length * 12 + 38
+            , iw = w - 2;
+        var icon = new BMap.Icon(createStationIcon({
+            stationName: name, index: '?'
+        }, w, '#ff9800'), new BMap.Size(iw, 24), {anchor: new BMap.Size(iw / 2, 25)});
+        marker.setIcon(icon);
+        marker.setShadow(null);
+
+        marker.addEventListener('click', function () {
+            if (map_status != 1)
+                openStationInfoWin(this);
+        });
+
+        //mouseover
+        marker.addEventListener('mouseover', function () {
+            setTop(this);
+        });
+        return marker;
+    }
+
+    /**
+     * 重绘一个走向的站点
+     * @param upDown
+     */
+    var reDrawStation = function (upDown) {
+        $.each(stationMarkers[upDown], function () {
+            map.removeOverlay(this);
+        });
+        stationMarkers[upDown] = [];
+
+        clearOtherOverlay();
+        _renderStationMarket(gb_station_route.getData()[upDown]);
+    };
+
+    /**
+     * 重绘一个走向的路段
+     * @param upDown
+     */
+    var reDrawRoad = function (upDown) {
+        $.each(roadPolylines[upDown], function () {
+            map.removeOverlay(this);
+        });
+        roadPolylines[upDown] = [];
+
+        clearOtherOverlay();
+
+        _renderPolyline(gb_road_route.getData()[upDown], updownColor(upDown));
+    };
+
+
+    /**
+     * 进入路段编辑模式
+     * @param road
+     */
+    var editPolyline;
+    var start_edit_road= function (road) {
+        map.closeInfoWindow();//关闭infoWindow
+        map_status = 1;
+        gb_road_route.focus(road);
+
+        //居中
+        console.log('road.cproad.cp', road.cp);
+        map.centerAndZoom(new BMap.Point(road.cp.longitude, road.cp.latitude), 20);
+
+        //路段变色
+        var polyline = getRoadPolyline(road.sectionCode, road.directions);
+        editPolyline = polyline;
+        polyline.setStrokeColor('#E91E63');
+
+        //路段可编辑
+        polyline.enableEditing();
+
+        //lineupdate，计算长度 mouseup
+        polyline.addEventListener('lineupdate', reCalcPathLength);
+        //gb_road_route.showPathLength(geolib.getPathLength(polyline.getPath()));
+    }
+
+    /**
+     * 计算并显示路段长度
+     * @param p
+     */
+    var reCalcPathLength = function () {
+        var len = geolib.getPathLength(this.getPath());
+        gb_road_route.showPathLength(len);
     };
+
+    var getRoadPolyline = function (code, updown) {
+        var array = roadPolylines[updown],
+            polyline;
+        for (var i = 0, p; p = array[i++];) {
+            if (p.ct_data.sectionCode == code) {
+                polyline = p;
+                break;
+            }
+        }
+        return polyline;
+    };
+
+    var focusMarker;
+    var focusPoint = function (lat, lng) {
+        var p = new BMap.Point(lng,lat);
+        map.setCenter(p);
+
+        clearfocus();
+
+        var marker = new BMap.Marker(p);
+        map.addOverlay(marker);
+        marker.setAnimation(BMAP_ANIMATION_BOUNCE);
+        focusMarker = marker;
+        var zoom = map.getZoom();
+        if(zoom < 18)
+            map.setZoom(18);
+    };
+
+    var clearfocus = function () {
+        if(focusMarker){
+            map.removeOverlay(focusMarker);
+            focusMarker = null;
+        }
+    };
+
+    /**
+     * 退出路段编辑模式
+     */
+    var exitEditRoadStatus = function (road, noFocus) {
+        map_status = 0;
+        $('.main_left_panel_m_layer').hide();
+        $('.road_edit_panel').remove();
+
+        editPolyline.removeEventListener('lineupdate', reCalcPathLength);
+        editPolyline = null;
+        if(noFocus)
+            return;
+
+        //polyline
+        var polyline = getRoadPolyline(road.sectionCode, road.directions);
+        polyline.disableEditing();
+        polyline.ct_data = road;
+        polyline.setStrokeColor(updownColor(road.directions));
+
+        openRoadInfoWin(polyline, new BMap.Point(road.cp.longitude, road.cp.latitude));
+    };
+
     res_load_ep.emitLater('load_map');
     return {
         _render: _render,
-        changeUpDown:changeUpDown,
+        changeUpDown: changeUpDown,
         focusStation: focusStation,
         focusRoad: focusRoad,
         editStationBuffer: editStationBuffer,
@@ -430,6 +820,29 @@ var gb_ct_map = function () {
         exitEditBufferStatus: exitEditBufferStatus,
         changeShapeType: changeShapeType,
         exitDrawStatus: exitDrawStatus,
-        openDrawStatus: openDrawStatus
+        openDrawStatus: openDrawStatus,
+        getDrawPolygon: function () {
+            return editPolygon;
+        },
+        getDrawPolyline: function () {
+            return editPolyline;
+        },
+        updateDragRadius: updateDragRadius,
+        closeInfoWin: closeInfoWin,
+        showAddPointPanel: showAddPointPanel,
+        resetMapStatus: function () {
+            map_status = 0;
+            clearOtherOverlay();
+            map.removeEventListener('dblclick', pickupPoint);
+            map.enableDoubleClickZoom();
+        },
+        reDrawStation: reDrawStation,
+        reDrawRoad: reDrawRoad,
+        edit_road: start_edit_road,
+        exitEditRoadStatus: exitEditRoadStatus,
+        showAddRoadPanel: showAddRoadPanel,
+        map: map,
+        focus: focusPoint,
+        clearfocus: clearfocus
     };
 }();
 \ No newline at end of file
@@ -10,12 +10,10 @@ var gb_road_route = function () {
         var ep = EventProxy.create("data", "temp", function (data, temp) {
             road_maps = data;
             temps = temp;
-            console.log('roads', road_maps);
             //按顺序，名称分组
             var ups = _group(road_maps[0]);
             var downs = _group(road_maps[1]);
-            console.log('upsupsups', ups, 'downsdownsdowns', downs);
             //渲染
             var upHtmlStr = temps['geo_d_e_road_route-temp']({list: ups});
             $('.up_down_route_list>li:first>.road_route').html(upHtmlStr);
@@ -30,6 +28,13 @@ var gb_road_route = function () {
             rs.list.sort(function (a, b) {
                 return parseInt(a.sectionrouteCode) - parseInt(b.sectionrouteCode);
             });
+
+            var _pos;
+            $.each(rs.list, function () {
+                _pos = cv_points(this.bdCoords);
+                this.cp = geolib.getCenter(_pos);
+                this.len = geolib.getPathLength(_pos);
+            });
             ep.emit('data', gb_common.groupBy(rs.list, 'directions'));
         });
@@ -70,8 +75,10 @@ var gb_road_route = function () {
     };
     var focus = function (data) {
+        clearFocus();
         //sectionCode
-        var elem = $('.up_down_route_list>li>.road_route .road_li_' + data.sectionCode);
+        var elem = $('.up_down_route_list>li>.road_route .r_r_item a[data-code='+data.sectionCode+']');
+        elem = elem.parent();
         elem.addClass('ct_active');
         if (!isShow(elem)) {
@@ -89,6 +96,246 @@ var gb_road_route = function () {
         return elem.offset().top < wrap.height() + 122 && elem.offset().top > 122;
     };
+    /**
+     * 路段编辑
+     * @param road
+     */
+    var edit_road = function (road) {
+        $('.main_left_panel_m_layer').show();
+        //弹出编辑面板
+        var $editPanel = $(temps['geo_d_e_road_edit_panel-temp'](road));
+        $('body').append($editPanel);
+
+        gb_ct_map.edit_road(road);
+
+        /**
+         * 点击取消
+         */
+        $('button.cancel', $editPanel).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);
+        });
+    };
+
+    var showPathLength = function (len) {
+        $('.road_edit_panel kbd>span').text(len);
+    };
+
+    var addPrevId;//添加路段路由的上一个路由ID
+    var insert_road_before = function (road) {
+        isPrevEnd(road);
+
+        //在之前插入路段
+        var cell = getRoadLI(road);
+
+        var addCell = $(temps['geo_d_e_add_road_panel-temp'](road));
+
+        cell.before(addCell);
+
+        add_road(addCell);
+    };
+
+    var insert_road_after = function (road) {
+        isPrevEnd(road);
+
+        //在之后插入路段
+        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);
+        else
+            cell.after(addCell);
+        add_road(addCell);
+    };
+
+    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'});
+    };
+
+    var add_road = function (cell) {
+        gb_ct_map.closeInfoWin();
+        //焦点
+        var $nameInput = $('input[name=sectionName]', cell);
+        $nameInput.focus();
+
+        //取消
+        $('.cancel_icon_btn', cell).on('click', function () {
+            cell.remove();
+        });
+
+        //选择地图位置
+        $('.search_point_icon_btn', cell).on('click', function () {
+            $('.station_li_transient').removeClass('_search_point');
+            $(this).parents('.station_li_transient').addClass('_search_point');
+            var name = $nameInput.val();
+            if(!name)
+                return UIkit.notification("你必须输入路段名称！", {status: 'danger'});
+
+            $('.main_left_panel_m_layer').show();
+            //gb_ct_map.showAddRoadPanel(name, $('input[name=crosesRoad]',cell).val());
+            showDrawPanel(name, $('input[name=crosesRoad]',cell).val());
+        });
+        //监听回车事件
+        $('input', cell).on('keydown', function (e) {
+            if(event.keyCode == "13")
+                $('.search_point_icon_btn', cell).trigger('click');
+        });
+
+        //上一个路段的ID
+        var $prev = cell.prev('.r_r_item');
+        if($prev.length > 0)
+            addPrevId = $prev.data('id');
+        else{
+            if(cell.parent().hasClass('bks_list'))
+                addPrevId = cell.parents('.r_r_item').data('id');
+            else
+                addPrevId = -1;
+        }
+    };
+
+    var getRoadLI = function (r) {
+        return $('.up_down_route_list>li:eq('+r.directions+')>.road_route .r_r_item[data-code='+r.sectionCode+']');
+    };
+
+    var realEditRoad;
+    var callbackHandler = {
+        edit: edit_road,
+        insert_before: insert_road_before,
+        insert_after: insert_road_after,
+        destroy: function (road) {
+            gb_data_submit.destroyRoad(road);
+        }
+    };
+    //$('.up_down_route_list>li>.road_route .r_r_item a[data-code='+data.sectionCode+']')
+    $.contextMenu({
+        selector: '.up_down_route_list>li>.road_route .r_r_item a[data-code]',
+        className: 'station-route-ct-menu',
+        callback: function (key, options) {
+            var aLink = options.$trigger;
+            var code = aLink.data('code'),
+                updown = aLink.data('updown');
+
+            var road = getRoad(code, updown);
+            realEditRoad = road;
+            callbackHandler[key] && callbackHandler[key](road);
+        },
+        items: {
+            'edit': {
+                name: '编辑'
+            },
+            'sep1': '---------',
+            'insert_after': {
+                name: '新增路段（之后）'
+            },
+            'insert_before': {
+                name: '新增路段（之前）'
+            },
+            'destroy': {
+                name: '撤销路段'
+            }
+        }
+    });
+
+    var getRoad = function (code, updown) {
+        var array = road_maps[updown];
+        for(var i=0,r;r=array[i++];){
+            if(r.sectionCode==code)
+                return r;
+        }
+        return null;
+    };
+
+    var cv_points = function (coords) {
+        var array = [], strs;
+        for (var i = 0, item; item = coords[i++];) {
+            strs = item.split(' ');
+            array.push({latitude: strs[1], longitude: strs[0]});
+        }
+        return array;
+    }
+
+    var update = function (road) {
+        var _pos = cv_points(road.bdCoords);
+        road.cp = geolib.getCenter(_pos);
+        road.len = geolib.getPathLength(_pos);
+        var array = road_maps[road.directions];
+        for(var i=0,item; item=array[i++];){
+            if(item.sectionCode==road.sectionCode){
+                array.splice(i - 1, 1, road);
+                break;
+            }
+        }
+
+        //重新渲染
+        var htmlStr = temps['geo_d_e_road_route-temp']({list: _group(array)});
+        $('.up_down_route_list>li:'+(road.directions==0?'first':'last')+'>.road_route').html(htmlStr);
+    };
+    
+    var updateList = function (list) {
+        var updown = list[0].directions;
+        list.sort(function (a, b) {
+            return parseInt(a.sectionrouteCode) - parseInt(b.sectionrouteCode);
+        });
+
+        var _pos;
+        $.each(list, function () {
+            _pos = cv_points(this.bdCoords);
+            this.cp = geolib.getCenter(_pos);
+            this.len = geolib.getPathLength(_pos);
+        });
+
+        road_maps[updown] = list;
+        //重新渲染
+        var htmlStr = temps['geo_d_e_road_route-temp']({list: _group(list)});
+        $('.up_down_route_list>li:'+(updown==0?'first':'last')+'>.road_route').html(htmlStr);
+
+        gb_ct_map.reDrawRoad(updown);
+    };
+
+    /**
+     * 根据ID获取路段
+     * @param id
+     */
+    var getRoadById = function (id) {
+        for(var i=0,s;s=road_maps[0][i++];){
+            if(s.id == id)
+                return s;
+        }
+        for(var i=0,s;s=road_maps[1][i++];){
+            if(s.id == id)
+                return s;
+        }
+        return null;
+    };
+
+    var showDrawPanel = function (name, cName) {
+        var spp = $(temps['geo_d_e_add_draw_polyline-temp']({name: name, cName: cName}));
+        $('body').append(spp);
+        //暂停和开始绘制
+        $('.draw_polyline_switch>a', spp).on('click', function () {
+            var t = $(this).text();
+            if(t=='暂停绘制'){
+                gb_ct_map.exitDrawStatus();
+                $(this).text('开始绘制');
+            }
+            else{
+                gb_ct_map.openDrawStatus();
+                $(this).text('暂停绘制');
+            }
+        });
+
+        gb_ct_map.showAddRoadPanel(name, cName);
+    };
+
     res_load_ep.emitLater('load_road_route');
     return {
         init: init, getData: function () {
@@ -98,6 +345,13 @@ var gb_road_route = function () {
             return temps;
         },
         clearFocus: clearFocus,
-        focus: focus
+        focus: focus,
+        showPathLength: showPathLength,
+        update: update,
+        updateList: updateList,
+        getRoadById: getRoadById,
+        getAddPrevId: function () {
+            return addPrevId;
+        }
     };
 }();
 \ No newline at end of file
+/**
+ * 地图搜索定位
+ */
+var gb_ct_search = function () {
+
+    var local;
+
+    var _$icon = $('.main_lt_search_panel span[uk-icon]');
+    var v, run_flag;
+    $('.ct_search_input').on('input', function () {
+        v = $(this).val();
+        if(run_flag)
+            return;
+
+        run_flag = true;
+        setTimeout(function () {
+            if(!v){
+                _$icon.attr('uk-icon', 'icon: search');
+                closeSearchResult();
+            }
+            else{
+                _$icon.attr('uk-icon', 'icon: close');
+                local.search(v);
+            }
+            run_flag = false;
+        }, 300);
+    });
+
+    var searchComplete = function (e) {
+        var htmlStr = template('geo_d_e_search_result-temp', {list: e.wr});
+        $('.ct_search_result').html(htmlStr);
+
+    };
+
+    _$icon.on('click', function () {
+        var type = $(this).attr('uk-icon');
+        if(type=='icon: close'){
+            $('.ct_search_input').val('');//.trigger('input');
+            _$icon.attr('uk-icon', 'icon: search');
+            closeSearchResult();
+        }
+    });
+
+    $(document).on('click', '.ct_search_result>ul.s_list>li', function () {
+        if($(this).hasClass('_empty'))
+            return;
+        var lat = $(this).data('lat');
+        var lng = $(this).data('lng');
+        gb_ct_map.focus(lat, lng);
+    });
+    
+    function closeSearchResult() {
+        $('.ct_search_result').empty();
+        gb_ct_map.clearfocus();
+    }
+
+    return {init: function () {
+        local = new BMap.LocalSearch(gb_ct_map.map, {
+            onSearchComplete: searchComplete
+        })
+    }}
+}();
 \ No newline at end of file
@@ -10,7 +10,8 @@ var gb_station_route = function () {
         var ep = EventProxy.create("data", "temp", function (data, temp) {
             station_maps = data;
             temps = temp;
-            console.log('station', station_maps);
+            //当前使用的线路版本
+            storage.setItem("geo_data_edit_line_version" , data[0][0].versions);
             //渲染页面
             var upHtmlStr = temps['geo_d_e_station_route-temp']({list: station_maps[0]});
             $('.up_down_route_list>li:first>.station_route').html(upHtmlStr);
@@ -50,7 +51,7 @@ var gb_station_route = function () {
     };
     var focus = function (s) {
-        var elem = $('.up_down_route_list>li>.station_route .station_li_' + s.stationCode);
+        var elem = $('.up_down_route_list>li>.station_route .s_r_item[data-code='+s.stationCode+']');
         elem.addClass('ct_active');
         if (!isShow(elem)) {
@@ -77,21 +78,148 @@ var gb_station_route = function () {
         return null;
     };
+    /**
+     * 编辑站点名称
+     * @param station
+     */
+    var station_edit_name = function (station) {
+        var cellWrap = getStationLI(station);
+        $('a[data-code]', cellWrap).hide();
+
+        cellWrap.append(temps['geo_d_e_edit_name_panel-temp'](station)).addClass('_edit_name');
+        //焦点
+        $('input[name=stationName]', cellWrap).focus();
+        //取消
+        $('.cancel_icon_btn', cellWrap).on('click', function () {
+            $('.ul_li_input', cellWrap).remove();
+            $('a[data-code]', cellWrap).show();
+        });
+    };
+
+    var getStationLI = function (s) {
+        return $('.up_down_route_list>li:eq('+s.directions+')>.station_route .s_r_item[data-code='+s.stationCode+']');
+    };
+
+    var addPrevId;//添加站点路由的上一个站点ID
+    var insert_station_before = function (station) {
+        //在之前插入站点
+        var cell = getStationLI(station);
+
+        var addCell = $(temps['geo_d_e_add_station_panel-temp'](station));
+        cell.before(addCell);
+
+        add_station(addCell);
+    };
+
+
+    //添加站点 取消按钮
+    $(document).on('click', '.add_station_search_point_wrap button.cancel', function () {
+        $('.main_left_panel_m_layer').hide();
+        $(this).parents('.buffer_edit_body').parent().remove();
+        gb_ct_map.resetMapStatus();
+    });
+
+    var add_station = function (addCell) {
+        gb_ct_map.closeInfoWin();
+        //焦点
+        var $nameInput = $('input[name=stationName]', addCell);
+        $nameInput.focus();
+        //取消
+        $('.cancel_icon_btn', addCell).on('click', function () {
+            addCell.remove();
+        });
+
+        //选择地图位置
+        $('.search_point_icon_btn', addCell).on('click', function () {
+            $('.station_li_transient').removeClass('_search_point');
+            $(this).parents('.station_li_transient').addClass('_search_point');
+            var name = $nameInput.val();
+            if(!name)
+                return UIkit.notification("你必须输入站点名称！", {status: 'danger'});
+
+            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')
+            if($prev.length > 0)
+                addPrevId = $prev.data('id');
+            else
+                addPrevId = -1;
+
+            $('.main_left_panel_m_layer').show();
+            gb_ct_map.showAddPointPanel(name);
+
+        });
+        //监听回车事件
+        $('[name=stationName]', addCell).on('keydown', function (e) {
+            if(event.keyCode == "13")
+                $('.search_point_icon_btn', addCell).trigger('click');
+        });
+    };
+    
+    var prevs = function (that, clazz) {
+        var prev;
+        while(true){
+            prev = $(that).prev();
+
+            if(prev.length == 0)
+                return null;
+
+            if(prev.hasClass(clazz))
+                return prev;
+
+            that = prev;
+        }
+    };
+
+    /**
+     * name 是否重复
+     * @param name
+     */
+    var is_duplication = function (name) {
+        var array = station_maps[getUpDown()];
+        for(var i=0, s; s=array[i++];){
+            if(s.stationName==$.trim(name))
+                return true;
+        }
+        return false;
+    };
+
+    var insert_station_after = function (station) {
+        //在之后插入站点
+        var cell = getStationLI(station);
+
+        var addCell = $(temps['geo_d_e_add_station_panel-temp'](station));
+        cell.after(addCell);
+
+        add_station(addCell);
+    };
+    
+    var realEditStation;
     var callbackHandler = {
         edit_buffer: function (station) {
-            //编辑缓冲区
             gb_ct_map.editStationBuffer(station);
+        },
+        edit_name: station_edit_name,
+        insert_before: insert_station_before,
+        insert_after: insert_station_after,
+        destroy: function (station) {
+            gb_data_submit.destroyStation(station);
         }
     };
     $.contextMenu({
-        selector: '._route_info_wrap .up_down_route_list .station_route>ul>li',
+        selector: '._route_info_wrap .up_down_route_list .station_route>ul>li>a[data-code]',
         className: 'station-route-ct-menu',
         callback: function (key, options) {
-            var aLink = options.$trigger.find('a[data-code]');
+            var aLink = options.$trigger;
             var code = aLink.data('code'),
                 updown = aLink.data('updown');
             var station = getStation(code, updown);
+            realEditStation = station;
             callbackHandler[key] && callbackHandler[key](station);
         },
         items: {
@@ -99,14 +227,17 @@ var gb_station_route = function () {
                 name: '编辑缓冲区'
             },
             'sep1': '---------',
-            'edit': {
-                name: '编辑基础信息'
+            'edit_name': {
+                name: '修改站点名称'
+            },
+            'insert_after': {
+                name: '新增站点（之后）'
             },
             'insert_before': {
-                name: '新增站点（前）'
+                name: '新增站点（之前）'
             },
-            'insert_after': {
-                name: '新增站点（后）'
+            'destroy': {
+                name: '撤销站点'
             }
         }
     });
@@ -115,30 +246,97 @@ var gb_station_route = function () {
         var htmlStr = temps['geo_d_e_map_edit_buffer_panel-temp'](s);
         $('.ct_page').append(htmlStr);
         $('.buffer_edit_panel').show();
+
+        //缓冲区编辑 取消
+        $('button.cancel', $editWrap).on('click', function (e) {
+            $('.main_left_panel_m_layer').hide();
+            $(this).parents('.buffer_edit_body').parent().remove();
+            gb_ct_map.resetMapStatus();
+
+            var f = $(this).parents('form');
+            var data = f.serializeJSON();
+
+            gb_ct_map.exitEditBufferStatus(data);
+        });
+
+        var $editWrap = '.buffer_edit_panel>.buffer_edit_body';
+
+        //缓冲区编辑 切换缓冲区类型（圆形，多边形）
+        $('select[name=shapesType]', $editWrap).on('change', function (e) {
+            var v = $(this).val();
+            if(v=='d'){
+                $('.buffer_edit_panel .shapes_type').addClass('st_d');
+            }
+            else{
+                $('.buffer_edit_panel .shapes_type').removeClass('st_d');
+                $('input[name=radius]', $editWrap).val(80);
+            }
+            gb_ct_map.changeShapeType(v);
+        });
+
+        //半径修改
+        var update_radius_flag, update_radius;
+        $('input[name=radius]', $editWrap).on('input', function (e) {
+            update_radius = $(this).val();
+            if(update_radius_flag){
+                return;
+            }
+            update_radius_flag = true;
+            setTimeout(function () {
+                gb_ct_map.updateDragRadius(update_radius);
+                update_radius_flag = false;
+            }, 180);
+        });
+
+        //缓冲区编辑 切换绘制模式
+        $('.draw_polygon_switch', $editWrap).on('input', function (e) {
+            var type = $(this).data('type');
+            if(type==1){
+                //退出绘制状态
+                gb_ct_map.exitDrawStatus();
+                $(this).data('type', 0).find('a').text('开始绘制');
+            }
+            else if(type==0 || type==2){
+                gb_ct_map.openDrawStatus();
+                $(this).data('type', 1).find('a').text('暂停绘制');
+            }
+            else if(type==3){
+                gb_ct_map.changeShapeType('d');
+                $(this).data('type', 1).find('a').text('暂停绘制');
+            }
+        });
     };
-    var hideEditPanel = function () {
-        $('.buffer_edit_panel').remove();
+    /**
+     * 绘制结束
+     */
+    var drawEnd = function () {
+        $('.buffer_edit_panel>.buffer_edit_body .draw_polygon_switch').data('type', 2).find('a').text('重新绘制');
     };
     var edPanelRunFlag;
     var ecObj;
-    var reWriteEditPanel = function (ec) {
+    var reWriteEditPanel = function (ec, isPolygon) {
+        ecObj = ec;
         if(edPanelRunFlag){
-            ecObj = ec;
             return;
         }
         edPanelRunFlag = true;
         setTimeout(function () {
             var panel = $('.buffer_edit_panel');
-            $('[name=radius]', panel).val(parseInt(ecObj.getRadius()));//半径
+            var p;
+            if(!isPolygon){
+                $('[name=radius]', panel).val(parseInt(ecObj.getRadius()));//半径
+                p = ecObj.getCenter();
+            }else{
+                p = ecObj.point;
+            }
-            var p = ecObj.getCenter();
             $('[name=gLaty]', panel).val(p.lat);
             $('[name=gLonx]', panel).val(p.lng);
             edPanelRunFlag = false;
-        }, 170);
+        }, 200);
     };
     var update = function (s) {
@@ -146,65 +344,123 @@ var gb_station_route = function () {
         for(var i=0,item; item=array[i++];){
             if(item.stationCode==s.stationCode){
                 s.index = i;
-                array.splice(i, 1, s);
+                array.splice(i - 1, 1, s);
                 break;
             }
         }
+
+        //替换
+        var sCell = $(temps['geo_d_e_station_route_one-temp'](s));
+        $('a.uk-animation-shake', sCell).on('webkitAnimationEnd', function () {
+            $(this).removeClass('uk-animation-shake');
+        });
+        getStationLI(s).replaceWith(sCell);
     };
-    /**
-     * 缓冲区编辑 取消
-     */
-    $(document).on('click', '.buffer_edit_panel>.buffer_edit_body button.cancel', function (e) {
-        var f = $(this).parents('form');
-        var data = f.serializeJSON();
+    //取消按钮
+/*    $(document).on('click','.buffer_edit_body button.cancel', function (e) {
+        $('.main_left_panel_m_layer').hide();
+        $(this).parents('.buffer_edit_body').parent().remove();
+        gb_ct_map.resetMapStatus();
+    });*/
-        gb_ct_map.exitEditBufferStatus(data);
-    });
-    /**
-     * 缓冲区编辑 切换缓冲区类型（圆形，多边形）
-     */
-    $(document).on('click', '.buffer_edit_panel>.buffer_edit_body select[name=shapesType]', function (e) {
-        var v = $(this).val();
+    var spcPanelRunFlag;
+    var spcPoint;
+    var reWriteSearchPointPanel = function (point) {
+        spcPoint = point;
+        if(spcPanelRunFlag){
+            return;
+        }
+
+        spcPanelRunFlag = true;
+        setTimeout(function () {
+            var panel = $('.add_station_search_point_wrap .buffer_edit_body');
-        gb_ct_map.changeShapeType(v);
-        if(v=='d'){
-            $('.buffer_edit_panel .shapes_type').addClass('st_d');
+            $('[name=gLaty]', panel).val(spcPoint.lat);
+            $('[name=gLonx]', panel).val(spcPoint.lng);
+            spcPanelRunFlag = false;
+        }, 200);
+    };
+    var updateStationRouteData = function (list) {
+        list.sort(function (a, b) {
+            return parseInt(a.stationRouteCode) - parseInt(b.stationRouteCode);
+        });
-            //
-            //UIkit.notification("使用鼠标在地图上绘制多边形，可点击上发“暂停绘制”链接，退出绘制模式，以拖拽地图", {status: 'primary', pos: 'bottom-center'})
-        }
-        else{
-            $('.buffer_edit_panel .shapes_type').removeClass('st_d');
+        var upDown = list[0].directions;
+        var dataMaps = {};
+        //更新数据
+        for(var i=0,s;s=list[i++];){
+            s.index = i;
+            dataMaps[s.id] = s;
         }
-    });
+        station_maps[upDown] = list;
+        //更新序号
+        var wrap = $('.up_down_route_list>li:eq('+upDown+')>.station_route');
+        $('.s_r_item', wrap).each(function () {
+            $(this).replaceWith(
+                temps['geo_d_e_station_route_one-temp'](dataMaps[$(this).data('id')]));
+        });
+
+        //延迟清除动画class
+        setTimeout(function () {
+            $('.s_r_item a.uk-animation-shake', wrap).removeClass('uk-animation-shake');
+        }, 1000);
+
+        //更新地图
+        gb_ct_map.reDrawStation(upDown);
+    };
     /**
-     * 缓冲区编辑 切换绘制模式
+     * 添加结束，刷新List
+     * @param list
      */
-    var drawPolygonSwitch = '.buffer_edit_panel>.buffer_edit_body .draw_polygon_switch';
-    $(document).on('click', drawPolygonSwitch, function (e) {
-        var type = $(this).data('type');
-        if(type==1){
-            //退出绘制状态
-            gb_ct_map.exitDrawStatus();
-            $(this).data('type', 0).find('a').text('开始绘制');
-        }
-        else if(type==0 || type==2){
-            gb_ct_map.openDrawStatus();
-            $(this).data('type', 1).find('a').text('暂停绘制');
-        }
-    });
+    var addEnd = function (list, _newRCode) {
+        updateStationRouteData(list);
+
+        var upDown = list[0].directions;
+        var wrap = $('.up_down_route_list>li:eq('+upDown+')>.station_route');
+        //新增的站点路由
+        var ns = getStationByRouteCode(upDown, _newRCode);
+        $('.station_li_transient._search_point', wrap).replaceWith(
+            temps['geo_d_e_station_route_one-temp'](ns)
+        );
+
+        $('.main_left_panel_m_layer').hide();
+        $('.add_station_search_point_wrap').remove();
+    };
     /**
-     * 绘制结束
+     * 撤销完成
+     * @param list
      */
-    var drawEnd = function () {
-        $(drawPolygonSwitch).data('type', 2).find('a').text('重新绘制');
+    var destroyEnd = function (list, station) {
+        //被撤销的
+        $('.up_down_route_list .s_r_item[data-id='+station.id+']').remove();
+        updateStationRouteData(list);
+    };
+    
+    var getStationByRouteCode = function (upDown, _newRCode) {
+        var list = station_maps[upDown];
+        for(var i=0,s; s=list[i++];){
+            if(s.stationRouteCode==_newRCode)
+                return s;
+        }
+        return null;
     };
+    var getStationById = function (id) {
+        for(var i=0,s;s=station_maps[0][i++];){
+            if(s.id == id)
+                return s;
+        }
+        for(var i=0,s;s=station_maps[1][i++];){
+            if(s.id == id)
+                return s;
+        }
+        return null;
+    };
     res_load_ep.emitLater('load_station_route');
     return {
@@ -218,9 +474,18 @@ var gb_station_route = function () {
         clearFocus: clearFocus,
         focus: focus,
         showEditPanel: showEditPanel,
-        hideEditPanel: hideEditPanel,
         reWriteEditPanel: reWriteEditPanel,
         update: update,
-        drawEnd: drawEnd
+        drawEnd: drawEnd,
+        getRealEditStation: function () {
+            return realEditStation;
+        },
+        reWriteSearchPointPanel: reWriteSearchPointPanel,
+        getAddPrevId: function () {
+            return addPrevId;
+        },
+        addEnd: addEnd,
+        destroyEnd: destroyEnd,
+        getStationById:getStationById
     };
 }();
 \ No newline at end of file
@@ -10,13 +10,27 @@ var gb_data_submit = function () {
         var f = $(this).parents('form');
         var data = f.serializeJSON();
         UIkit.modal.confirm('确定保存【'+data.stationName+'】的缓冲区信息？').then(function() {
+            if(data.shapesType=='d'){
+                var polygon = gb_ct_map.getDrawPolygon();
+                if(null == polygon){
+                    alert('失败，无法获取到 polygon..');
+                    return;
+                }
+                var pos = polygon.getPath();
+                //闭合
+                pos.push(pos[0]);
+                var gPolygonGrid = '';
+                for(var i=0,p;p=pos[i++];){
+                    gPolygonGrid += (p.lng + " " + p.lat + ",");
+                }
+                data.gPolygonGrid = gPolygonGrid.substr(0, gPolygonGrid.length - 1);
+            }
-            //console.log('aaa',f, f.serializeJSON());
-            show_run_text('正在提交缓冲区信息');
+            //gb_ct_map.removeDragMarkerEvent();
+            show_run_text('正在提交缓冲区信息...');
             gb_common.$post('/_geo_data/updateBufferInfo', data, function (rs) {
                 hide_run_text();
                 UIkit.notification("提交成功！", {status: 'success'});
-
                 //更新前端数据
                 gb_station_route.update(rs.station);
                 gb_ct_map.updateStation(rs.station);
@@ -24,12 +38,123 @@ var gb_data_submit = function () {
                 //退出编辑模式
                 gb_ct_map.exitEditBufferStatus(rs.station);
             });
-        }, function () {
-            console.log('Rejected.')
         });
         return false;
     });
+    /**
+     * 修改名称提交
+     */
+    $(document).on('click', '.up_down_route_list .station_route .ul_li_input .save_icon_btn', function (e) {
+        var f = $(this).parents('form');
+        var data = f.serializeJSON();
+
+        UIkit.modal.confirm('确定将站点名称修改为【'+data.stationName+'】？').then(function() {
+            show_run_text('正在保存...');
+
+            gb_common.$post('/_geo_data/updateStationName', data, function (rs) {
+                hide_run_text();
+                UIkit.notification("修改成功！", {status: 'success'});
+                gb_station_route.update(rs.station);
+            });
+        });
+    });
+
+    /**
+     * 新增站点提交
+     */
+    $(document).on('click', '.add_station_search_point_wrap .buffer_edit_body button.submit', function (e) {
+        var f = $(this).parents('form');
+        var data = f.serializeJSON();
+        data.stationName = $.trim(data.stationName);
+
+        UIkit.modal.confirm('确定新增站点【'+data.stationName+'】？').then(function() {
+            data.lineCode = storage.getItem('geo_data_edit_line_code');
+            data.versions = storage.getItem('geo_data_edit_line_version');
+            data.upDown = getUpDown();
+            data.prevRouteId = gb_station_route.getAddPrevId();
+            data.lng = data.gLonx;
+            data.lat = data.gLaty;
+
+            delete data.gLonx;
+            delete data.gLaty;
+            show_run_text('正在提交数据...');
+            //添加
+            gb_common.$post('/_geo_data/addNewStationRoute', data, function (rs) {
+                gb_station_route.addEnd(rs.list, rs.newStationRouteCode);
+
+                hide_run_text();
+                UIkit.notification("修改成功！", {status: 'success'});
+            });
+        });
+        return false;
+    });
+
+    /**
+     * 新增路段提交
+     */
+    $(document).on('click', '.add_road_search_point_wrap .buffer_edit_body button.submit', function (e) {
+        var f = $(this).parents('form');
+        var data = f.serializeJSON();
+
+        UIkit.modal.confirm('确定新增路段【'+data.sectionName+'（'+data.crosesRoad+'）】？').then(function() {
+            data.lineCode = storage.getItem('geo_data_edit_line_code');
+            data.versions = storage.getItem('geo_data_edit_line_version');
+            data.upDown = getUpDown();
+
+            data.prevRouteId = gb_road_route.getAddPrevId();
+
+            var polyline = gb_ct_map.getDrawPolyline();
+            var pos = polyline.getPath();
+            var gsectionVector = '';
+            for(var i=0,p;p=pos[i++];){
+                gsectionVector += (p.lng + " " + p.lat + ",");
+            }
+            data.coords = gsectionVector.substr(0, gsectionVector.length - 1);
+
+            show_run_text('正在提交数据...');
+            //添加
+            gb_common.$post('/_geo_data/addNewRoadRoute', data, function (rs) {
+
+                gb_road_route.updateList(rs.list);
+                hide_run_text();
+                UIkit.notification("添加成功！", {status: 'success'});
+                $('.add_road_search_point_wrap').remove();
+                gb_ct_map.exitEditRoadStatus(null, true);
+            });
+        });
+        return false;
+    });
+
+    /**
+     * 路段编辑提交
+     */
+    $(document).on('click', '.road_edit_panel .buffer_edit_body button.submit', function (e) {
+        var f = $(this).parents('form');
+        var data = f.serializeJSON();
+
+        var polyline = gb_ct_map.getDrawPolyline();
+        var pos = polyline.getPath();
+        var gsectionVector = '';
+        for(var i=0,p;p=pos[i++];){
+            gsectionVector += (p.lng + " " + p.lat + ",");
+        }
+        data.gsectionVector = gsectionVector.substr(0, gsectionVector.length - 1);
+
+        console.log('data', data);
+        UIkit.modal.confirm('确定保存编辑的【'+data.sectionName+'】？').then(function() {
+            show_run_text('正在保存...');
+
+            gb_common.$post('/_geo_data/updateRoadInfo', data, function (rs) {
+                hide_run_text();
+                UIkit.notification("修改成功！", {status: 'success'});
+                gb_road_route.update(rs.road);
+
+                gb_ct_map.exitEditRoadStatus(rs.road);
+            });
+        });
+    });
+
     var show_run_text = function (t) {
         $('.text', $loadPanel).text(t);
         $loadPanel.show();
@@ -39,5 +164,49 @@ var gb_data_submit = function () {
         $('.text', $loadPanel).text('');
         $loadPanel.hide();
     };
-    return {};
+
+    /**
+     * 撤销站点
+     * @param station
+     */
+    var destroyStation = function (station) {
+
+        UIkit.modal.confirm('确定撤销站点【'+station.stationName+'】？').then(function() {
+            show_run_text('正在撤销...');
+
+            gb_common.$post("/_geo_data/destroyStation", station, function (rs) {
+                gb_station_route.destroyEnd(rs.list, station);
+                hide_run_text();
+                UIkit.notification("撤销成功！", {status: 'success'});
+            });
+        });
+    }
+
+    /**
+     * 撤销路段
+     * @param road
+     */
+    var destroyRoad = function (road) {
+        UIkit.modal.confirm('确定撤销路段【'+road.sectionName+'】？').then(function() {
+            show_run_text('正在撤销...');
+            console.log('road', road);
+
+            delete road.bdCoords;
+            delete road.cp;
+            gb_common.$post("/_geo_data/destroyRoad", road, function (rs) {
+
+                gb_road_route.updateList(rs.list);
+                hide_run_text();
+                UIkit.notification("撤销成功！", {status: 'success'});
+            });
+        });
+    };
+
+    function getUpDown(){
+        return $('._route_info_wrap>ul>li:first').hasClass('uk-active')?0:1;
+    }
+    return {
+        destroyStation: destroyStation,
+        destroyRoad: destroyRoad
+    };
 }();
 \ No newline at end of file
@@ -2,6 +2,85 @@
 var gb_version_manage = function () {
+    var array;
+    var lineName;
+    var current;
+
+    var temps;
+    var init = function (cVersion) {
+        var lineCode = storage.getItem("geo_data_edit_line_code");
+        //获取线路版本信息
+        gb_common.$get('/_geo_data/findVersionInfo', {lineCode: lineCode}, function (rs) {
+            array = rs.list;
+            lineName = array[0].lineName;
+
+            //当前使用版本
+            for(var i=0,obj;obj=array[i++];){
+                if(obj.versions==cVersion){
+                    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>');
+        });
+
+        $.get('/pages/base/geo_data_edit/fragments/versions.html', function (dom) {
+            temps = gb_common.compileTempByDom(dom, {
+                compress: true
+            });
+        });
+    };
+
+    /**
+     * 新增
+     */
+    $('.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 modal = '#add_line_versions_modal';
+        var reSetName = function () {
+            var remark = $('[name=remark]', modal).val();
+            var rq = $('[name=startDate]', modal).val();
+
+            $('[name=name]', modal).val(rq.substr(0, 10).replace(/-/g,'') + remark);
+        };
+        //自动填充版本名称
+        $('[name=remark]', modal).on('change', reSetName);
+        $('[name=startDate]', modal).on('input', reSetName);
+    });
+
+    $(document).on('hidden', '.uk-modal', function () {
+        $(this).remove();
+        $('.flatpickr-calendar').remove();
+    });
+
+
+    /**
+     * 提交新增的线路版本
+     */
+    $(document).on('click', '#add_line_versions_modal button._submit', function () {
+
+    });
+
     res_load_ep.emitLater('load_version_manage');
-    return {};
+    return {
+        init: init,
+        getLineName: function () {
+            return lineName;
+        }
+    };
 }();
 \ No newline at end of file
@@ -12,6 +12,7 @@
           type="text/css" />
     <!-- main css -->
     <link rel="stylesheet" href="/pages/base/geo_data_edit/css/mian.css"  />
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.css">
 </head>
 <body>
@@ -24,11 +25,11 @@
     <div class="main_left_panel">
         <div class="_line_info">
             <div class="_line_name">
-                961路
-                <a uk-icon="icon: plus" class="add_line_version_icon" title="添加一个新的线路版本" uk-tooltip></a>
+                <span></span>
+                <a uk-icon="icon: plus" class="add_line_version_icon" title="新增一个线路走向版本" uk-tooltip></a>
             </div>
             <div class="_version_dropdown_wrap">
-                <a class="_version_text">原始版本 <i uk-icon="icon: chevron-down;ratio:.6"></i></a>
+                <a class="_version_text"></a>
                 <div uk-dropdown>
                     <ul class="uk-nav uk-dropdown-nav">
                         <li class="uk-nav-header">历史</li>
@@ -41,9 +42,9 @@
                     </ul>
                 </div>
             </div>
-            <span class="clock_enable_version">
+            <!--<span class="clock_enable_version">
                 <a uk-icon="icon: clock;ratio: .7" class=""></a> 25:30:20 启用（20180206线路改道）
-            </span>
+            </span>-->
         </div>
         <div class="_route_info_wrap">
@@ -72,16 +73,32 @@
         </div>
     </div>
     <div class="main_lt_search_panel">
-        <div class="uk-inline">
+        <div class="uk-inline ct_s_i_wrap">
             <span class="uk-form-icon uk-form-icon-flip" uk-icon="icon: search"></span>
-            <input class="uk-input search_input" placeholder="搜索地图位置" type="text">
+            <input class="uk-input ct_search_input" placeholder="搜索地图位置" type="text">
         </div>
+        <div class="ct_search_result"></div>
     </div>
     <div class="main_rt_tools_panel">
         <a uk-icon="icon: info;ratio: .9" class="_icon"></a>
         <a uk-icon="icon: expand;ratio: .9" class="_icon full_screen_icon"></a>
     </div>
 </div>
+
+<script id="geo_d_e_search_result-temp" type="text/html">
+    <ul class="s_list uk-list">
+        {{each list as obj i}}
+        <li data-lat="{{obj.point.lat}}" data-lng="{{obj.point.lng}}">
+            <span class="_title">{{obj.title}}</span>
+            <span class="_address">{{obj.address}}</span>
+        </li>
+        {{/each}}
+
+        {{if list.length==0}}
+            <li class="_empty">没有搜索到相关数据！</li>
+        {{/if}}
+    </ul>
+</script>
 <!-- 百度 -->
 <script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
 <script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
@@ -102,14 +119,19 @@
 <script src="/real_control_v2/geolib/geolib.js" ></script>
 <!-- jquery contextMenu -->
 <script src="/real_control_v2/assets/js/jquery.contextMenu.min.js"  ></script>
+<script src="/assets/js/baidu/bd_GeoUtils_min.js"  ></script>
+<!-- flatpickr -->
+<script src="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.js" ></script>
+<script src="/real_control_v2/assets/plugins/flatpickr/l10n/zh.js" ></script>
+
 <script>
     var $loadPanel = $('body>.loading');
     //___________________________________
     var storage = window.localStorage;
-    storage.setItem("geo_data_edit_line_code" , "70123");
     //___________________________________
     top.document.title = "绘制线路";
+
     // 关闭左侧栏
     if (!top.$('body').hasClass('page-sidebar-closed')) {top.$('.menu-toggler.sidebar-toggler').click();}
     //全屏
@@ -117,7 +139,7 @@
         window.parent.$('#geo_edit_wrap_iframe').addClass('full_screen');
     });
-    var gb_main_ep = new EventProxy()
+    var gb_main_ep = new EventProxy();
     //文件加载
     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 () {
@@ -130,16 +152,20 @@
                 //路段
                 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();
                 });
-    });
+            });
     function g_emit(id) {
         console.log('g_emit [' + id + ']');
@@ -158,13 +184,18 @@
     });
     function getUpDown(){
-        return $('._route_info_wrap>ul>li:first').hasClass('uk-active')?0:1;
+        return $('.up_down_route_list>li:first').hasClass('uk-active')?0:1;
     }
     //切换上下行显示
     $('.up_down_route_list').on('show', function () {
         gb_ct_map.changeUpDown();
     });
+
+    $(document).on('submit', 'form', function (e) {
+        e.stopPropagation();
+        return false;
+    });
 </script>
 <!--- js -->
@@ -175,6 +206,7 @@
 <script src="/pages/base/geo_data_edit/js/history_edit_logs.js" ></script>
 <script src="/pages/base/geo_data_edit/js/map.js" ></script>
 <script src="/pages/base/geo_data_edit/js/submit.js" ></script>
+<script src="/pages/base/geo_data_edit/js/search.js" ></script>
 <script type="text/javascript"
         src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"></script>
 </body>
@@ -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.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>
@@ -332,9 +332,11 @@
 			if(params.length < 1){
 				return;
 			}
+		    var i = layer.load(2);
 			$get('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
 				var fileName=date+"-"+jName+"-"+params[1]+"-"+params[2]+"-行车路单";
 				window.open("/downloadFile/download?fileName="+encodeURIComponent(fileName));
+		   		layer.close(i);
 			});
 		});
@@ -345,6 +347,7 @@
 		$("#exportMore").on("click",function(){
 			if($("#info tbody tr td").length <= 1)
 				return;
+		    var i = layer.load(2);
 			var param = new Array();
 			$("#info tbody tr").each(function(index){
 				param[index] = new Array();
@@ -361,6 +364,7 @@
 			$get('/realSchedule/exportWaybillMore',{date:date,line:line,strs:JSON.stringify(param)},function(result){
 // 				window.open("/downloadFile/downloadList?fileName="+result.fileName);	//下载压缩包
 				window.open("/downloadFile/download?fileName="+result.fileName);
+		   		layer.close(i);
 			});
 		});
@@ -328,7 +328,8 @@
 				});
 			});
 			$post('/realSchedule/exportWaybillMore',{date:date,line:line,strs:JSON.stringify(param)},function(result){
-				window.open("/downloadFile/downloadList?fileName="+result.fileName);
+// 				window.open("/downloadFile/downloadList?fileName="+result.fileName);	//下载压缩包
+				window.open("/downloadFile/download?fileName="+result.fileName);
 			});
 		});
@@ -727,6 +727,24 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                             }
                         }
                     }
+                ),
+
+                versiondesc: $resource(
+                    '/tic_ec/versiondesc/:lineId/:version',
+                    {},
+                    {
+                        do: {
+                            method: 'GET',
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst; // 业务错误留给控制器处理
+                                }
+                            }
+                        }
+                    }
                 )
             };
@@ -1207,7 +1207,7 @@ ScheduleApp.config([
                 }
             })
             .state("ttInfoDetailManage_edit3", { // 时刻表详细信息编辑
-                url: '/ttInfoDetailManage_edit3/:xlid/:ttid/:xlname/:ttname/:rflag',
+                url: '/ttInfoDetailManage_edit3/:xlid/:ttid/:xlname/:ttname/:rflag/:lineversion',
                 views: {
                     "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detailedit/edit3.html'}
                 },
@@ -1225,7 +1225,7 @@ ScheduleApp.config([
                 }
             })
             .state("ttInfoDetailManage_detail_edit", { // 时刻表详细信息单元格编辑
-                url: '/ttInfoDetailManage_detail_edit/:id/:xlid/:ttid/:xlname/:ttname/:rowindex/:colindex',
+                url: '/ttInfoDetailManage_detail_edit/:id/:xlid/:ttid/:xlname/:ttname/:rowindex/:colindex/:lineversion',
                 views: {
                     "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-detail.html'}
                 },
@@ -1244,7 +1244,7 @@ ScheduleApp.config([
                 }
             })
             .state("ttInfoDetailManage_detail_edit2", { // 时刻表详细信息批量单元格修改
-                url: '/ttInfoDetailManage_detail_edit/:xlid/:ttid/:xlname/:ttname',
+                url: '/ttInfoDetailManage_detail_edit/:xlid/:ttid/:xlname/:ttname/:lineversion',
                 views: {
                     "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-detail2.html'}
                 },
@@ -1263,7 +1263,7 @@ ScheduleApp.config([
                 }
             })
             .state("ttInfoDetailManage_detail_edit_mulselect", { // 时刻表详细信息批量单元格修改
-                url: '/ttInfoDetailManage_detail_edit_mulselect/:xlid/:ttid/:xlname/:ttname',
+                url: '/ttInfoDetailManage_detail_edit_mulselect/:xlid/:ttid/:xlname/:ttname/:lineversion',
                 views: {
                     "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-mulselect.html'}
                 },
@@ -30,8 +30,14 @@
     <div class="portlet light bordered">
         <div class="portlet-title">
             <div class="caption">
-                <i class="icon-equalizer font-red-sunglo"></i> <span
-                    class="caption-subject font-red-sunglo bold uppercase" ng-bind="ctrl.title2"></span>
+                <div>
+                    <i class="icon-equalizer font-red-sunglo"></i>
+                    <span class="caption-subject font-red-sunglo bold uppercase" ng-bind="ctrl.title2"></span>
+                </div>
+                <div style="padding-top: 10px;">
+                    <i class="icon-equalizer font-red-sunglo"></i>
+                    <span class="caption-subject font-red-sunglo bold uppercase" ng-bind="ctrl.title_tip"></span>
+                </div>
             </div>
         </div>
@@ -93,7 +99,7 @@
                                         cmaps="{'qdzCode' : 'zcode', 'qdzName': 'zname'}"
                                         dcname="qdzCode"
                                         icname="zcode"
-                                        dsparams="{{ {type: 'ajax', param:{'lineid': ctrl.TimeTableDetailForSave.xl.id, 'xldir': ctrl.TimeTableDetailForSave.xlDir}, atype:'zd_tcc' } | json }}"
+                                        dsparams="{{ {type: 'ajax', param: {'lineid': ctrl.TimeTableDetailForSave.xl.id, 'xldir': ctrl.TimeTableDetailForSave.xlDir, 'lineversion': ctrl.TimeTableDetailForSave.lineVersion}, atype:'zd_tcc' } | json }}"
                                         iterobjname="item"
                                         iterobjexp="item.aname"
                                         searchph="请输拼音..."
@@ -114,7 +120,7 @@
                                         cmaps="{'zdzCode' : 'zcode', 'zdzName': 'zname'}"
                                         dcname="zdzCode"
                                         icname="zcode"
-                                        dsparams="{{ {type: 'ajax', param:{'lineid': ctrl.TimeTableDetailForSave.xl.id, 'xldir': ctrl.TimeTableDetailForSave.xlDir}, atype:'zd_tcc' } | json }}"
+                                        dsparams="{{ {type: 'ajax', param:{'lineid': ctrl.TimeTableDetailForSave.xl.id, 'xldir': ctrl.TimeTableDetailForSave.xlDir, 'lineversion': ctrl.TimeTableDetailForSave.lineVersion}, atype:'zd_tcc' } | json }}"
                                         iterobjname="item"
                                         iterobjexp="item.aname"
                                         searchph="请输拼音..."
@@ -244,7 +250,7 @@
                             <button type="submit" class="btn green"
                                     ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
                             <a type="button" class="btn default"
-                               ui-sref="ttInfoDetailManage_edit3({xlid: ctrl.xlid, ttid : ctrl.ttid, xlname: ctrl.xlname, ttname : ctrl.ttname})" ><i class="fa fa-times"></i> 取消</a>
+                               ui-sref="ttInfoDetailManage_edit3({xlid: ctrl.xlid, ttid : ctrl.ttid, xlname: ctrl.xlname, ttname : ctrl.ttname, lineversion : ctrl.lineversion})" ><i class="fa fa-times"></i> 取消</a>
                         </div>
                     </div>
                 </div>
@@ -30,8 +30,14 @@
     <div class="portlet light bordered">
         <div class="portlet-title">
             <div class="caption">
-                <i class="icon-equalizer font-red-sunglo"></i> <span
-                    class="caption-subject font-red-sunglo bold uppercase" ng-bind="ctrl.title1"></span>
+                <div>
+                    <i class="icon-equalizer font-red-sunglo"></i>
+                    <span class="caption-subject font-red-sunglo bold uppercase" ng-bind="ctrl.title1"></span>
+                </div>
+                <div style="padding-top: 10px;">
+                    <i class="icon-equalizer font-red-sunglo"></i>
+                    <span class="caption-subject font-red-sunglo bold uppercase" ng-bind="ctrl.title_tip"></span>
+                </div>
             </div>
         </div>
@@ -74,7 +80,7 @@
                                             cmaps="{'qdzCode' : 'zcode', 'qdzName': 'zname'}"
                                             dcname="qdzCode"
                                             icname="zcode"
-                                            dsparams="{{ {type: 'ajax', param:{'lineid': ctrl.xlid, 'xldir': ctrl.tt.xlDir}, atype:'zd_tcc' } | json }}"
+                                            dsparams="{{ {type: 'ajax', param:{'lineid': ctrl.xlid, 'xldir': ctrl.tt.xlDir, 'lineversion': ctrl.lineversion}, atype:'zd_tcc' } | json }}"
                                             iterobjname="item"
                                             iterobjexp="item.aname"
                                             searchph="请输拼音..."
@@ -91,7 +97,7 @@
                                             cmaps="{'zdzCode' : 'zcode', 'zdzName': 'zname'}"
                                             dcname="zdzCode"
                                             icname="zcode"
-                                            dsparams="{{ {type: 'ajax', param:{'lineid': ctrl.xlid, 'xldir': ctrl.tt.xlDir}, atype:'zd_tcc' } | json }}"
+                                            dsparams="{{ {type: 'ajax', param:{'lineid': ctrl.xlid, 'xldir': ctrl.tt.xlDir, 'lineversion': ctrl.lineversion}, atype:'zd_tcc' } | json }}"
                                             iterobjname="item"
                                             iterobjexp="item.aname"
                                             searchph="请输拼音..."
@@ -198,7 +204,7 @@
                             <button type="submit" class="btn green"
                                     ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
                             <a type="button" class="btn default"
-                               ui-sref="ttInfoDetailManage_edit3({xlid: ctrl.xlid, ttid : ctrl.ttid, xlname: ctrl.xlname, ttname : ctrl.ttname})" ><i class="fa fa-times"></i> 取消</a>
+                               ui-sref="ttInfoDetailManage_edit3({xlid: ctrl.xlid, ttid : ctrl.ttid, xlname: ctrl.xlname, ttname : ctrl.ttname, lineversion : ctrl.lineversion})" ><i class="fa fa-times"></i> 取消</a>
                         </div>
                     </div>
                 </div>
@@ -90,7 +90,7 @@
                             <button type="submit" class="btn green"
                                     ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
                             <a type="button" class="btn default"
-                               ui-sref="ttInfoDetailManage_edit3({xlid: ctrl.xlid, ttid : ctrl.ttid, xlname: ctrl.xlname, ttname : ctrl.ttname})" ><i class="fa fa-times"></i> 取消</a>
+                               ui-sref="ttInfoDetailManage_edit3({xlid: ctrl.xlid, ttid : ctrl.ttid, xlname: ctrl.xlname, ttname : ctrl.ttname, lineversion : ctrl.lineversion})" ><i class="fa fa-times"></i> 取消</a>
                         </div>
                     </div>
                 </div>
@@ -29,6 +29,7 @@
                 <div class="caption font-dark">
                     <i class="fa fa-database font-dark"></i>
                     <span class="caption-subject bold uppercase" ng-bind="ctrl.title"></span>
+                    <span class="caption-subject bold uppercase" ng-bind="ctrl.title2"></span>
                 </div>
                 <div class="actions">
                     <!--<i class="fa fa-arrow-up" aria-hidden="true"></i>-->
@@ -64,7 +64,7 @@ ScheduleApp.config([
                 }
             })
             .state("ttInfoDetailManage_edit3", { // 时刻表详细信息编辑
-                url: '/ttInfoDetailManage_edit3/:xlid/:ttid/:xlname/:ttname/:rflag',
+                url: '/ttInfoDetailManage_edit3/:xlid/:ttid/:xlname/:ttname/:rflag/:lineversion',
                 views: {
                     "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detailedit/edit3.html'}
                 },
@@ -82,7 +82,7 @@ ScheduleApp.config([
                 }
             })
             .state("ttInfoDetailManage_detail_edit", { // 时刻表详细信息单元格编辑
-                url: '/ttInfoDetailManage_detail_edit/:id/:xlid/:ttid/:xlname/:ttname/:rowindex/:colindex',
+                url: '/ttInfoDetailManage_detail_edit/:id/:xlid/:ttid/:xlname/:ttname/:rowindex/:colindex/:lineversion',
                 views: {
                     "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-detail.html'}
                 },
@@ -101,7 +101,7 @@ ScheduleApp.config([
                 }
             })
             .state("ttInfoDetailManage_detail_edit2", { // 时刻表详细信息批量单元格修改
-                url: '/ttInfoDetailManage_detail_edit/:xlid/:ttid/:xlname/:ttname',
+                url: '/ttInfoDetailManage_detail_edit/:xlid/:ttid/:xlname/:ttname/:lineversion',
                 views: {
                     "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-detail2.html'}
                 },
@@ -120,7 +120,7 @@ ScheduleApp.config([
                 }
             })
             .state("ttInfoDetailManage_detail_edit_mulselect", { // 时刻表详细信息批量单元格修改
-                url: '/ttInfoDetailManage_detail_edit_mulselect/:xlid/:ttid/:xlname/:ttname',
+                url: '/ttInfoDetailManage_detail_edit_mulselect/:xlid/:ttid/:xlname/:ttname/:lineversion',
                 views: {
                     "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-mulselect.html'}
                 },
@@ -3,10 +3,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(
     'TimeTableDetailManageService_old',
     [
         'TimeTableDetailManageService_g',
+        'TTInfoManageService_g',
         '$state',
         '$q',
         'SaTimeTableUtils',
-        function(service, $state, $q, SaTimeTableUtils) {
+        function(service, service2, $state, $q, SaTimeTableUtils) {
             // 查询对象类
             var queryClass = service.rest;
@@ -206,8 +207,20 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                     }
                     return deferred.promise;
-                }
+                },
+                /**
+                 * 获取线路版本描述。
+                 * @param lineId
+                 * @param version
+                 * @returns {*|Function|promise|n}
+                 */
+                versiondesc: function(lineId, version) {
+                    var param = {};
+                    param.lineId = lineId;
+                    param.version = version;
+                    return service2.versiondesc.do(param).$promise;
+                }
             };
         }
@@ -215,7 +228,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
     ]
 );
-// edit.html 时刻表编辑界面
+// edit.html 时刻表表格编辑界面
 angular.module('ScheduleApp').controller(
     'TimeTableDetailManageCtrl_old',
     [
@@ -232,8 +245,17 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             self.xlname = $stateParams.xlname; // 获取传过来的线路名字
             self.ttname = $stateParams.ttname; // 获取传过来的时刻表名字
             self.rflag = $stateParams.rflag; // 刷新标志
+            self.lineversion = $stateParams.lineversion; // 线路版本
             self.title = self.xlname + "（" + self.ttname + "）" + "时刻表明细信息";
+            self.title2 = "--->版本加载中...";
+            service.versiondesc(self.xlid, self.lineversion).then(
+                function(result) {
+                    self.title2 = "--->线路版本（" + result.desc + "）";
+                }
+            );
+
+            // TODO：线路版本
             // 获取时刻表明细数据（内部保存）
             self.getDetailHeads = function() {
@@ -304,7 +326,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                         xlname: self.xlname,
                         ttname: self.ttname,
                         rowindex: r,
-                        colindex: c
+                        colindex: c,
+                        lineversion: self.lineversion
                     }
                 );
             };
@@ -313,13 +336,13 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             self.editInfos = function() {
                 if (!service.editIsSel()) {
                     alert("请选择班次信息");
-                    return;
                 } else {
                     $state.go("ttInfoDetailManage_detail_edit2", {
                         xlid: self.xlid,
                         ttid: self.ttid,
                         xlname: self.xlname,
-                        ttname: self.ttname
+                        ttname: self.ttname,
+                        lineversion: self.lineversion
                     });
                 }
@@ -331,7 +354,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                     xlid: self.xlid,
                     ttid: self.ttid,
                     xlname: self.xlname,
-                    ttname: self.ttname
+                    ttname: self.ttname,
+                    lineversion: self.lineversion
                 });
             };
@@ -346,7 +370,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                         xlid: self.xlid,
                         ttid: self.ttid,
                         xlname: self.xlname,
-                        ttname: self.ttname
+                        ttname: self.ttname,
+                        lineversion: self.lineversion
                     });
                 }, function() {
                     alert("批量删除失败！");
@@ -354,7 +379,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                         xlid: self.xlid,
                         ttid: self.ttid,
                         xlname: self.xlname,
-                        ttname: self.ttname
+                        ttname: self.ttname,
+                        lineversion: self.lineversion
                     });
                 });
             };
@@ -467,8 +493,15 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             self.ttname = $stateParams.ttname; // 获取传过来的时刻表名字
             self.rowindex = $stateParams.rowindex; // 修改的第几行
             self.colindex = $stateParams.colindex; // 修改的第几列
+            self.lineversion = $stateParams.lineversion; // 线路版本
             self.title1 = self.xlname + "（" + self.ttname + "）" + "时刻表明细信息";
+            self.title_tip = "版本加载中...";
+            service.versiondesc(self.xlid, self.lineversion).then(
+                function(result) {
+                    self.title_tip = "线路版本（" + result.desc + "）";
+                }
+            );
             if (id) {
                 TTInfoDetail.get({id: id}, function(value) {
@@ -491,6 +524,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                     self.ttname
                 );
+                self.TimeTableDetailForSave.lineVersion = self.lineversion;
                 self.TimeTableDetailForSave.isTS = 0;
                 self.title2 =
                     self.xlname + "（" + self.ttname + "）" + "时刻表明细信息" +
@@ -531,7 +565,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                         xlid: self.xlid,
                         ttid: self.ttid,
                         xlname: self.xlname,
-                        ttname: self.ttname
+                        ttname: self.ttname,
+                        lineversion: self.lineversion
                     });
                 });
@@ -555,8 +590,15 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             self.ttid = $stateParams.ttid; // 获取传过来的时刻表id
             self.xlname = $stateParams.xlname; // 获取传过来的线路名字
             self.ttname = $stateParams.ttname; // 获取传过来的时刻表名字
+            self.lineversion = $stateParams.lineversion; // 线路版本
             self.title1 = self.xlname + "（" + self.ttname + "）" + "时刻表明细信息 批量修改班次信息";
+            self.title_tip = "版本加载中...";
+            service.versiondesc(self.xlid, self.lineversion).then(
+                function(result) {
+                    self.title_tip = "线路版本（" + result.desc + "）";
+                }
+            );
             //var TTInfoDetail = service.getQueryClass();
@@ -663,7 +705,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                         xlid: self.xlid,
                         ttid: self.ttid,
                         xlname: self.xlname,
-                        ttname: self.ttname
+                        ttname: self.ttname,
+                        lineversion: self.lineversion
                     });
                 }, function() {
                     alert("批量更新失败！");
@@ -671,7 +714,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                         xlid: self.xlid,
                         ttid: self.ttid,
                         xlname: self.xlname,
-                        ttname: self.ttname
+                        ttname: self.ttname,
+                        lineversion: self.lineversion
                     });
                 });
@@ -681,7 +725,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
     ]
 );
-// edit-mulselect.html 具体班次明细修改页面
+// edit-mulselect.html 班次批量选择页面
 angular.module('ScheduleApp').controller(
     'TimeTableDetailManageFormCtrl_mulselect',
     [
@@ -696,6 +740,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             self.ttid = $stateParams.ttid; // 获取传过来的时刻表id
             self.xlname = $stateParams.xlname; // 获取传过来的线路名字
             self.ttname = $stateParams.ttname; // 获取传过来的时刻表名字
+            self.lineversion = $stateParams.lineversion; // 线路版本
             self.title1 = self.xlname + "（" + self.ttname + "）" + "时刻表明细信息";
@@ -744,7 +789,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                     xlid: self.xlid,
                     ttid: self.ttid,
                     xlname: self.xlname,
-                    ttname: self.ttname
+                    ttname: self.ttname,
+                    lineversion: self.lineversion
                 });
             };
@@ -9,7 +9,7 @@
                 <th style="width: 180px;">时刻表名称</th>
                 <th style="width: 80px">上下行</th>
                 <th style="width: 50px;">启用</th>
-                <th style="width: 120px">启用/备份日期</th>
+                <th style="width: 130px">操作日期</th>
                 <th style="width: 80px">状态</th>
                 <th style="width: 60%">时刻表明细</th>
                 <th style="width: 40%">操作</th>
@@ -69,7 +69,25 @@
                     </div>
                 </td>
                 <td>
-                    <span ng-bind="info.xl.name"></span>
+                    <div>
+                        <a href="#">
+                            <span ng-bind="info.xl.name"></span>
+                        </a>
+                    </div>
+                    <div>
+                        <a href="#"
+                           ng-mouseenter="ctrl.getLineVersionTip(info)"
+                           tooltip-animation="false"
+                           tooltip-placement="top"
+                           uib-tooltip="{{ctrl.lineVersionTip}}"
+                           tooltip-class="headClass">
+
+                            <span ng-bind="'线路版本：' + info.lineVersion"></span>
+                        </a>
+
+                    </div>
+
+
                 </td>
                 <td>
                     <div>
@@ -90,23 +108,62 @@
                 </td>
                 <td>
                     <div>
-                        <a href="#">
-                            <span ng-bind="info.qyrq | date: 'yyyy-MM-dd'"></span>
+                        <a href="#"
+                           tooltip-animation="false"
+                           tooltip-placement="top"
+                           uib-tooltip="启用时间：{{info.qyrq | date: 'yyyy-MM-dd HH:mm:ss' }}"
+                           tooltip-class="headClass">
+                            启用
+                            <span ng-bind="(info.qyrq | date: 'yyyy-MM-dd')"></span>
                         </a>
                     </div>
+
                     <div>
                         <a href="#"
                            tooltip-animation="false"
                            tooltip-placement="top"
                            uib-tooltip="备份时间：{{info.lastBackUpDate | date: 'yyyy-MM-dd HH:mm:ss' }}"
                            tooltip-class="headClass">
+                            备份
+                            <span ng-bind="(info.lastBackUpDate | date: 'yyyy-MM-dd')"></span>
+                        </a>
+                    </div>
-                            <i class="fa fa-hdd-o" aria-hidden="true"></i>
-                            <span ng-bind="info.lastBackUpDate | date: 'yyyy-MM-dd'"></span>
+                    <div>
+                        <a href="#"
+                           tooltip-animation="false"
+                           tooltip-placement="top"
+                           uib-tooltip="创建时间：{{info.createDate | date: 'yyyy-MM-dd HH:mm:ss' }}"
+                           tooltip-class="headClass">
+                            创建
+                            <span ng-bind="(info.createDate | date: 'yyyy-MM-dd')"></span>
                         </a>
+                    </div>
+                    <div>
+                        <a href="#"
+                           tooltip-animation="false"
+                           tooltip-placement="top"
+                           uib-tooltip="更新时间：{{info.updateDate | date: 'yyyy-MM-dd HH:mm:ss' }}"
+                           tooltip-class="headClass">
+                            更新
+                            <span ng-bind="(info.updateDate | date: 'yyyy-MM-dd')"></span>
+                        </a>
                     </div>
+                    <!--<div>-->
+                        <!--<a href="#"-->
+                           <!--tooltip-animation="false"-->
+                           <!--tooltip-placement="top"-->
+                           <!--uib-tooltip="备份时间：{{info.lastBackUpDate | date: 'yyyy-MM-dd HH:mm:ss' }}"-->
+                           <!--tooltip-class="headClass">-->
+
+                            <!--<i class="fa fa-hdd-o" aria-hidden="true"></i>-->
+                            <!--<span ng-bind="info.lastBackUpDate | date: 'yyyy-MM-dd'"></span>-->
+                        <!--</a>-->
+
+                    <!--</div>-->
+
                 </td>
                 <td>
                     <span class="glyphicon glyphicon-ok" ng-if="info.isCancel == '0'"></span>
@@ -117,7 +174,7 @@
                        <!--class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 编辑 </a>-->
                     <!--<a ui-sref="ttInfoDetailManage_edit2({xlid: info.xl.id, ttid : info.id, xlname: info.xl.name, ttname : info.name})"-->
                        <!--class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 编辑2 </a>-->
-                    <a ui-sref="ttInfoDetailManage_edit3({xlid: info.xl.id, ttid : info.id, xlname: info.xl.name, ttname : info.name, rflag : true})"
+                    <a ui-sref="ttInfoDetailManage_edit3({xlid: info.xl.id, ttid : info.id, xlname: info.xl.name, ttname : info.name, rflag : true, lineversion : info.lineVersion})"
                        class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 编辑 </a>
                     <a ng-click="ctrl.toTtInfoDetailAuto(info.id)"
                        class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 生成 </a>
@@ -80,6 +80,19 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                     var param = {};
                     param.ttinfoid = ttinfoid;
                     return service.backup.do(param).$promise;
+                },
+
+                /**
+                 * 获取线路版本描述。
+                 * @param lineId
+                 * @param version
+                 * @returns {*|Function|promise|n}
+                 */
+                versiondesc: function(lineId, version) {
+                    var param = {};
+                    param.lineId = lineId;
+                    param.version = version;
+                    return service.versiondesc.do(param).$promise;
                 }
@@ -171,12 +184,26 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             self.doPage();
-            // 自动生成时刻表
+            // TODO：跳转到自动生成时刻表页面（jquery页面），之后会替换为Angularjs版本
             self.toTtInfoDetailAuto = function(ttinfoid) {
                 showPjax();
                 $.pjax({url: 'pages/base/timesmodel/add.html?no=' + ttinfoid, container: pjaxContainer});
             };
+            self.lineVersionTip = "载入中...";
+            var currentTTInfoForLineVersion;
+            self.getLineVersionTip = function(info) {
+                if (currentTTInfoForLineVersion != info) {
+                    service.versiondesc(info.xl.id, info.lineVersion).then(
+                        function(result) {
+                            self.lineVersionTip = result.desc;
+                            currentTTInfoForLineVersion = info;
+                        }
+                    );
+                }
+
+            };
+
             // TODO：
         }
     ]
@@ -53,6 +53,24 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                             }
                         }
                     }
+                ),
+
+                versiondesc: $resource(
+                    '/tic_ec/versiondesc/:lineId/:version',
+                    {},
+                    {
+                        do: {
+                            method: 'GET',
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst; // 业务错误留给控制器处理
+                                }
+                            }
+                        }
+                    }
                 )
             };
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+</head>
+<body>
+    <script src="http://180.168.57.114:4244/Scripts/CallCenterPlugin.js" type="text/javascript"></script>
+</body>
+</html>
 \ No newline at end of file
+var gb_call_phone = function () {
+
+    var basePath = "http://180.168.57.114:4244";
+    var wsUri = "ws://180.168.57.114:21892/";
+
+    var nbbm2tel = {
+
+    };
+
+    var locData = window.localStorage.getItem('test_nbbm2tel_json');
+    if(locData){
+        nbbm2tel = JSON.parse(locData);
+    }
+
+    var login = function (cb) {
+       var agentID = '1002';
+        var dn = '6006';
+
+        var options = {
+            AgentID: agentID,
+            DN: dn,
+            wsUri: wsUri,
+            setbtnStatus: function (stateName) {
+                //setState(stateName);
+                console.log('stateName', stateName);
+
+                cb && cb(stateName)
+            }
+        };
+        $.CallCenterInit(options);
+    };
+
+    var call = function (nbbm, loginSucc, loginFailed, callSucc) {
+        var telNumber = nbbm2tel[nbbm];
+        if(!telNumber){
+            alert('没有该车辆的对照表..');
+            loginFailed && loginFailed();
+            return;
+        }
+        login(function (sname) {
+            if(sname=='login'){
+                loginSucc && loginSucc();
+
+                $.CallCenterPublicFun.Dialing(telNumber);
+                setTimeout(function () {
+                    callSucc && callSucc();
+                }, 1000);
+            }
+            else{
+                loginFailed && loginFailed();
+            }
+        });
+    };
+    
+    var hangup = function () {
+        console.log('hangup...');
+        $.CallCenterPublicFun.Hangup();
+    };
+
+    return {
+        call: call,
+        hangup: hangup,
+        setNbbm2tel: function (json) {
+            nbbm2tel = json;
+
+            window.localStorage.setItem('test_nbbm2tel_json', JSON.stringify(nbbm2tel));
+        },
+        getNbbm2tel: function () {
+            return nbbm2tel;
+        }
+    }
+}();
 \ No newline at end of file
@@ -14,7 +14,7 @@ var gb_safe_driv = (function () {
         'A9': '玩手机'
     };
-    var path = 'http://118.178.187.115/CurrentSafeDriving/';
+    var path = 'http://180.166.5.82:9005/CurrentSafeDriving/';
     var $wrap = $('.safe_driv_pop_wrap');
     var max = 5;
@@ -43,16 +43,24 @@ var gb_safe_driv = (function () {
         $wrap.append(htmlStr);
     };
-    var vedioModal = '<div id="ssspVedioModal" class="uk-modal ct_move_modal">' +
+/*    var vedioModal = '<div id="ssspVedioModal" class="uk-modal ct_move_modal">' +
                         '<div class="uk-modal-dialog uk-modal-dialog-large">' +
                         '<button type="button" class="uk-modal-close uk-close"></button>' +
                         '<div class="uk-modal-header"> <h2>实时视频</h2> </div> '+
                         '<p class="loading"><i class="uk-icon-spinner uk-icon-spin"></i> 载入资源...</p><iframe id="vedioIframe" src="http://222.66.0.204:8910/transport_server/dvr_monitor1.jsp?deviceId=229L0650&channel=^^channel^^"></iframe>' +
                         '</div>' +
-                    '</div>';
+                    '</div>';*/
+
+    var phoneModal = '<div id="callPhoneModal" class="uk-modal ct_move_modal">' +
+                                '<div class="uk-modal-dialog">' +
+                                '<button type="button" class="uk-modal-close uk-close"></button>' +
+                                '<div class="uk-modal-header"> <h2>打电话</h2> </div> '+
+                                '<p class="loading"><i class="uk-icon-spinner uk-icon-spin"></i> 载入资源...</p><iframe style="width: 100%;height: 280px;" id="phoneIframe" src="/real_control_v2/js/safe_driv/CallCenterPluginDemo.html"></iframe>' +
+                                '</div>' +
+                            '</div>';
     $wrap.on('click', '.safe_driv_pop', function () {
-        var title = $(this).data('title') + '&nbsp;<button data-type="'+$(this).data('type')+'" class="uk-button uk-button-mini uk-button-primary" id="openVedioModalBtn" type="button">查看实时视频</button>';
+        var title = $(this).data('title') + '&nbsp;<button data-nbbm="'+$(this).data('nbbm')+'" class="uk-button uk-button-mini uk-button-primary" id="openPhoneModalBtn" type="button">打电话</button>';
         var url = $(this).data('url');
         $(this).remove();
         var lightbox = UIkit.lightbox.create([
@@ -89,6 +97,53 @@ var gb_safe_driv = (function () {
     });
+    var showCallPhoneModal = function () {
+        open_modal_dom(phoneModal ,{}, {modal: false});
+        $('#callPhoneModal #phoneIframe').on('load', function () {
+            var that = this;
+            var iframe = this.contentWindow.document.body;
+            setTimeout(function () {
+                //修改css
+                $(iframe).find('.CallCenterToolBar').css('height', '200px').css('width', '100%').css('top', '10px').css('left', 'calc(50% - 148px)').css('box-shadow', 'none');
+                $(iframe).find('.CallCenterToolBar .top').css('display', 'none');
+
+                $('.toolBar td[data-action=call]', iframe).trigger('click');
+
+                //焦点
+                $('input#telNumber', iframe).focus();
+
+                $(that).show();
+                $('#callPhoneModal p.loading').remove();
+            }, 700);
+        });
+    };
+
+    $(document).on('click', '#openPhoneModalBtn', function () {
+        var t = $(this).text();
+        if(t == '挂断！'){
+            gb_call_phone.hangup();
+            $(this).text('打电话').removeClass('uk-button-danger');
+            return;
+        }
+        else if(t == '打电话'){
+            var nbbm = $(this).data('nbbm');
+            var btn = this;
+
+            $(btn).text('登录坐席..');
+            gb_call_phone.call(nbbm, function () {
+                $(btn).text('拨号中..');
+            }, function () {
+                $(btn).text('登录坐席失败');
+                setTimeout(function () {
+                    $(btn).text('打电话');
+                }, 1200);
+            }, function () {
+                $(btn).text('挂断！').addClass('uk-button-danger');
+            });
+        }
+    });
+
+
     return {
         pop: pop,
         safeCode: codes,
@@ -117,7 +117,7 @@
 <!-- 高德  -->
 <script src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"></script>
 <!-- jquery -->
-<script src="/real_control_v2/assets/js/jquery.min.js"></script>
+<script src="http://180.168.57.114:4244/Scripts/jquery-3.2.1.min.js"></script>
 <!-- jquery actual -->
 <script src="/real_control_v2/assets/js/jquery.actual.min.js" merge="plugins"></script>
 <!-- jquery.serializejson JSON序列化插件 -->
@@ -224,7 +224,7 @@
 <!-- #### 安全驾驶 start ###  -->
 <div class="safe_driv_pop_wrap" ></div>
 <script id="safe_driv_item-temp" type="text/html">
-    <div class="safe_driv_pop uk-animation-slide-bottom" data-type="{{yczltype}}" data-title="{{clzbh}} {{timeStr}} {{ycztText}}" data-url="{{url}}">
+    <div class="safe_driv_pop uk-animation-slide-bottom" data-nbbm="{{clzbh}}" data-type="{{yczltype}}" data-title="{{clzbh}} {{timeStr}} {{ycztText}}" data-url="{{url}}">
         <div>
             <span class="title">异常&nbsp;{{clzbh}}</span>
             <span class="text"> {{timeStr}} 出现违规驾驶（{{ycztText}}）</span>
@@ -235,6 +235,10 @@
 <script src="/real_control_v2/js/safe_driv/safeDriv.js"  merge="custom_js"></script>
 <!-- #### 安全驾驶 end ###  -->
+
+<!-- 打电话 -->
+<script src="http://180.168.57.114:4244/Scripts/CallCenter.js" ></script>
+<script src="/real_control_v2/js/safe_driv/call_phone.js" ></script>
 </body>
 </html>
@@ -34,6 +34,8 @@ message TTInfo {
     // list
     repeated TTInfoDetail bcInfo = 17;
+
+    uint32 lineVersion = 18; // 线路版本
 }
 message TTInfoDetail {
@@ -64,6 +66,7 @@ message TTInfoDetail {
     bool isTS = 18; // 是否停驶（表示此班次执行完成，停在终点站，不进场）
     string remark = 19; // 备注
+    uint32 lineVersion = 20; // 线路版本
 }