站点添加方式修改

游瑞烽
1 parent 2c4d6041
Showing 13 changed files with 412 additions and 71 deletions
src/main/java/com/bsth/controller/geo_data/GeoDataController.java
src/main/java/com/bsth/entity/geo_data/GeoStation.java
src/main/java/com/bsth/repository/LineRepository.java
src/main/java/com/bsth/repository/StationRouteRepository.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/impl/StationRouteServiceImpl.java
src/main/resources/static/pages/base/geo_data_edit/css/mian.css
src/main/resources/static/pages/base/geo_data_edit/fragments/f_station_route.html
src/main/resources/static/pages/base/geo_data_edit/js/map.js
src/main/resources/static/pages/base/geo_data_edit/js/station_route.js
src/main/resources/static/pages/base/geo_data_edit/js/submit.js
src/main/resources/static/pages/base/line/js/line-list-table.js
@@ -48,8 +48,9 @@ public class GeoDataController {
     @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);
+            ,@RequestParam String stationName,@RequestParam Float lat,@RequestParam Float lng,@RequestParam int prevRouteId,
+                                                  @RequestParam String addType,@RequestParam String citeStationCode,@RequestParam Long citeStationId){
+        return geoDataService.addNewStationRoute(lineCode, upDown, versions, stationName, lat, lng, prevRouteId, addType, citeStationCode, citeStationId);
     }
     @RequestMapping(value = "addNewRoadRoute",method = RequestMethod.POST)
@@ -107,4 +108,9 @@ public class GeoDataController {
     public Map<String, Object> batchDestroyLsSectionRout(@RequestParam String ids,@RequestParam String lineCode,@RequestParam int upDown,@RequestParam int versions) {
         return geoDataService.batchDestroyLsSectionRout(ids,lineCode,upDown,versions);
     }
+
+    @RequestMapping(value = "matchStationList",method = RequestMethod.GET)
+    public Map<String, Object> matchStationList(@RequestParam Map<String, Object> map) {
+        return geoDataService.matchStationList(map);
+    }
 }
 \ No newline at end of file
@@ -17,8 +17,12 @@ public class GeoStation {
     private String lineCode;
+    private String lineName;
+
     private Integer directions;
+    private String stationId;
+
     private String stationCode;
     private String stationMark;
@@ -74,6 +78,14 @@ public class GeoStation {
         this.lineCode = lineCode;
     }
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
     public Integer getDirections() {
         return directions;
     }
@@ -82,6 +94,14 @@ public class GeoStation {
         this.directions = directions;
     }
+    public String getStationId() {
+        return stationId;
+    }
+
+    public void setStationId(String stationId) {
+        this.stationId = stationId;
+    }
+
     public String getStationCode() {
         return stationCode;
     }
@@ -68,4 +68,33 @@ public interface LineRepository extends BaseRepository&lt;Line, Integer&gt; {
 			String shortName, String shanghaiLinecode, String eqLinecode, String startPhone, String endPhone,
 			Integer carSumNumber, Integer hvacCarNumber, Integer ordCarNumber, String history, String descriptions,
 			Integer destroy, Integer supperLine, Integer spacGrade, Integer warrantCar, String lineCode, Integer region);
+
+	/**
+	 * 查询线路版本文件
+	 * @param lineId
+	 * @return
+	 */
+	@Query(value = "SELECT version_count FROM bsth_c_line_file_version where line = ?1", nativeQuery = true)
+	Integer findfileVersions(Integer lineId);
+
+	/**
+	 *  添加线路文件版本
+	 * @param lineId
+	 * @param line_code
+	 */
+	@Transactional
+	@Modifying
+	@Query(value = "INSERT INTO bsth_c_line_file_version (line,line_code,version_count) VALUES (?1,?2,2)", nativeQuery = true)
+	public void addFileVersions(Integer lineId, String line_code);
+
+	/**
+	 *  线路文件版本修改
+	 * @param lineId
+	 * @param version_count
+	 */
+	@Transactional
+	@Modifying
+	@Query(value = "UPDATE bsth_c_line_file_version set version_count=?2 WHERE line = ?1", nativeQuery = true)
+	public void editFileVersions(Integer lineId, Integer version_count);
+
 }
@@ -158,22 +158,33 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 	 * 
 	 * 							[6]：distances（站点距离）；[7]：station_name（站点名称）；[8]：directions（方向）}
 	 */
+//	@Query(value = "SELECT * FROM ("+
+//				   "SELECT b.g_lonx," +
+//				   "b.g_laty,b.b_jwpoints," +
+//				   "a.station_mark," +
+//				   "a.station_route_code," +
+//				   "b.station_code," +
+//				   "a.distances,"+
+//				   "b.station_name," +
+//				   "a.directions FROM (SELECT " +
+//				   "s.station_mark," +
+//				   "s.station_route_code," +
+//				   "s.directions," +
+//				   "s.distances,"+
+//				   "s.station FROM bsth_c_stationroute s where  s.line = ?1 and s.destroy=0) a " +
+//				   "LEFT JOIN bsth_c_station b " +
+//				   " on a.station = b.id ORDER BY a.directions ASC ) k ORDER BY k.directions,k.station_route_code ASC", nativeQuery=true)
 	@Query(value = "SELECT * FROM ("+
-				   "SELECT b.g_lonx," +
-				   "b.g_laty,b.b_jwpoints," +
-				   "a.station_mark," +
-				   "a.station_route_code," +
-				   "b.station_code," +
-				   "a.distances,"+
-				   "b.station_name," +
-				   "a.directions FROM (SELECT " +
-				   "s.station_mark," +
-				   "s.station_route_code," +
-				   "s.directions," +
-				   "s.distances,"+
-				   "s.station FROM bsth_c_stationroute s where  s.line = ?1 and s.destroy=0) a " +
-				   "LEFT JOIN bsth_c_station b " +
-				   " on a.station = b.id ORDER BY a.directions ASC ) k ORDER BY k.directions,k.station_route_code ASC", nativeQuery=true)
+			"SELECT b.g_lonx," +
+			"b.g_laty,b.b_jwpoints," +
+			"a.station_mark," +
+			"a.station_route_code," +
+			"a.station_code," +
+			"a.distances,"+
+			"a.station_name," +
+			"a.directions FROM " +
+			" bsth_c_stationroute a , bsth_c_station b " +
+			" where  a.line = ?1 and a.destroy=0 and a.station = b.id ) k ORDER BY k.directions,k.station_route_code ASC", nativeQuery=true)
 	List<Object[]> usingSingle(Integer lineId);
 	/**
@@ -21,7 +21,7 @@ public interface GeoDataService {
     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> addNewStationRoute(String lineCode, int upDown,int versions, String stationName, Float lat, Float lng, int prevRouteId, String addType, String citeStationCode, Long citeStationId);
     Map<String,Object> destroyStation(GeoStation station);
@@ -44,4 +44,6 @@ public interface GeoDataService {
     Map<String,Object> batchDestroyLsStationRout(String ids, String lineCode, int upDown, int versions);
     Map<String,Object> batchDestroyLsSectionRout(String ids, String lineCode, int upDown, int versions);
+
+    Map<String, Object> matchStationList(Map<String, Object> map);
 }
@@ -10,6 +10,9 @@ import com.bsth.service.geo_data.impl.dto.CascadeSaveRoad;
 import com.bsth.service.geo_data.impl.dto.CascadeSaveStation;
 import com.bsth.service.geo_data.impl.dto.SaveRoadRouteDTO;
 import com.bsth.service.geo_data.impl.dto.SaveStationRouteDTO;
+import com.bsth.util.Geo.Circle;
+import com.bsth.util.Geo.GeoUtils;
+import com.bsth.util.Geo.Point;
 import com.bsth.util.GetUIDAndCode;
 import com.bsth.util.TransGPS;
 import com.google.common.base.Splitter;
@@ -28,7 +31,13 @@ import org.springframework.transaction.support.DefaultTransactionDefinition;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 /**
  * Created by panzhao on 2017/12/8.
@@ -150,6 +159,68 @@ public class GeoDataServiceImpl implements GeoDataService {
     }
     /**
+     * @Description :TODO(根据坐标点匹配数据库中的站点)
+     *
+     * @param map: <point:坐标点； name:站点名>
+     *
+     */
+    @Override
+    public Map<String, Object> matchStationList(Map<String, Object> map) {
+        SaveStationRouteDTO a;
+        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 {
+            List<GeoStation> matchStationList = new ArrayList<>();
+            String matchType = map.get("matchType").toString();
+            String sql = "select t1.id,t1.station_name ,t1.line_code,t1.station as station_id,t1.station_code,t1.station_mark,t1.versions,t1.directions, " +
+                    "t2.b_jwpoints,t2.g_lonx,t2.g_laty,t3.name as line_name from bsth_c_ls_stationroute t1, " +
+                    "bsth_c_station t2 , bsth_c_line t3 where  t1.station_code=t2.station_code and t1.station = t2.id and t1.line = t3.id";
+            List<GeoStation> list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(GeoStation.class));
+            if(matchType.equals("stationName")){
+                String stationName = map.get("stationName").toString();
+
+                for (GeoStation station : list) {
+                    if (station.getStationName().equals(stationName))
+                        matchStationList.add(station);
+                }
+            }else if(matchType.equals("point")){
+
+                Double gLonx = Double.valueOf(map.get("gLonx").toString());
+                Double gLaty = Double.valueOf(map.get("gLaty").toString());
+                //坐标转换
+                TransGPS.Location loc = TransGPS.LocationMake(gLonx, gLaty);
+                loc = TransGPS.bd_decrypt(loc);
+                loc = TransGPS.transformFromGCJToWGS(loc);
+                Point point = new Point(loc.getLng(), loc.getLat());
+                for (GeoStation station : list) {
+                    Float matchGLonx =  station.getgLonx();
+                    Float matchGLaty =  station.getgLaty();
+                    Point center = new Point(matchGLonx, matchGLaty);
+                    // 搜索100m以内的站点
+                    Circle circle = new Circle(center, 100);
+                    if (GeoUtils.isPointInCircle(point, circle)) {
+                        matchStationList.add(station);
+                    }
+                }
+            }
+
+            rs.put("matchStationList", matchStationList);
+            rs.put("status", ResponseCode.SUCCESS);
+
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", "服务器出现异常");
+        }
+        return rs;
+    }
+
+    /**
      * 编辑缓冲区信息
      *
      * @param station
@@ -688,7 +759,8 @@ public class GeoDataServiceImpl implements GeoDataService {
     }
     @Override
-    public Map<String, Object> addNewStationRoute(String lineCode, int upDown, int versions, String stationName, Float lat, Float lng, int prevRouteId) {
+    public Map<String, Object> addNewStationRoute(String lineCode, int upDown, int versions, String stationName, Float lat, Float lng, int prevRouteId,
+                                                  String addType, String citeStationCode, Long citeStationId) {
         Map<String, Object> rs = new HashMap<>();
         //编程式事务
@@ -714,13 +786,16 @@ public class GeoDataServiceImpl implements GeoDataService {
             //按路由顺序排列
             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)))));
+            if(!addType.equals("cite")){
+                //转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_code, db_type, b_jwpoints, g_lonx, g_laty) " +
-                    " values(?,?,?,?,?,?)", sCode, sCode, "b", lng + " " + lat, wgsLoc.getLng(), wgsLoc.getLat());
+                //insert 站点
+                citeStationId = GetUIDAndCode.getStationId();
+                citeStationCode = citeStationId.toString();
+                jdbcTemplate.update("insert into bsth_c_station(id, station_code, db_type, b_jwpoints, g_lonx, g_laty) " +
+                        " values(?,?,?,?,?,?)", citeStationId, citeStationCode, "b", lng + " " + lat, wgsLoc.getLng(), wgsLoc.getLat());
+            }
             SaveStationRouteDTO sr;
@@ -749,8 +824,8 @@ public class GeoDataServiceImpl implements GeoDataService {
             nsr.setDirections(upDown);
             nsr.setVersions(versions);
             nsr.setStationRouteCode(currentNo);
-            nsr.setStation(sCode);
-            nsr.setStationCode(sCode + "");
+            nsr.setStation(citeStationId);
+            nsr.setStationCode(citeStationCode);
             nsr.setStationName(stationName);
             nsr.setDistances(0d);
             nsr.setToTime(0d);
@@ -775,6 +850,9 @@ public class GeoDataServiceImpl implements GeoDataService {
             if(routes.size() > 1)
                 routes.get(routes.size() - 1).setStationMark("E");
+            jdbcTemplate.update("update bsth_c_ls_stationroute set station_route_code=station_route_code+100" +
+                    " where line_code =? and directions=? and destroy=0 and station_route_code >= ?",lineCode,upDown,currentNo);
+
             //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, radius, shapes_type) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"
                     , nsr.getLine(), nsr.getStation(), nsr.getStationName(), nsr.getStationRouteCode(), nsr.getLineCode(), nsr.getStationCode(), "Z"
@@ -694,9 +694,17 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		try {
 			// 获取线路ID
 			Integer lineId = map.get("lineId").equals("") ? 0 : Integer.parseInt(map.get("lineId").toString());
-			Integer fileVersions = map.get("fileVersions").equals("") ? 2 : Integer.parseInt(map.get("fileVersions").toString());// 没有输入就默认2
 			/** 查询线路信息 @param：<lineId：线路ID> */
 			Line line = lineRepository.findOne(lineId);
+			Integer fileVersions = lineRepository.findfileVersions(lineId);
+			if(fileVersions == null) {
+				lineRepository.addFileVersions(line.getId(), line.getLineCode());
+				fileVersions = 2;
+			} else {
+				fileVersions = fileVersions + 1;
+				lineRepository.editFileVersions(line.getId(),fileVersions);
+			}
+//			Integer fileVersions = map.get("fileVersions").equals("") ? 2 : Integer.parseInt(map.get("fileVersions").toString());// 没有输入就默认2
 			/** 查询线路信息下的站点路由信息 @param：<lineId：线路ID> */
 			List<Object[]> objects = repository.usingSingle(lineId);
 			if (objects.size()>0) {
@@ -743,8 +751,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				File targetFile = PackTarGZUtils.compress(textFile, target);
 				clientUtils.FTPUpLoadFromDisk(targetFile, targetFile.getName(), url, port, username, password, remotePath);
 				// 删除文件
-				textFile.delete();
-				targetFile.delete();
+//				textFile.delete();
+//				targetFile.delete();
 				resultMap.put("status", ResponseCode.SUCCESS);
 			}else {
 				resultMap.put("status","NOTDATA");
@@ -217,7 +217,7 @@ a.clock_enable_version:focus{
     margin-left: 0px;
 }
 .road_route{
-    padding-left: 30px;
+    padding-left: 25px;
     width: calc(100% - 25px);
     font-size: 14px;
     color: #242424;
@@ -510,12 +510,13 @@ ul.context-menu-list.station-route-ct-menu.context-menu-root {
 .add_station_search_point_wrap{
     width: 390px;
-    height: 126px;
+    height: 156px;
     position: absolute;
     top: 10px;
     left: calc(50% - 200px);
     z-index: 999;
-    background: #ffface;
+    background: #fff;
+    /*background: #ffface;*/
     box-shadow: 5px 5px 15px rgba(90, 90, 90, 0.48);
 }
@@ -579,7 +580,8 @@ ul.context-menu-list.station-route-ct-menu.context-menu-root {
     top: 10px;
     left: calc(50% - 200px);
     z-index: 999;
-    background: #ffface;
+    background: #fff;
+    /*background: #ffface;*/
     box-shadow: 5px 5px 15px rgba(90, 90, 90, 0.48);
 }
@@ -163,6 +163,14 @@
                             </div>
                         </div>
                         <div class="uk-inline btns">
+                            <button class="uk-button uk-button-primary pointSearch">坐标点查找</button>
+                        </div>
+                    </div>
+                    <div class="ct_row ">
+                        <div class="uk-inline" >
+                            <select name="matchStationIndex" class="form-control matchStationListSelect" style="width:100%"></select>
+                        </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>
@@ -34,6 +34,8 @@ var gb_ct_map = function () {
     var editCircle;
     var editPolygon;
     var dragMarker;
+    // 站点添加和编辑时候匹配的站点MarkList
+    var matchStationMarkList = new Array();
     map = new BMap.Map($(gb_map_consts.mapContainer)[0], {enableMapClick: false});
     //中心点和缩放级别
@@ -174,14 +176,14 @@ var gb_ct_map = function () {
         map.openInfoWindow(win, point);
     }
-    function createStationMark(statio) {
-        var point = new BMap.Point(statio.bd_lon, statio.bd_lat);
+    function createStationMark(station) {
+        var point = new BMap.Point(station.bd_lon, station.bd_lat);
         var marker = new BMap.Marker(point);
         //根据站点名称 计算marker 宽度
-        var w = statio.stationName.length * 12 + 38
+        var w = station.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)})
+        var icon = new BMap.Icon(createStationIcon(station, w), new BMap.Size(iw, 24), {anchor: new BMap.Size(iw / 2, 25)})
         marker.setIcon(icon);
         marker.setShadow(null);
@@ -208,6 +210,7 @@ var gb_ct_map = function () {
         win.addEventListener('open', function (e) {
             gb_station_route.focus(m.ct_data);
         });
+        setTop(m);
         map.openInfoWindow(win, m.point);
     };
@@ -489,6 +492,78 @@ var gb_ct_map = function () {
         dragMarker.addEventListener('dragging', dragMarkerDragEvent);
     };
+    /**
+     * 添加匹配站点
+     * @param i
+     * @param station
+     */
+    var addMatchStationMark = function(i,station) {
+        transCoord(station);
+        var point = new BMap.Point(station.bd_lon, station.bd_lat);
+        var marker = new BMap.Marker(point);
+        marker.addEventListener('click', function () {
+            if(this)
+                $(".matchStationListSelect").select2("val", this.index);
+            // this.openInfoWindow(new BMap.InfoWindow( {offset: new BMap.Size(0, -13)}))；
+            // this.setColor("blue");
+        });
+
+        //mouseover
+        marker.addEventListener('mouseover', function () {
+            setTop(this);
+            // this.setColor("blue");
+        });
+
+        //mouseout
+        marker.addEventListener('mouseout', function () {
+            // this.setColor("red");
+        });
+
+
+        marker.index = i;
+        marker.stationCode = station.stationCode;
+        marker.stationId = station.stationId;
+        marker.stationName = station.stationName;
+        marker.lineName = station.lineName;
+
+        var label = new BMap.Label(i,{offset:new BMap.Size(i>9?2:6,2)});
+        label.setStyle({border :"0", color : "white",backgroundColor:"rgba(0,0,0,0)"});
+        marker.setLabel(label);
+        marker.setTitle(i+'.'+station.stationName+'-'+station.stationCode+'-'+ station.lineName);
+        map.addOverlay(marker);
+        matchStationMarkList.push(marker);
+    };
+
+    var pickMatchStationMark = function (i) {
+        var mark = matchStationMarkList[i];
+        var wi = mark.stationName.length * 12 + 38;
+        var opts = {
+            // 信息窗口宽度
+            width: (wi < 100 ? 100 : wi),
+            // 信息窗口高度
+            height: 20,
+            // 信息窗位置偏移值。
+            // offset: new BMap.Size(wi/2,-20),
+            //设置不允许信窗发送短息
+            enableMessage: false,
+            //是否开启点击地图关闭信息窗口
+            enableCloseOnClick: false,
+            // 是否开启信息窗口打开时地图自动移动（默认开启）。(自 1.1 新增)
+            enableAutoPan: false
+        };
+        var infoWindow_target = new BMap.InfoWindow(i+'.'+mark.stationName+'-'+mark.stationCode+'-'+ mark.lineName, opts);
+        mark.openInfoWindow(infoWindow_target);
+        map.centerAndZoom(mark.point, 16);
+        // 置顶覆盖物
+        setTop(mark);
+        // 把黄色添加的站点中心坐标改为mark的坐标点
+        pickupPoint(mark);
+    };
+
+    var initMatchStationMarkList = function () {
+        matchStationMarkList = [0];
+    };
+
     var dragMarkerDragEvent = function () {
         if (editPolygon) {
             if (!BMapLib.GeoUtils.isPointInPolygon(this.point, editPolygon))
@@ -945,6 +1020,12 @@ var gb_ct_map = function () {
         focusRoad: focusRoad,
         editStationBuffer: editStationBuffer,
         insert_between_station_road: insert_between_station_road,
+        getMatchStationMarkList: function () {
+            return matchStationMarkList;
+        },
+        initMatchStationMarkList: initMatchStationMarkList,
+        addMatchStationMark: addMatchStationMark,
+        pickMatchStationMark: pickMatchStationMark,
         updateStation: updateStation,
         exitEditBufferStatus: exitEditBufferStatus,
         changeShapeType: changeShapeType,
@@ -959,12 +1040,14 @@ var gb_ct_map = function () {
         updateDragRadius: updateDragRadius,
         closeInfoWin: closeInfoWin,
         showAddPointPanel: showAddPointPanel,
+        startSearchPoint: startSearchPoint,
         resetMapStatus: function () {
             map_status = 0;
             clearOtherOverlay();
             map.removeEventListener('dblclick', pickupPoint);
             map.enableDoubleClickZoom();
         },
+        // clearOtherOverlay: clearOtherOverlay,
         reDrawStation: reDrawStation,
         reDrawRoad: reDrawRoad,
         edit_road: start_edit_road,
@@ -172,7 +172,7 @@ var gb_station_route = function () {
             //上一个站点的ID
             var _cell = $(this).parents('.station_li_transient');
-            var $prev = prevs(_cell, 's_r_item')
+            var $prev = prevs(_cell, 's_r_item');
             if($prev.length > 0)
                 addPrevId = $prev.data('id');
             else
@@ -181,6 +181,45 @@ var gb_station_route = function () {
             $('.main_left_panel_m_layer').show();
             gb_ct_map.showAddPointPanel(name);
+            // 清楚多余覆盖物
+            // gb_ct_map.resetMapStatus();
+            var parm = {};
+            parm.stationName = name;
+            parm.matchType = 'stationName';
+            gb_common.$get('/_geo_data/matchStationList', parm, function (rs) {
+                if(rs.status == 'SUCCESS'){
+                    var len_ = rs.matchStationList.length,paramsD = new Array();
+                    gb_ct_map.initMatchStationMarkList();
+                    if(len_>0) {
+                        paramsD.push({'id':'0','text':'说明:如果没有匹配的想要的站点可以用坐标查找附近点位'});
+                        var count = 1;
+                        // 遍历.
+                        $.each(rs.matchStationList, function(i, g){
+                            // 判断.
+                            if(g.stationName!='' && g.stationName != null) {
+                                // 添加拼音检索下拉框格式数据数组.
+                                paramsD.push({'id':count,  'text':count+"."+g.stationName + '-' + g.stationCode + '-' +g.lineName});
+                                gb_ct_map.addMatchStationMark(count,g);
+                                count++;
+                            }
+                        });
+                    } else
+                        paramsD.push({'id':'0','text':'提示:没有匹配到站点请用坐标查找附近点位'});
+
+                    $('.matchStationListSelect').empty();
+                    // 初始化上一个路段拼音检索下拉框.
+                    initPinYinSelect2($('.matchStationListSelect'),paramsD,function(selector) { });
+                    $('.matchStationListSelect').on("change",function(e){
+                        gb_ct_map.pickMatchStationMark($('.matchStationListSelect').val());
+                    });
+                    setTimeout(function () {
+                        // 选中第一个匹配的站点
+                        $(".matchStationListSelect").select2("val", 1);
+                    },500);
+                } else {
+                }
+            });
+
         });
         //监听回车事件
         $('[name=stationName]', addCell).on('keydown', function (e) {
@@ -81,6 +81,9 @@ var gb_data_submit = function () {
             data.prevRouteId = gb_station_route.getAddPrevId();
             data.lng = data.gLonx;
             data.lat = data.gLaty;
+            data.addType = 'cite';
+            data.citeStationCode = gb_ct_map.getMatchStationMarkList()[data.matchStationIndex].stationCode;
+            data.citeStationId = gb_ct_map.getMatchStationMarkList()[data.matchStationIndex].stationId;
             delete data.gLonx;
             delete data.gLaty;
@@ -90,13 +93,65 @@ var gb_data_submit = function () {
                 gb_station_route.addEnd(rs.list, rs.newStationRouteCode);
                 hide_run_text();
-                UIkit.notification("修改成功！", {status: 'success'});
+                UIkit.notification("添加成功！", {status: 'success'});
             });
         },confirmRejected);
         return false;
     });
     /**
+     * 新增站点-坐标点查找匹配站点
+     */
+    $(document).on('click', '.add_station_search_point_wrap .buffer_edit_body button.pointSearch', function (e) {
+        var f = $(this).parents('form');
+        var data = f.serializeJSON();
+        var stationName = data.stationName,
+            point = {lon:data.gLonx,lat:data.gLaty};
+        var parm = {};
+        parm.gLonx = data.gLonx;
+        parm.gLaty = data.gLaty;
+        parm.matchType = 'point';
+
+        // 清楚地图上匹配到的站点
+        gb_ct_map.resetMapStatus();
+        // 进入新增点位 地图选点模式
+        gb_ct_map.startSearchPoint(point, stationName);
+        gb_common.$get('/_geo_data/matchStationList', parm, function (rs) {
+            if(rs.status == 'SUCCESS'){
+                var len_ = rs.matchStationList.length,paramsD = new Array();
+                gb_ct_map.initMatchStationMarkList();
+                if(len_>0) {
+                    paramsD.push({'id':'0','text':'说明:如果没有匹配的想要的站点可以用坐标查找附近点位'});
+                    var count = 1;
+                    // 遍历.
+                    $.each(rs.matchStationList, function(i, g){
+                        // 判断.
+                        if(g.stationName!='' && g.stationName != null) {
+                            // 添加拼音检索下拉框格式数据数组.
+                            paramsD.push({'id':count,  'text':count+"."+g.stationName + '-' + g.stationCode + '-' +g.lineName});
+                            gb_ct_map.addMatchStationMark(count,g);
+                            count++;
+                        }
+                    });
+                } else
+                    paramsD.push({'id':'0','text':'提示:没有匹配到站点请用坐标查找附近点位'});
+
+                $('.matchStationListSelect').empty();
+                // 初始化上一个路段拼音检索下拉框.
+                initPinYinSelect2($('.matchStationListSelect'),paramsD,function(selector) { });
+                $('.matchStationListSelect').on("change",function(e){
+                    gb_ct_map.pickMatchStationMark($('.matchStationListSelect').val());
+                });
+                setTimeout(function () {
+                    // 选中第一个匹配的站点
+                    $(".matchStationListSelect").select2("val", 1);
+                },200);
+            } else {
+            }
+        });
+    });
+
+    /**
      * 新增路段提交
      */
     $(document).on('click', '.add_road_search_point_wrap .buffer_edit_body button.submit', function (e) {
@@ -169,7 +224,6 @@ var gb_data_submit = function () {
     $(document).on('click', '#add_line_versions_modal ._submit', function (e) {
         var f = $('form', '#add_line_versions_modal');
         var data = f.serializeJSON();
-        debugger;
         data.lineCode = g_line_code;
         if(!data.startDate || !data.name){
             document.getElementsByClassName('reminder_span')[0].style.visibility = 'visible';
@@ -338,7 +338,34 @@
 			layer.msg('请选中一条线路！');
 			return ;
     	}else {
-            layer.open({
+            var fileVersions = $('#fileVersionsInput').val();
+            id = arrChk.data('id');
+            lineName = arrChk.val();
+            // 请求参数
+            var params = {lineId:id};//, fileVersions:fileVersions
+            // 关闭弹出框
+            // layer.close(index);
+            // 弹出正在加载层
+            var index2 = layer.load(0);
+            /** 生成线路行单 @pararm：<params：请求参数> */
+            $post('/stationroute/usingSingle',params,function(data) {
+                // 关闭弹出框
+                layer.close(index2);
+                if(data.status=='SUCCESS') {
+                    // 弹出添加成功提示消息
+                    layer.msg('生成线路【'+ lineName +'】线路文件成功!');
+                }else if(data.status=='ERROR'){
+                    // 弹出添加成功提示消息
+                    layer.msg('生成线路【'+ lineName +'】线路文件失败!');
+                }else if(data.status=='NOTDATA') {
+                    // 弹出添加成功提示消息
+                    layer.msg('系统无线路【'+ lineName +'】的站点与路段信息!');
+                }else if(data.status=='NOLinePlayType') {
+                    // 弹出添加成功提示消息
+                    layer.msg('无法识别【'+ lineName +'】的线路规划类型，请设置为双向/环线!');
+                }
+            });
+            /*layer.open({
                 title: "线路文件版本号",
                 // skin:'layui-layer-rim',
                 area:['450px', 'auto'],
@@ -351,39 +378,13 @@
                 +'</div>',
                 btn:['确定','取消'],
                 btn1: function (index,layero) {
-                    var fileVersions = $('#fileVersionsInput').val();
-                    id = arrChk.data('id');
-                    lineName = arrChk.val();
-                    // 请求参数
-                    var params = {lineId:id, fileVersions:fileVersions};
-                    // 关闭弹出框
-                    layer.close(index);
-                    // 弹出正在加载层
-                    var index2 = layer.load(0);
-                    /** 生成线路行单 @pararm：<params：请求参数> */
-                    $post('/stationroute/usingSingle',params,function(data) {
-                        // 关闭弹出框
-                        layer.close(index2);
-                        if(data.status=='SUCCESS') {
-                            // 弹出添加成功提示消息
-                            layer.msg('生成线路【'+ lineName +'】线路文件成功!');
-                        }else if(data.status=='ERROR'){
-                            // 弹出添加成功提示消息
-                            layer.msg('生成线路【'+ lineName +'】线路文件失败!');
-                        }else if(data.status=='NOTDATA') {
-                            // 弹出添加成功提示消息
-                            layer.msg('系统无线路【'+ lineName +'】的站点与路段信息!');
-                        }else if(data.status=='NOLinePlayType') {
-                            // 弹出添加成功提示消息
-                            layer.msg('无法识别【'+ lineName +'】的线路规划类型，请设置为双向/环线!');
-                        }
-                    });
+
                 },
                 btn2:function (index,layero) {
                     layer.close(index);
                 }
-            });
+            });*/
     	}
 	});	
 	/** 生成路线（路段和站点） */