1.

王通
1 parent 6df5f7ab
Showing 6 changed files with 21 additions and 18 deletions
src/main/java/com/bsth/service/impl/LsStationRouteServiceImpl.java
src/main/java/com/bsth/service/impl/StationServiceImpl.java
src/main/resources/static/pages/base/stationroute/add_routes_template.html
src/main/resources/static/pages/base/stationroute/destroy_stationroute.html
src/main/resources/static/pages/base/stationroute/js/stationroute-list-events.js
src/main/resources/static/pages/base/stationroute/js/stationroute-list-map.js
@@ -130,10 +130,10 @@ public class LsStationRouteServiceImpl extends BaseServiceImpl&lt;LsStationRoute, I
         if (line == null) {
             throw new RuntimeException(String.format("未找到ID为%d的线路信息", lineId));
         }
-        stationRoutesHandle(line, versions, directions, stationRoutes);
+        List<Station> stations = stationRoutesHandle(line, versions, directions, stationRoutes);
         List<Section> sections = sectionRoutesHandle(line, versions, directions, sectionRoutes);
  
-        //stationRepository.saveAll(stations);
+        stationRepository.saveAll(stations);
         sectionRepository.saveAll(sections);
         lsStationRouteRepository.saveAll(stationRoutes);
         lsSectionRouteRepository.saveAll(sectionRoutes);
@@ -144,8 +144,9 @@ public class LsStationRouteServiceImpl extends BaseServiceImpl&lt;LsStationRoute, I
         return result;
     }
  
-    private void stationRoutesHandle(Line line, Integer versions, Integer directions, List<LsStationRoute> stationRoutes) {
-        int count = 0;
+    private List<Station> stationRoutesHandle(Line line, Integer versions, Integer directions, List<LsStationRoute> stationRoutes) {
+        List<Station> stations = new ArrayList<>();
+        int currentId = stationRepository.findLatestStationId(), count = 0;
         for (int len = stationRoutes.size();count < len;) {
             LsStationRoute stationRoute = stationRoutes.get(count);
             stationRoute.setStationMark(count == 0 ? "B" : count == len - 1 ? "E" : "Z");
@@ -156,7 +157,18 @@ public class LsStationRouteServiceImpl extends BaseServiceImpl&lt;LsStationRoute, I
             stationRoute.setLineCode(line.getLineCode());
             stationRoute.setStationRouteCode(100 * count);
             stationRoute.setStationCode(stationRoute.getStation().getStationCode());
+
+            Station station = stationRoute.getStation();
+            if (station.getId() == null) {
+                station.setId(currentId + count);
+                station.setStationCode(station.getId().toString());
+                stationRoute.setStationCode(station.getStationCode());
+                centerPoint(station);
+                stations.add(station);
+            }
         }
+
+        return stations;
     }
  
     private List<Section> sectionRoutesHandle(Line line, Integer versions, Integer directions, List<LsSectionRoute> sectionRoutes) {
@@ -106,23 +106,18 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 		for (Station s : stations) {
 			Location location = CoordinateConverter.LocationMake(s.getCenterPointWkt());
 			Point point = new Point(location.getLng(), location.getLat());
-			double minDistance = Double.MAX_VALUE, matchDistance = 60;
-			Station target = null;
+			double matchDistance = 60;
 			for (Station s1 : stations1) {
 				Location location1 = CoordinateConverter.LocationMake(s1.getCenterPoint().toString());
 				Point point1 = new Point(location1.getLng(), location1.getLat());
 				double distance = GeoUtils.getDistance(point, point1);
 				if (distance <= matchDistance) {
-					target = s1;
+					s.setId(s1.getId());
+					s.setStationCode(s1.getStationCode());
+					s.setStationName(s1.getStationName());
 					break;
 				}
-				if (distance < minDistance) {
-					target = s1;
-				}
 			}
-			s.setId(target.getId());
-			s.setStationCode(target.getStationCode());
-			s.setStationName(target.getStationName());
 		}
 	}
  
@@ -226,7 +226,7 @@ $(&#39;#add_routes_template_modal&#39;).on(&#39;modal.show&#39;, function(e,_WorldsBMap,_GetAjax
 			let sectionListTemp = arrayFormat.sectionList;
 			let sectionList = [];
 			// 隔30个取一个点（相当于30s）
-			let typeNum = type == 0 ? 30:1;
+			let typeNum = 1;
 			for(let i = 0; i * typeNum < sectionListTemp.length; i++) {
 				sectionList[i] = sectionListTemp[i * typeNum];
 			}
@@ -215,7 +215,6 @@ $(&#39;#delete_station_mobal&#39;).on(&#39;deleteStationMobal.show&#39;,function(e, ajaxd, line,
 		var i = layer.load(2);
 		// 异步请求获取表格数据
 		$.get('/api/lsstationroute/findPageByParams', params, function(result) {
-			debugger
 			// 添加序号
 			if (!result.content) {
 				result.content = new Array();
@@ -148,7 +148,6 @@ $(function(){
 		 var Line = LineObj.getLineObj();
 		 console.log($($("#versions").find("option:selected")[0]).attr("status"));
 		 var params = {lineId: Line.id, version: $('#versions').val(), direction: 1, otherDirection: 0};
-		 debugger
 		 quote(params,index);
 	});
  
@@ -643,9 +643,7 @@ window.WorldsBMap = function () {
         localtionRoad: function (sectionName, callback) {
             // 关闭信息窗口
             mapBValue.closeInfoWindow();
-            debugger
             GetAjaxData.findSectionByName(sectionName, function (sections) {
-                debugger
                 var marker;
                 if (sections.length > 0) {
                     var points = new Array();