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 25a2b68d 9485a38e
Showing 24 changed files with 448 additions and 240 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/controller/LineVersionsController.java
src/main/java/com/bsth/data/ThreadMonotor.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/SignalSchPlanMatcher.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/repository/LineVersionsRepository.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/service/LineVersionsService.java
src/main/java/com/bsth/service/impl/LineVersionsServiceImpl.java
src/main/java/com/bsth/service/impl/StationServiceImpl.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/resources/fatso/start.js
src/main/resources/static/pages/base/geo_data_edit/main.html
src/main/resources/static/pages/base/geo_data_edit/uk3_wrap.html
src/main/resources/static/pages/base/line/css/bmap_base.css
src/main/resources/static/pages/base/line/map.html
src/main/resources/static/pages/base/section/js/add-form-events.js
src/main/resources/static/pages/base/station/js/add-form-events.js
@@ -146,7 +146,7 @@ public class XDApplication implements CommandLineRunner {
         sexec.scheduleWithFixedDelay(schedulePstThread, 120, 10, TimeUnit.SECONDS);//班次延迟入库线程
         sexec.scheduleWithFixedDelay(seiPstThread, 160, 60, TimeUnit.SECONDS);//班次修正日志入库
         sexec.scheduleWithFixedDelay(directivesPstThread, 180, 120, TimeUnit.SECONDS);//调度指令延迟入库
-        //sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
+        sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
         sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 140, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据
         sexec.scheduleWithFixedDelay(basicDataLoader, 2, 2, TimeUnit.HOURS);//基础数据更新
         sexec.scheduleWithFixedDelay(autoExecScanThread, 160, 50, TimeUnit.SECONDS);//班次自动执行
 package com.bsth.controller;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -12,7 +9,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import com.bsth.entity.Line;
 import com.bsth.entity.LineVersions;
 import com.bsth.repository.LineRepository;
 import com.bsth.service.LineVersionsService;
@@ -80,4 +76,13 @@ public class LineVersionsController extends BaseController&lt;LineVersions, Integer
 		return service.add(map);
 	}
+	/**
+	 * 根据线路id获取当前版本号
+	 * 
+	 */
+	@RequestMapping(value = "findCurrentVersion", method = RequestMethod.GET)
+	public Integer findCurrentVersion(@RequestParam(defaultValue = "lineId") int lineId) {
+		return service.findCurrentVersion(lineId);
+	}
+	
 }
 package com.bsth.data;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.bsth.data.gpsdata_v2.DataHandleProcess;
+import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread;
 import org.springframework.stereotype.Component;
 /**
@@ -10,32 +10,10 @@ import org.springframework.stereotype.Component;
 @Component
 public class ThreadMonotor extends Thread{
-    Logger log = LoggerFactory.getLogger(this.getClass());
-
     @Override
     public void run() {
-
-        //线调GPS分析主线程
-        /*if(GpsRealAnalyse.isBlock()){
-            log.warn("GpsRealAnalyse isBlock true !!!!");
-            GpsRealAnalyse.shutdown();
-        }*/
-
-        /*if(GpsRealAnalyse.isIdle()){
-            //切换到备用的网关实时GPS对照数据
+        //切换到备用的网关实时GPS对照数据
+        if(DataHandleProcess.isBlock())
             GpsDataLoaderThread.setFlag(-1);
-        }*/
-
-        //webSocket 消息推送队列
-        /*if(WebSocketPushQueue.isIdle()){
-            log.warn("WebSocketPushQueue isIdle true !!!!");
-            WebSocketPushQueue.start();
-        }*/
-
-        //网关指令推送队列（系统自动发送的）
-        /*if(DirectivePushQueue.isIdle()){
-            log.warn("DirectivePushQueue isIdle true !!!!");
-            DirectivePushQueue.start();
-        }*/
     }
 }
 \ No newline at end of file
@@ -50,6 +50,9 @@ public class CarOutInfoHandler {
     Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    ArrayListMultimap<String, ScheduleRealInfo> xlMaps  = ArrayListMultimap.create();
+    List<ScheduleRealInfo> pstList = new ArrayList<>();
     /**
      * 全量更新发车信息表
      */
@@ -57,24 +60,27 @@ public class CarOutInfoHandler {
         try{
             //将班次按线路分组
             List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
-            ArrayListMultimap<String, ScheduleRealInfo> xlMaps = ArrayListMultimap.create();
             for(ScheduleRealInfo sch : all){
                 xlMaps.put(sch.getXlBm(), sch);
             }
             Set<String> ks = xlMaps.keySet();
             for (String k : ks) {
-                update(xlMaps.get(k));
+                pstList.addAll(update(xlMaps.get(k)));
             }
+
+            save(pstList);
+            pstList.clear();
+            xlMaps.clear();
+            logger.info("更新发车信息表！！");
         }catch (Exception e){
             logger.error("", e);
         }
     }
-    public void update(List<ScheduleRealInfo> list) {
+    public List<ScheduleRealInfo> update(List<ScheduleRealInfo> list) {
         if (list.size() == 0)
-            return;
-        String lineCode = list.get(0).getXlBm();
+            return new ArrayList<>();
         //按上下行分组
         List<ScheduleRealInfo> ups = new ArrayList<>(), downs = new ArrayList<>();
         for (ScheduleRealInfo sch : list) {
@@ -87,7 +93,12 @@ public class CarOutInfoHandler {
         ScheduleRealInfo[] upArray = nexts(ups),
                 downArray = nexts(downs);
-        final List<ScheduleRealInfo> pstArray = mergeArray(upArray, downArray);
+        List<ScheduleRealInfo> pstArray = mergeArray(upArray, downArray);
+
+        return pstArray;
+    }
+
+    private void save(final List<ScheduleRealInfo> pstList){
         //编程式事务
         DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
         DefaultTransactionDefinition def = new DefaultTransactionDefinition();
@@ -96,13 +107,13 @@ public class CarOutInfoHandler {
         try{
             //删除
-            jdbcTemplate.update("delete from bsth_t_clfcxxb where line_code=?", lineCode);
+            jdbcTemplate.update("delete from bsth_t_clfcxxb");
             //重新写入
             jdbcTemplate.batchUpdate("insert into bsth_t_clfcxxb(rq, line_code, line_name, lp_name, lp_sn, dfsj, nbbm, cph, bc_type, end_station_name, updown, jGh, jName, remarks, sn)" +
                     " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", new BatchPreparedStatementSetter() {
                 @Override
                 public void setValues(PreparedStatement ps, int i) throws SQLException {
-                    ScheduleRealInfo sch = pstArray.get(i);
+                    ScheduleRealInfo sch = pstList.get(i);
                     ps.setString(1, sch.getScheduleDateStr());
                     ps.setString(2, sch.getXlBm());
                     ps.setString(3, sch.getXlName());
@@ -122,7 +133,7 @@ public class CarOutInfoHandler {
                 @Override
                 public int getBatchSize() {
-                    return pstArray.size();
+                    return pstList.size();
                 }
             });
@@ -159,8 +170,8 @@ public class CarOutInfoHandler {
         ScheduleRealInfo[] array = new ScheduleRealInfo[3];
         Collections.sort(list, schDFSJComparator);
-        int count = 0, threshold = 1000 * 60 * 60 * 4;
-        long t = System.currentTimeMillis();
+        int count = 0;//, threshold = 1000 * 60 * 60 * 4;
+        //long t = System.currentTimeMillis();
         for (ScheduleRealInfo sch : list) {
             if (count == 3)
                 break;
@@ -180,8 +191,8 @@ public class CarOutInfoHandler {
                     || StringUtils.isNotEmpty(sch.getZdsjActual()))
                 continue;
-            if (t - sch.getDfsjT() > threshold)
-                continue;
+            /*if (t - sch.getDfsjT() > threshold)
+                continue;*/
             array[count] = sch;
             count++;
@@ -46,8 +46,17 @@ public class DataHandleProcess {
     @Autowired
     GpsRealData gpsRealData;
+    static long lastTime;
+
+    public static boolean isBlock() {
+        return System.currentTimeMillis() - lastTime > 1000 * 20;
+    }
+
     public void handle(List<GpsEntity> list) {
         try {
+            if(list.size() == 0)
+                return;
+            lastTime = System.currentTimeMillis();
             //按设备号分组数据（一个设备的多条数据，必须在一个线程里跑）
             ArrayListMultimap multimap = ArrayListMultimap.create();
             for (GpsEntity gps : list) {
@@ -45,7 +45,8 @@ public class SignalSchPlanMatcher {
                 if(null != near && !near.getId().equals(sch.getId())){
-                    if(Math.abs(t - near.getDfsjT()) < Math.abs((t - sch.getDfsjT()))){
+                    int nearDiff = (int) Math.abs(t - near.getDfsjT());
+                    if(nearDiff < 1000 * 60 * 8 && nearDiff < Math.abs((t - sch.getDfsjT()))){
                         dayOfSchedule.addExecPlan(near);
                         return false;
@@ -57,47 +58,6 @@ public class SignalSchPlanMatcher {
             log.error("", e);
         }
         return true;
-        /*try{
-            //会不会是分班没有完成
-            if(sch.getBcType().equals("in") && t - sch.getDfsjT() > 1000 * 60 * 20){
-                ScheduleRealInfo fbFirst = dayOfSchedule.nextByBcType(sch, "normal");
-
-                if(fbFirst == null || !fbFirst.getQdzCode().equals(gps.getStopNo()))
-                    return;
-
-                long dt = fbFirst.getDfsjT();
-                //晚于待发前4分钟  -执行分班的首个营运
-                if(dt - t < 1000 * 60 * 4){
-                    dayOfSchedule.addExecPlan(fbFirst);
-                    return;
-                }
-            }
-
-            //线路编码不匹配
-            if("out".equals(sch.getBcType()) && !sch.getXlBm().equals(gps.getLineId())){
-                ScheduleRealInfo nextOut = dayOfSchedule.nextByBcType(sch, "out");
-                if(nextOut != null && nextOut.getXlBm().equals(gps.getLineId())
-                        && fcSpace(sch, gps) > fcSpace(nextOut, gps)){
-                    dayOfSchedule.addExecPlan(nextOut);
-                    return;
-                }
-            }
-        }catch (Exception e){
-            log.error("", e);
-        }
-
-        //下一个相同走向的班次
-        ScheduleRealInfo next = dayOfSchedule.nextSame(sch);
-        if(next == null || !next.getQdzCode().equals(sch.getQdzCode()))
-            return;
-
-        //晚于班次间隔百分之70，跳下一个班次
-        double s = (int) (next.getDfsjT() - sch.getDfsjT());
-        double r = (int) (t - sch.getDfsjT());
-        if(r / s > 0.7){
-            if(dayOfSchedule.addExecPlan(next))
-                outMatch(gps, next);
-        }*/
     }
     /**
@@ -13,7 +13,6 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.schedule.SchedulePlanInfoService;
-import com.bsth.util.BatchSaveUtils;
 import com.bsth.websocket.handler.SendUtils;
 import com.google.common.base.Predicate;
 import com.google.common.collect.ArrayListMultimap;
@@ -25,9 +24,16 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -395,8 +401,83 @@ public class DayOfSchedule {
             item.setScheduleDateStr(sdfyyyyMMdd.format(item.getScheduleDate()));
         }
+        //编程式事务
+        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
+        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
+        TransactionStatus status = tran.getTransaction(def);
+
+        try{
+            final List<ScheduleRealInfo> pstList = list;
+            //写入
+            jdbcTemplate.batchUpdate("insert into bsth_c_s_sp_info_real(id,bc_type,bcs,bcsj,cl_zbh,create_date,dfsj,directive_state,fcno,fcsj,fcsj_actual,j_gh,j_name,jhlc,lp_name,qdz_code,qdz_name,real_exec_date,remarks,s_gh,s_name,schedule_date,schedule_date_str,sflj,sp_id,status,update_date,xl_bm,xl_dir,xl_name,zdsj,zdsj_actual,zdz_code,zdz_name,ccno,df_auto,fgs_bm,fgs_name,gs_bm,gs_name,online,adjust_exps,reissue,jhlc_orig,sigin_compate,drift_status,cc_service,major_station_name)" +
+                    " VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", new BatchPreparedStatementSetter() {
+                @Override
+                public void setValues(PreparedStatement ps, int i) throws SQLException {
+                    ScheduleRealInfo sch = pstList.get(i);
+                    ps.setLong(1, sch.getId());
+                    ps.setString(2, sch.getBcType());
+                    ps.setInt(3, sch.getBcs()==null?0:sch.getBcs());
+                    ps.setInt(4, sch.getBcsj()==null?0:sch.getBcsj());
+                    ps.setString(5, sch.getClZbh());
+                    ps.setDate(6, new java.sql.Date(sch.getCreateDate().getTime()));
+                    ps.setString(7, sch.getDfsj());
+                    ps.setInt(8, sch.getDirectiveState());
+                    ps.setInt(9, sch.getFcno()==null?0:sch.getFcno());
+                    ps.setString(10, sch.getFcsj());
+                    ps.setString(11, sch.getFcsjActual());
+                    ps.setString(12, sch.getjGh());
+                    ps.setString(13, sch.getjName());
+                    ps.setDouble(14, sch.getJhlc());
+                    ps.setString(15, sch.getLpName());
+                    ps.setString(16, sch.getQdzCode());
+                    ps.setString(17, sch.getQdzName());
+                    ps.setString(18, sch.getRealExecDate());
+                    ps.setString(19, sch.getRemarks());
+                    ps.setString(20, sch.getsGh());
+                    ps.setString(21, sch.getsName());
+                    ps.setDate(22, new java.sql.Date(sch.getScheduleDate().getTime()));
+                    ps.setString(23, sch.getScheduleDateStr());
+                    ps.setBoolean(24, sch.isSflj());
+                    ps.setLong(25, sch.getSpId());
+                    ps.setInt(26, sch.getStatus());
+                    ps.setDate(27, new java.sql.Date(sch.getUpdateDate().getTime()));
+                    ps.setString(28, sch.getXlBm());
+                    ps.setString(29, sch.getXlDir());
+                    ps.setString(30, sch.getXlName());
+                    ps.setString(31, sch.getZdsj());
+                    ps.setString(32, sch.getZdsjActual());
+                    ps.setString(33, sch.getZdzCode());
+                    ps.setString(34, sch.getZdzName());
+                    ps.setInt(35, sch.getCcno()==null?0:sch.getCcno());
+                    ps.setBoolean(36, sch.isDfAuto());
+                    ps.setString(37, sch.getFgsBm());
+                    ps.setString(38, sch.getFgsName());
+                    ps.setString(39, sch.getGsBm());
+                    ps.setString(40, sch.getGsName());
+                    ps.setBoolean(41, sch.isOnline());
+                    ps.setString(42, sch.getAdjustExps());
+                    ps.setBoolean(43, sch.isReissue());
+                    ps.setDouble(44, sch.getJhlcOrig());
+                    ps.setInt(45, sch.getSiginCompate());
+                    ps.setInt(46, sch.getDriftStatus());
+                    ps.setBoolean(47, sch.isCcService());
+                    ps.setString(48, sch.getMajorStationName());
+                }
+
+                @Override
+                public int getBatchSize() {
+                    return pstList.size();
+                }
+            });
+
+            tran.commit(status);
+        }catch (Exception e){
+            tran.rollback(status);
+            logger.error("real schedule batchSave error...", e);
+        }
         // 入库
-        new BatchSaveUtils<ScheduleRealInfo>().saveList(list, ScheduleRealInfo.class);
+        //new BatchSaveUtils<ScheduleRealInfo>().saveList(list, ScheduleRealInfo.class);
     }
     public List<SchedulePlanInfo> cleanSchPlanItr(Iterator<SchedulePlanInfo> itrab) {
@@ -825,7 +906,7 @@ public class DayOfSchedule {
     }
     public Collection<ScheduleRealInfo> findAll() {
-        return nbbmScheduleMap.values();
+        return id2SchedulMap.values();
     }
     public boolean addExecPlan(ScheduleRealInfo sch) {
@@ -892,7 +973,7 @@ public class DayOfSchedule {
     }
     public void reCalcExecPlan(String nbbm) {
-        logger.info("reCalcExecPlan...: " + nbbm);
+        //logger.info("reCalcExecPlan...: " + nbbm);
         List<ScheduleRealInfo> list = nbbmScheduleMap.get(nbbm);
         Collections.sort(list, schFCSJComparator);
@@ -73,4 +73,10 @@ public interface LineVersionsRepository extends BaseRepository&lt;LineVersions, Int
 	@Query(value = "  SELECT lv FROM LineVersions lv where lv.line.id = ?1 and lv.versions = (?2 - "+1+")")
 	public LineVersions findBylineIdAndVersions(Integer id, Integer versions);
+	
+	/**
+	 * 获取线路版本的上一个版本
+	 */
+	@Query(value = "  SELECT lv.versions FROM LineVersions lv where lv.line.id = ?1 and lv.status=1")
+	public Integer findCurrentVersion(Integer id);
 }
@@ -15,7 +15,6 @@ import org.springframework.transaction.annotation.Transactional;
 import com.bsth.entity.Line;
 import com.bsth.entity.StationRoute;
-import com.bsth.entity.StationRouteCache;
 /**
  * 
@@ -285,6 +284,17 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 			"ORDER BY " +
 			"lineCode,directions,stationRouteCode")
 	List<Map<String, String>> findAllLineWithYgc();
+
+	@Query("SELECT new map(" +
+			"lineCode as lineCode,directions as directions,stationName as stationName,stationCode as stationCode," +
+			"line.linePlayType as linePlayType,s.stationMark as stationMark) " +
+			"FROM " +
+			"StationRoute s " +
+			"WHERE " +
+			"s.destroy = 0 and s.lineCode = ?1 " +
+			"ORDER BY " +
+			"lineCode,directions,stationRouteCode")
+	List<Map<String, String>> findLineWithYgcByLine(String lineCode);
     @Modifying
     @Query(value="update bsth_c_stationroute set directions = case directions when 1 then 0 when 0 then 1 end where line = ?1 ", nativeQuery=true)
@@ -33,6 +33,9 @@ public interface LineVersionsService extends BaseService&lt;LineVersions, Integer&gt; 
 	List<LineVersions> lineUpdate();
 	LineVersions findLineVersionsMax(int lineId);
+	
+	// 返回当前线路版本
+	Integer findCurrentVersion(int lineId);
 	Map<String, Object> add(Map<String, Object> map);
@@ -250,5 +250,13 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
 		}
 		return resultMap;
 	}
+
+	/**
+	 * 获取当前线路版本号
+	 */
+	@Override
+	public Integer findCurrentVersion(int lineId) {
+		return repository.findCurrentVersion(lineId);
+	}
 }
@@ -18,6 +18,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.Line;
 import com.bsth.entity.LineInformation;
+import com.bsth.entity.LineVersions;
 import com.bsth.entity.Section;
 import com.bsth.entity.SectionRoute;
 import com.bsth.entity.SectionRouteCache;
@@ -26,12 +27,14 @@ import com.bsth.entity.StationRoute;
 import com.bsth.entity.StationRouteCache;
 import com.bsth.repository.LineInformationRepository;
 import com.bsth.repository.LineRepository;
+import com.bsth.repository.LineVersionsRepository;
 import com.bsth.repository.SectionRepository;
 import com.bsth.repository.SectionRouteCacheRepository;
 import com.bsth.repository.SectionRouteRepository;
 import com.bsth.repository.StationRepository;
 import com.bsth.repository.StationRouteCacheRepository;
 import com.bsth.repository.StationRouteRepository;
+import com.bsth.service.LineVersionsService;
 import com.bsth.service.StationService;
 import com.bsth.util.GetUIDAndCode;
 import com.bsth.util.TransGPS;
@@ -83,6 +86,9 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 	@Autowired
 	private SectionRouteCacheRepository sectionRouteCacheRepository;
+	@Autowired
+	LineVersionsRepository lineVersionsRepository;
+	
 	private GeoUtils geoUtils;
 	Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -293,20 +299,9 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 					Integer stationId = Integer.parseInt(isHaveMap.get("id").toString());
 					arg0 = repository.findOne(stationId);
-					if ((i==0 || i==stationsArray.size()-1) && resultLine.getLinePlayType() != 1) {// (起终点站)
-						List<Station> list = new ArrayList<>();
-						list.add(arg0);
-						List<Station> stationlist =  JSONArray.parseArray(JSON.toJSONString(list), Station.class);
-						Station station = stationlist.get(0);	
-						// 站点编码
-						long stationCode = GetUIDAndCode.getStationId();
-						station.setStationCod(String.valueOf(stationCode));
-						station.setId((int)stationCode);
-						station.setCreateDate(null);
-						station.setUpdateDate(null);
-						repository.save(station);
-						arg0 = station;
-					} else if (i==0  && resultLine.getLinePlayType() == 1) {// 环线终点和起点引用同一个站
+					if (i==stationsArray.size()-1  && resultLine.getLinePlayType() == 1) {// 环线终点和起点引用同一个站
+						arg0 = loopStartStation;
+					} else {
 						List<Station> list = new ArrayList<>();
 						list.add(arg0);
 						List<Station> stationlist =  JSONArray.parseArray(JSON.toJSONString(list), Station.class);
@@ -318,12 +313,11 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 						station.setCreateDate(null);
 						station.setUpdateDate(null);
 						repository.save(station);
-						arg0 = station;
-						loopStartStation = arg0;
-						repository.save(arg0);
-					} else if (i==stationsArray.size()-1  && resultLine.getLinePlayType() == 1) {// 环线终点和起点引用同一个站
-						arg0 = loopStartStation;
-					} 
+						arg0 = station; 
+						if (i==0  && resultLine.getLinePlayType() == 1) {// 环线终点和起点引用同一个站
+							loopStartStation = arg0;
+						}
+					}
 				}else {
 					// 站点编码
 					long stationCode = GetUIDAndCode.getStationId();
@@ -417,8 +411,9 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 					// 中途站
 					route.setStationMark("Z");
 				}
-				// 版本号
-				route.setVersions(versions);
+				// 版本号(获取线路当前版本)
+				Integer version =  lineVersionsRepository.findCurrentVersion(resultLine.getId());
+				route.setVersions(version);
 				// 站点ID
 				route.setStation(arg0);
 				// 方向
@@ -782,68 +777,65 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			Integer versions = map.get("versions").equals("") ? null : Integer.parseInt(map.get("versions").toString());
 			// 说明
 			String descriptions = map.get("descriptions").equals("") ? "" : map.get("descriptions").toString();
-			if(Boolean.parseBoolean(isHaveMap.get("isHave").toString())) {
-				stationId = Integer.parseInt(isHaveMap.get("id").toString());
-			}else {
-				// 站点编码
-				stationCod = map.get("stationCod").equals("") ? "" : map.get("stationCod").toString();
-				// 站点ID
-				stationId = Integer.valueOf(stationCod);
-				// 圆半径
-				Integer radius = map.get("radius").equals("") ? null : Integer.parseInt(map.get("radius").toString());
-				// 图形类型
-				String shapesType = map.get("shapesType").equals("") ? "" : map.get("shapesType").toString();
-				// 创建人
-				Integer createBy = map.get("createBy").equals("") ? null : Integer.parseInt(map.get("createBy").toString());
-				// 修改人
-				Integer updateBy = map.get("updateBy").equals("") ?  null : Integer.parseInt(map.get("updateBy").toString());
-				// 城建坐标经度
-				Float x = map.get("x").equals("") ?  null : Float.parseFloat(map.get("x").toString());
-				// 城建坐标纬度
-				Float y = map.get("y").equals("") ? null : Float.parseFloat(map.get("y").toString());
-				// 道路编码
-				String roadCoding = map.get("roadCoding").equals("") ? "" : map.get("roadCoding").toString();
-				// 原坐标类型
-				String dbType = map.get("dbType").equals("") ? "" : map.get("dbType").toString();
-				// WGS经纬度
-				Float gLonx = null;
-				// WGS纬度
-				Float gLaty = null;
-				if(bJwpointsArray.length>0) {
-					Location resultPoint = FromBDPointToWGSPoint(bJwpointsArray[0],bJwpointsArray[1]);
-					gLonx = (float)resultPoint.getLng();
-					gLaty = (float)resultPoint.getLat();
-				}
-				// 多边形原坐标点集合
-				String bPloygonGrid = map.get("bPolygonGrid").equals("") ? "" : map.get("bPolygonGrid").toString();
-				// 多边形WGS坐标点集合
-				String gPloygonGrid ="";
-				if(!bPloygonGrid.equals("")) {
-					String bPloygonGridArray[] = bPloygonGrid.split(",");
-					int bLen_ = bPloygonGridArray.length;
-					for(int b = 0 ;b<bLen_;b++) {
-						String tempArray[]= bPloygonGridArray[b].split(" ");
-						Location resultPoint = FromBDPointToWGSPoint(tempArray[0],tempArray[1]);
-						 if(b==0) {
-							 gPloygonGrid = String.valueOf(resultPoint.getLng()) + " " + String.valueOf(resultPoint.getLat());
-						 }else {
-							 gPloygonGrid = gPloygonGrid +  ',' + String.valueOf(resultPoint.getLng()) + " " + String.valueOf(resultPoint.getLat());
-						 }
-					}
+			// 站点编码
+			stationCod = map.get("stationCod").equals("") ? "" : map.get("stationCod").toString();
+			// 站点ID
+			stationId = Integer.valueOf(stationCod);
+			// 圆半径
+			Integer radius = map.get("radius").equals("") ? null : Integer.parseInt(map.get("radius").toString());
+			// 图形类型
+			String shapesType = map.get("shapesType").equals("") ? "" : map.get("shapesType").toString();
+			// 创建人
+			Integer createBy = map.get("createBy").equals("") ? null : Integer.parseInt(map.get("createBy").toString());
+			// 修改人
+			Integer updateBy = map.get("updateBy").equals("") ?  null : Integer.parseInt(map.get("updateBy").toString());
+			// 城建坐标经度
+			Float x = map.get("x").equals("") ?  null : Float.parseFloat(map.get("x").toString());
+			// 城建坐标纬度
+			Float y = map.get("y").equals("") ? null : Float.parseFloat(map.get("y").toString());
+			// 道路编码
+			String roadCoding = map.get("roadCoding").equals("") ? "" : map.get("roadCoding").toString();
+			// 原坐标类型
+			String dbType = map.get("dbType").equals("") ? "" : map.get("dbType").toString();
+			// WGS经纬度
+			Float gLonx = null;
+			// WGS纬度
+			Float gLaty = null;
+			if(bJwpointsArray.length>0) {
+				Location resultPoint = FromBDPointToWGSPoint(bJwpointsArray[0],bJwpointsArray[1]);
+				gLonx = (float)resultPoint.getLng();
+				gLaty = (float)resultPoint.getLat();
+			}
+			// 多边形原坐标点集合
+			String bPloygonGrid = map.get("bPolygonGrid").equals("") ? "" : map.get("bPolygonGrid").toString();
+			// 多边形WGS坐标点集合
+			String gPloygonGrid ="";
+			if(!bPloygonGrid.equals("")) {
+				String bPloygonGridArray[] = bPloygonGrid.split(",");
+				int bLen_ = bPloygonGridArray.length;
+				for(int b = 0 ;b<bLen_;b++) {
+					String tempArray[]= bPloygonGridArray[b].split(" ");
+					Location resultPoint = FromBDPointToWGSPoint(tempArray[0],tempArray[1]);
+					 if(b==0) {
+						 gPloygonGrid = String.valueOf(resultPoint.getLng()) + " " + String.valueOf(resultPoint.getLat());
+					 }else {
+						 gPloygonGrid = gPloygonGrid +  ',' + String.valueOf(resultPoint.getLng()) + " " + String.valueOf(resultPoint.getLat());
+					 }
 				}
-				if(bPloygonGrid.equals(""))
-					bPloygonGrid = null;
-				else
-					bPloygonGrid = "POLYGON(("  + bPloygonGrid +"))";
-				if(gPloygonGrid.equals(""))
-					gPloygonGrid = null;
-				else
-					gPloygonGrid = "POLYGON(("  + gPloygonGrid +"))";
-				// 保存站点
-				repository.stationSave(stationCod, zdmc, roadCoding, dbType, bJwpoints, 
-										gLonx, gLaty, x, y, gPloygonGrid,bPloygonGrid, destroy, radius, 
-										shapesType, versions, descriptions, createBy, updateBy,stationId);
 			}
+			if(bPloygonGrid.equals(""))
+				bPloygonGrid = null;
+			else
+				bPloygonGrid = "POLYGON(("  + bPloygonGrid +"))";
+			if(gPloygonGrid.equals(""))
+				gPloygonGrid = null;
+			else
+				gPloygonGrid = "POLYGON(("  + gPloygonGrid +"))";
+			// 保存站点
+			repository.stationSave(stationCod, zdmc, roadCoding, dbType, bJwpoints, 
+									gLonx, gLaty, x, y, gPloygonGrid,bPloygonGrid, destroy, radius, 
+									shapesType, versions, descriptions, createBy, updateBy,stationId);
+			
 			Station station = repository.findOne(stationId);
 			StationRoute arg0 = new StationRoute();
 			// 距离
@@ -1200,8 +1192,9 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			sectionRoute.setLine(resultLine);
 			// 路段编码
 			sectionRoute.setSectionCode(sectionCode);
-			// 版本
-			sectionRoute.setVersions(versions);
+			// 版本号(获取线路当前版本)
+			Integer version =  lineVersionsRepository.findCurrentVersion(resultLine.getId());
+			sectionRoute.setVersions(version);
 			sectionRoute.setDestroy(destroy);
 			// 方向
 			sectionRoute.setDirections(directions);			
@@ -1229,8 +1222,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			String libraryPointstr =  s.getbJwpoints();
 			String points[] = libraryPointstr.toString().split(" ");
 			Point center = new Point(Double.parseDouble(points[0]), Double.parseDouble(points[1]));
-			// 在100m内认为是同一个站点
-			Circle circle = new Circle(center, 100);
+			// 在40m内认为是同一个站点
+			Circle circle = new Circle(center, 40);
 			// 匹配到了用数据库中的点替换
 			if (geoUtils.isPointInCircle(point, circle)) {
 				map.put("name", s.getStationName().toString());
@@ -1372,20 +1365,9 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 					Integer stationId = Integer.parseInt(stationsArray.getJSONObject(i).get("id").toString());
 					arg0 = repository.findOne(stationId);
-					if ((i==0 || i==stationsArray.size()-1) && resultLine.getLinePlayType() != 1) {// (起终点站)
-						List<Station> list = new ArrayList<>();
-						list.add(arg0);
-						List<Station> stationlist =  JSONArray.parseArray(JSON.toJSONString(list), Station.class);
-						Station station = stationlist.get(0);	
-						// 站点编码
-						long stationCode = GetUIDAndCode.getStationId();
-						station.setStationCod(String.valueOf(stationCode));
-						station.setId((int)stationCode);
-						station.setCreateDate(null);
-						station.setUpdateDate(null);
-						repository.save(station);
-						arg0 = station;
-					} else if (i==0  && resultLine.getLinePlayType() == 1) {// 环线终点和起点引用同一个站
+					if (i==stationsArray.size()-1  && resultLine.getLinePlayType() == 1) {// 环线终点和起点引用同一个站
+						arg0 = loopStartStation;
+					} else {
 						List<Station> list = new ArrayList<>();
 						list.add(arg0);
 						List<Station> stationlist =  JSONArray.parseArray(JSON.toJSONString(list), Station.class);
@@ -1397,12 +1379,11 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 						station.setCreateDate(null);
 						station.setUpdateDate(null);
 						repository.save(station);
-						arg0 = station;
-						loopStartStation = arg0;
-						repository.save(arg0);
-					} else if (i==stationsArray.size()-1  && resultLine.getLinePlayType() == 1) {// 环线终点和起点引用同一个站
-						arg0 = loopStartStation;
-					} 
+						arg0 = station; 
+						if (i==0  && resultLine.getLinePlayType() == 1) {// 环线终点和起点引用同一个站
+							loopStartStation = arg0;
+						}
+					}
 				}else {
 					// 站点编码
 					long stationCode = GetUIDAndCode.getStationId();
@@ -200,13 +200,14 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				// 先查上行
 				upStationsList = stationRouteRepository.findByLine(line.getLineCode(), 0);
+				Map<String, Integer> stationNumMap = getStationName2YgcNumberMap(line.getLineCode());
 				int startId = 1;
-				startId = packagStationXml(upStationsList, sBuffer, startId);
+				startId = packagStationXml(upStationsList, sBuffer, startId,stationNumMap);
 				// 环线不查下行
 				if(line.getLinePlayType() != 1){
 					// 再查下行
 					downStationsList = stationRouteRepository.findByLine(line.getLineCode(), 1);
-					packagStationXml(downStationsList, sBuffer, startId);
+					packagStationXml(downStationsList, sBuffer, startId,stationNumMap);
 				}
 				sBuffer.append("</StationList>");
@@ -223,6 +224,10 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				sBuffer.append("</LinePointList>");
 				sBuffer.append("</XL>");
 				sBuffer.append("</XLs>");
+				// 临时添加，后面删除
+				if(sBuffer.indexOf("<ZDXH>0</ZDXH>") != -1){
+					return "0";
+				}
 				// 调用上传方法
 				if(getWebServiceSoapUp().setXL(userNameUp,passwordUp,sBuffer.toString()).isSuccess()){
 					result = "success";
@@ -240,6 +245,28 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	}
 	/**
+	 * 加载运管处的站点及序号
+	 * 上行从1开始，下行顺序续编
+	 */
+	private Map<String, Integer> getStationName2YgcNumberMap (String lineCode){
+		Map<String, Integer> resultMap = new HashMap<>();
+		List<Map<String, String>> ygcLines = stationRouteRepository.findLineWithYgcByLine(lineCode);
+		if(ygcLines != null && ygcLines.size() > 0){
+			int size = ygcLines.size();
+			Map<String, String> tempMap ;
+			int num = 1;
+			String key;
+			for (int i = 0; i < size; i ++){
+				tempMap = ygcLines.get(i);
+				key = tempMap.get("lineCode") + "_"+String.valueOf(tempMap.get("directions"))
+						+ "_"+tempMap.get("stationCode")+ "_"+tempMap.get("stationMark");
+				resultMap.put(key,num++);
+			}
+		}
+		return resultMap;
+	}
+
+	/**
 	 * 上传线路信息(按in_use上传)
 	 */
 	@Override
@@ -431,7 +458,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 							// 起点站的参数
 							otherMap.put("stationMark","B");
 							paramMap = packageYgcStationNumParam(scheduleRealInfo,otherMap);
-							sf.append("<FCZDXH>" + getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap) + "</FCZDXH>");
+							sf.append("<FCZDXH>" + getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null) + "</FCZDXH>");
 							sf.append("<FCZDBM>"+scheduleRealInfo.getQdzCode()+"</FCZDBM>");
 							sf.append("<JHFCSJ>"+scheduleRealInfo.getFcsj()+"</JHFCSJ>");
 							sf.append("<DFSJ>"+scheduleRealInfo.getDfsj()+"</DFSJ>");
@@ -441,7 +468,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 							// 终点站的参数
 							otherMap.put("stationMark","E");
 							paramMap = packageYgcStationNumParam(scheduleRealInfo,otherMap);
-							sf.append("<DDZDXH>"+ getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap) +"</DDZDXH>");
+							sf.append("<DDZDXH>"+ getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null) +"</DDZDXH>");
 							sf.append("<DDZDBM>"+scheduleRealInfo.getZdzCode()+"</DDZDBM>");
 							sf.append("<JHDDSJ>"+scheduleRealInfo.getZdsj()+"</JHDDSJ>");
 							sf.append("<SJDDSJ>"+scheduleRealInfo.getZdsjActual()+"</SJDDSJ>");
@@ -768,13 +795,13 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 						// 起点站的参数
 						otherMap.put("stationMark","B");
 						paramMap = packageYgcStationNumParam(schedulePlanInfo,otherMap);
-						sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap)).append("</ZDXH>");
+						sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null)).append("</ZDXH>");
 						sBuffer.append("<JHFCSJ>").append(schedulePlanInfo.getFcsj()).append("</JHFCSJ>");
 						sBuffer.append("<DDZDMC>").append(schedulePlanInfo.getZdzName()).append("</DDZDMC>");
 						// 起点站的参数
 						otherMap.put("stationMark","E");
 						paramMap = packageYgcStationNumParam(schedulePlanInfo,otherMap);
-						sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap)).append("</DDXH>");
+						sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null)).append("</DDXH>");
 						sBuffer.append("<JHDDSJ>").append(calcDdsj(schedulePlanInfo.getFcsj(),schedulePlanInfo.getBcsj()))
 								.append("</JHDDSJ>");
 						sBuffer.append("</BC>");
@@ -883,14 +910,14 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 						// 起点站的参数
 						otherMap.put("stationMark","B");
 						paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
-						sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap)).append("</ZDXH>");
+						sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null)).append("</ZDXH>");
 						sBuffer.append("<JHFCSJ>").append(changeTimeFormat(ttInfoDetail)).append("</JHFCSJ>");
 						sBuffer.append("<DDZDMC>").append(BasicData.stationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()
 								+"_"+ttInfoDetail.getZdzCode())).append("</DDZDMC>");
 						// 起点站的参数
 						otherMap.put("stationMark","E");
 						paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
-						sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap)).append("</DDXH>");
+						sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null)).append("</DDXH>");
 						sBuffer.append("<JHDDSJ>").append(calcDdsj(ttInfoDetail.getFcsj(),ttInfoDetail.getBcsj())).append("</JHDDSJ>");
 						sBuffer.append("</BC>");
 					}
@@ -1214,7 +1241,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	 *
 	 * @return 站点序号累加后的ID
 	 */
-	private int packagStationXml(List<StationRoute> stationsList,StringBuffer sBuffer,int startId){
+	private int packagStationXml(List<StationRoute> stationsList,StringBuffer sBuffer,int startId,Map<String, Integer> stationNumMap){
 		int size = stationsList.size();
 		StationRoute srRoute;
 		HashMap<String,String> paraMap;
@@ -1231,7 +1258,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			}
 			paraMap = packageYgcStationNumParam(srRoute,null);
 			sBuffer.append("<Station>");
-			sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paraMap)).append("</ZDXH>");
+			sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paraMap,stationNumMap)).append("</ZDXH>");
 			sBuffer.append("<SXX>").append(srRoute.getDirections()).append("</SXX>");
 			sBuffer.append("<ZDMC>").append(srRoute.getStationName()).append("</ZDMC>");
 			sBuffer.append("<ZDBM>").append(srRoute.getStationCode()).append("</ZDBM>");
@@ -1287,7 +1314,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	 * @param map
 	 * @return 运管处站点序号
 	 */
-	private Integer getYgcStationNumByLineCodeAndDirectionAndStationName(HashMap<String,String> map){
+	private Integer getYgcStationNumByLineCodeAndDirectionAndStationName(HashMap<String,String> map,Map<String, Integer> stationNumMap){
 		// 线路编码
 		String lineCode = map.get("lineCode");
 		// 线路走向 0：上行  1：下行
@@ -1305,9 +1332,15 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 		}else if(stationMark.equals("Z")){
 			marks= new String[]{"Z"};
 		}
+		// 默认从缓存BasicData.stationName2YgcNumber
+		Map<String, Integer> tempMap = BasicData.stationName2YgcNumber;
+		// 如果传入的stationNumMap不为空，则不是缓存取，而从stationNumMap取
+		if(stationNumMap != null){
+			tempMap = stationNumMap;
+		}
 		Integer number = null;
 		for (int i = 0 ;i < marks.length ; i ++){
-			number = BasicData.stationName2YgcNumber.get(lineCode+"_"+direction+"_"+stationCode+"_"+marks[i]);
+			number = tempMap.get(lineCode+"_"+direction+"_"+stationCode+"_"+marks[i]);
 			if(number != null){
 				break;
 			}
@@ -16,7 +16,7 @@ var platform = process.platform;
 var iswin = platform=='win32';
 var sp = platform=='win32'?'\\':'/';
 //不参与的目录
-var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission'+sp+'authorize_all', 'summary', 'history_sch' ,'report'+sp+'oil']
+var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission'+sp+'authorize_all', 'summary', 'history_sch' ,'report'+sp+'oil','base'+sp+'geo_data_edit']
 	,ep = new EventProxy()
 	,pName = 'bsth_control'
 	,path = process.cwd()
+<!DOCTYPE html>
+<html lang="zh-cn">
+
+<head>
+    <meta charset="UTF-8">
+    <link rel="stylesheet" href="/assets/plugins/uk3.0/uikit.min.css"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" />
+    <!-- flatpickr -->
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.css">
+    <!-- tooltip css-->
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.css"  />
+    <link rel="stylesheet" href="/real_control_v2/css/pace.css"  />
+    <style>
+        /* ^_^ baidu map hide logo */
+        .anchorBL, .anchorBL, .amap-logo, .amap-copyright {
+            display: none;
+        }
+
+        html,body{
+            height: 100%;
+        }
+        .ct_page{
+            padding: 0;
+            height: 100%;
+        }
+
+        div#map_wrap{
+            height: 100%;
+        }
+
+        .main_left_panel{
+            position: absolute;
+            z-index: 999;
+            height: calc(100% - 20px);
+            width: 300px;
+            background: #fffffff5;
+            top: 7px;
+            left: 5px;
+            box-shadow: 5px 5px 15px rgba(90, 90, 90, 0.48);
+        }
+        .main_lt_search_panel{
+            position: absolute;
+            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;
+            background: #ffffff;
+            box-shadow: -5px 4px 15px rgba(90, 90, 90, 0.48);
+            padding: 0 12px;
+            text-align: center;
+            border-radius: 7px;
+            height: 28px;
+        }
+
+        .main_rt_tools_panel>._icon{
+            margin: 0 9px;
+        }
+        .search_input{
+            width: 250px;
+            height: 42px;
+        }
+
+        .search_input::placeholder{
+            color: grey;
+            font-size: 12px;
+        }
+    </style>
+</head>
+
+<body>
+<div class="ct_page" >
+    <div id="map_wrap">
+    </div>
+    <div class="main_left_panel">
+        <div class="_line_info">
+
+        </div>
+    </div>
+    <div class="main_lt_search_panel">
+        <div class="uk-inline">
+            <span class="uk-form-icon uk-form-icon-flip" uk-icon="icon: search"></span>
+            <input class="uk-input search_input" placeholder="搜索地图位置" type="text">
+        </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"></a>
+    </div>
+</div>
+<!-- 百度 -->
+<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>
+<script src="/assets/plugins/uk3.0/uikit.min.js"></script>
+<script src="/assets/plugins/uk3.0/uikit-icons.min.js"></script>
+<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js" ></script>
+<!-- EventProxy  -->
+<script src="/assets/js/eventproxy.js"></script>
+<!-- art-template 模版引擎 -->
+<script src="/assets/plugins/template.js"></script>
+<script src="/real_control_v2/assets/plugins/moment/moment.min.js"></script>
+<!-- jquery.serializejson JSON序列化插件 -->
+<script src="/assets/plugins/jquery.serializejson.js"  merge="plugins"></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>
+<!-- qtip -->
+<script src="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.js" ></script>
+<script>
+    top.document.title = "绘制线路";
+    // 关闭左侧栏
+    if (!top.$('body').hasClass('page-sidebar-closed')) {top.$('.menu-toggler.sidebar-toggler').click();}
+
+    //初始化地图
+    if(!window.BMap){
+        alert('地图没有加载成功，请确认是否能正常连接外网！！');
+    }
+    var gb_map_consts = {
+        mapContainer: '#map_wrap',
+        center_point: {
+            lng: 121.544336,
+            lat: 31.221315
+        }
+    };
+
+    map = new BMap.Map($(gb_map_consts.mapContainer)[0]);
+    //map.setMapStyle({style:'dark'});
+    //中心点和缩放级别
+    map.centerAndZoom(new BMap.Point(gb_map_consts.center_point.lng, gb_map_consts.center_point.lat), 13);
+    map.enableScrollWheelZoom();
+</script>
+</body>
+</html>
 \ No newline at end of file
+<iframe src="/pages/base/geo_data_edit/main.html?origin=real_control_iframe" frameborder="0" style="height: 100%;width: 100%;"></iframe>
 \ No newline at end of file
@@ -190,12 +190,10 @@ ul li a:hover:not(.active) {
 .radio_label {
 	display:block;
 	color: white;
-	float: left;
 	cursor: pointer;
 	margin-left: 50px;
 	font-size: 20px;
 	margin-top: 5px;
-	text-align: center;
 }
 .radioclass {
 	margin-top: 6px !important;
@@ -207,7 +205,4 @@ ul li a:hover:not(.active) {
 }
 .on {
 	background-position: 0 0;
-} 
-
-
-
+}
 \ No newline at end of file
@@ -196,12 +196,12 @@ $(function(){
 		params.lineId=line.id;
 		params.dir = line.dir;
 		$.get('/stationroute/findCachePoint',params,function(data){
-			var station_radio_html = '<div id="station_radio">';
+			var station_radio_html = '<div id="station_radio" >';
 			var cont = 1;
 			var check = 'checked="checked"';
 			$.each(data,function(){
 				stationRouteMap[this.stationRouteId] = this;
-				station_radio_html += '<div class="radio"><label class="radio_label on"><input name="stationRadio" type="radio" class="radioclass" value="'+this.stationRouteId+'" '+(cont==1?check:"")+' />'+this.stationRouteStationName+"</label></div>";
+				station_radio_html += '<div class="radio" ><label class="radio_label on"><input name="stationRadio" type="radio" class="radioclass" value="'+this.stationRouteId+'" '+(cont==1?check:"")+' />'+this.stationRouteStationName+"</label></div>";
 				cont++;
 			});
 			station_radio_html +=  '</div>';
@@ -22,12 +22,8 @@ $(function(){
 			$('#lineIdInput').val(lineSelectValueArray[0]);// 设值线路编码.
 			$('#lineCodeInput').val(lineSelectValueArray[1]);// 设值线路ID.
 			// 版本号赋值
-			$.get('/lineVersions/findByLineId',{'lineId':lineSelectValueArray[0]},function(lineVersions){
-				$.each(lineVersions,function(){
-					if (this.status == 1) {
-						$('#versionsInput').val(this.versions); 
-					}
-				})
+			$.get('/lineVersions/findCurrentVersion',{'lineId':lineSelectValueArray[0]},function(versions){
+				$('#versionsInput').val(versions); 
 			});
 			// 获取该线路下的路段路由.
 			PublicFunctions.getSectionRouteInfo(lineSelectValueArray[0],function(array) {
@@ -24,12 +24,8 @@ $(function(){
 			$('#lineCodeInput').val(lineSelectValueArray[1]);
 			var params =  {'lineCode_eq':lineSelectValueArray[1],'destroy_eq':0,'directions_eq':dir};
 			// 版本号赋值
-			$.get('/lineVersions/findByLineId',{'lineId':lineSelectValueArray[0]},function(lineVersions){
-				$.each(lineVersions,function(){
-					if (this.status == 1) {
-						$('#versionsInput').val(this.versions); 
-					}
-				})
+			$.get('/lineVersions/findCurrentVersion',{'lineId':lineSelectValueArray[0]},function(versions){
+				$('#versionsInput').val(versions); 
 			});
 			initSelect(params);
 		}
@@ -237,12 +237,8 @@ $(&#39;#add_station_mobal&#39;).on(&#39;AddStationMobal.show&#39;, function(e, addMap,ajaxd,stao
 			// 是否撤销
 			$('#destroySelect').val(0); 
 			// 版本号
-			$.get('/lineVersions/findByLineId',{'lineId':Line.id},function(lineVersions){
-				$.each(lineVersions,function(){
-					if (this.status == 1) {
-						$('#versionsInput').val(this.versions); 
-					}
-				})
+			$.get('/lineVersions/findCurrentVersion',{'lineId':Line.id},function(versions){
+				$('#versionsInput').val(versions);					
 			});
 			var initzdlyP = {'line.id_eq':Line.id,'destroy_eq':0,'directions_eq':Station.dir};
@@ -216,7 +216,6 @@ var WorldsBMap = function () {
 			// 地图画多边形
 			pointsPolygon : function(objStation) {
-				debugger
 				// 将视图切换到指定的缩放等级，中心点坐标不变。注意：当有信息窗口在地图上打开时，地图缩放将保证信息窗口所在的坐标位置不动。（自1.2新增）
 				mapBValue.setZoom(15);
@@ -374,7 +373,6 @@ var WorldsBMap = function () {
 			// 画圆
 			pointsCircle : function(objStation) {
-				debugger
 				// 将视图切换到指定的缩放等级，中心点坐标不变。注意：当有信息窗口在地图上打开时，地图缩放将保证信息窗口所在的坐标位置不动。（自1.2新增）
 				mapBValue.setZoom(16);
@@ -111,6 +111,8 @@
             success:function(data) {
                 if(data == 'success'){
                     alert("上传成功");
+                }else if(data == '0'){
+                    alert("上传失败，线路编号有0");
                 }else{
                     alert("上传失败");
                 }
@@ -31,7 +31,7 @@
     initLineSelect2();
-    function initLineSelect2(compD) {debugger;
+    function initLineSelect2(compD) {
         getComp(function(rs) {
             var params = {};
             if(rs.length>0) {
@@ -55,7 +55,7 @@
                 if(len_>0) {
                     $.each(array, function(i, g){
                         if(g.name!='' || g.name != null) {
-                            paramsD.push({'id':g.name + '_' + g.id + '_' + g.lineCode ,'text':g.name});
+                            paramsD.push({'id':g.id ,'text':g.name});
                         }
                     });
                     initPinYinSelect2($('#line'),paramsD,function(selector) {