1.百度地图key替换

2.区间子线路+线路文件、报站文件生成的完善，以及线调的处理变化 3.js打包兼容es6

1.百度地图key替换
2.区间子线路+线路文件、报站文件生成的完善，以及线调的处理变化 3.js打包兼容es6
王通
1 parent ec375259
Showing 1 changed file with 28 additions and 10 deletions
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
@@ -12,6 +12,7 @@ import com.bsth.util.db.DBUtils_MS;
 import com.google.common.base.Splitter;
 import org.apache.commons.lang3.StringUtils;
 import org.geolatte.geom.Polygon;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Sort;
@@ -1039,27 +1040,44 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 	private String subLine2Ftp(LineRegion lineRegion) {
 		StringBuilder builder = new StringBuilder();
 		int len = lineRegion.getStationRoutes().size();
+		if (len < 2) throw new RuntimeException("无效的区间线路");
 		int idx = 1;
+		List<LsStationRoute> stationRoutes = new ArrayList<>();
+		stationRoutes.add(lineRegion.getStationRoutes().get(len - 1));
+		stationRoutes.add(lineRegion.getStationRoutes().get(0));
+		if (lineRegion.getDirection() == 1) {
+			idx = mergeSubLine(stationRoutes, builder, idx);
+		}
+		idx = mergeSubLine(lineRegion.getStationRoutes(), builder, idx);
+		if (lineRegion.getDirection() == 0) {
+			mergeSubLine(stationRoutes, builder, idx);
+		}
+
+		return builder.toString();
+	}
+
+	private int mergeSubLine(List<LsStationRoute> stationRoutes, StringBuilder builder, int idx) {
+		int len = stationRoutes.size();
 		for (int i = 0;i < len;i++) {
-			LsStationRoute route = lineRegion.getStationRoutes().get(i);
+			LsStationRoute route = stationRoutes.get(i);
 			builder.append(route.getCenterPointWgs().getPosition().getCoordinate(0))
-			.append("\t").append(route.getCenterPointWgs().getPosition().getCoordinate(1))
-			.append("\t").append(i == len - 1 ? 2 : 1)
-			.append("\t").append(idx).append("\t");
+					.append("\t").append(route.getCenterPointWgs().getPosition().getCoordinate(1))
+					.append("\t").append(i == len - 1 ? 2 : 1)
+					.append("\t").append(idx).append("\t");
 			for (int j = 0;j < 8 - route.getStationCode().length();j++) {
 				builder.append("0");
 			}
 			builder.append(route.getStationCode())
-			.append("\t").append((int) route.getDistances().doubleValue() * 1000)
-			.append("\t0")
-			.append("\t").append(route.getStationName())
-			.append("\t").append(route.getStationNameEn())
-			.append("\r\n");
+					.append("\t").append((int) route.getDistances().doubleValue() * 1000)
+					.append("\t0")
+					.append("\t").append(route.getStationName())
+					.append("\t").append(route.getStationNameEn())
+					.append("\r\n");
 			idx++;
 		}
-		return builder.toString();
+		return idx;
 	}
 	/**