1.百度地图key替换

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

1.百度地图key替换
2.区间子线路+线路文件、报站文件生成的完善，以及线调的处理变化 3.js打包兼容es6
王通
1 parent bd229979
Showing 1 changed file with 78 additions and 60 deletions
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
@@ -12,7 +12,6 @@ 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;
@@ -1037,47 +1036,56 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		}
 	}
+	/**
+	 * 组装子线路文件内容
+	 * @param lineRegion
+	 * @return
+	 */
 	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);
+			LsStationRoute first = lineRegion.getStationRoutes().get(0), last = lineRegion.getStationRoutes().get(len - 1);
+			spliceRoute(builder, first, idx, false); idx++;
+			spliceRoute(builder, last, idx, true); idx++;
+		}
+		for (int i = 0;i < len;i++) {
+			LsStationRoute route = lineRegion.getStationRoutes().get(i);
+			spliceRoute(builder, route, idx, i == len - 1);
+
+			idx++;
 		}
-		idx = mergeSubLine(lineRegion.getStationRoutes(), builder, idx);
 		if (lineRegion.getDirection() == 0) {
-			mergeSubLine(stationRoutes, builder, idx);
+			LsStationRoute first = lineRegion.getStationRoutes().get(0), last = lineRegion.getStationRoutes().get(len - 1);
+			spliceRoute(builder, first, idx, false); idx++;
+			spliceRoute(builder, last, idx, true);
 		}
 		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 = 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");
-			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");
-
-			idx++;
+	/**
+	 * 按站点路由进行组装
+	 * @param builder
+	 * @param route
+	 * @param idx
+	 * @param isEnd
+	 */
+	private void spliceRoute(StringBuilder builder, LsStationRoute route, int idx, boolean isEnd){
+		builder.append(route.getCenterPointWgs().getPosition().getCoordinate(0))
+				.append("\t").append(route.getCenterPointWgs().getPosition().getCoordinate(1))
+				.append("\t").append(isEnd ? 2 : 1)
+				.append("\t").append(idx).append("\t");
+		for (int j = 0;j < 8 - route.getStationCode().length();j++) {
+			builder.append("0");
 		}
-
-		return idx;
+		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");
 	}
 	/**
@@ -1115,8 +1123,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				downs++;
 			}
 		}
-		cnBuilder.delete(cnBuilder.length() - 7, cnBuilder.length());
-		enBuilder.delete(enBuilder.length() - 7, enBuilder.length());
+		cnBuilder.delete(cnBuilder.length() - 8, cnBuilder.length() - 1);
+		enBuilder.delete(enBuilder.length() - 8, enBuilder.length() - 1);
 		// 文本转语音并进行分割
 		// 音频存放及压缩文件路径
@@ -1146,15 +1154,15 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		seq = merge(lineId, "0", seq, seqs, languages);
 		if (line.getLinePlayType() != 1) {
 			seqs.clear();
-			for (int i = seq;i < ups + downs;i++) {
-				seqs.add(new SeqStationLevel(i, i + 1, 1));
+			for (int i = seq;i <= ups + downs;i++) {
+				seqs.add(new SeqStationLevel(i, i, 1));
 			}
 			merge(lineId, "0", seq, seqs, languages);
 		}
-		zipAudio(String.format("%s%s/", linePath, "0"), voicePath, lineId);
+		zipAudio(String.format("%s%s/", linePath, "0"), voicePath);
 		// 线路区间
-		Map<String, List<SeqStationLevel>> region2map = new HashMap<>();
+		Map<LineRegion, List<SeqStationLevel>> region2map = new HashMap<>();
 		for (LineRegion lineRegion : lineRegions) {
 			for (int i = 0;i < objects.size();i++) {
 				Object[] objArr = objects.get(i);
@@ -1164,10 +1172,10 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 					for (int j = 0;j < lineRegion.getStationRoutes().size();j++) {
 						LsStationRoute stationRoute = lineRegion.getStationRoutes().get(j);
 						if (stationCode.equals(stationRoute.getStationCode())) {
-							List<SeqStationLevel> map = region2map.get(lineRegion.getSeq().toString());
+							List<SeqStationLevel> map = region2map.get(lineRegion);
 							if (map == null) {
 								map = new ArrayList<>();
-								region2map.put(lineRegion.getSeq().toString(), map);
+								region2map.put(lineRegion, map);
 							}
 							map.add(new SeqStationLevel(j + 1, i + 1, direction));
 							break;
@@ -1176,12 +1184,26 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				}
 			}
 		}
-		for (Map.Entry<String, List<SeqStationLevel>> entry : region2map.entrySet()) {
-			String subLineId = entry.getKey();
+		for (Map.Entry<LineRegion, List<SeqStationLevel>> entry : region2map.entrySet()) {
+			LineRegion lineRegion = entry.getKey();
+			String subLineId = lineRegion.getSeq().toString();
 			List<SeqStationLevel> map = entry.getValue();
 			seq = 1;
-			merge(lineId, subLineId, seq, map, languages);
-			zipAudio(String.format("%s%s/", linePath, subLineId), String.format("%s%s-%s.zip", linePath, lineId, subLineId), String.format("%s-%s", lineId, subLineId));
+			if (lineRegion.getDirection() == 1) {
+				List<SeqStationLevel> map1 = new ArrayList<>();
+				map1.add(new SeqStationLevel(1, 1, 0));
+				map1.add(new SeqStationLevel(2, 2, 0));
+				seq = merge(lineId, subLineId, seq, map1, languages);
+			}
+			seq = merge(lineId, subLineId, seq, map, languages);
+			if (lineRegion.getDirection() == 0) {
+				List<SeqStationLevel> map1 = new ArrayList<>();
+				map1.add(new SeqStationLevel(map.size() + 1, 1, 1));
+				map1.add(new SeqStationLevel(map.size() + 2, 2, 1));
+				merge(lineId, subLineId, seq, map1, languages);
+			}
+
+			zipAudio(String.format("%s%s/", linePath, subLineId), String.format("%s%s-%s.zip", linePath, lineId, subLineId));
 		}
 	}
@@ -1203,28 +1225,28 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 	 * @param subLinePath 子线路文件夹
 	 * @param voicePath 语音报站文件压缩包路径
 	 */
-	private void zipAudio(String subLinePath, String voicePath, String zipFolder) throws Exception {
+	private void zipAudio(String subLinePath, String voicePath) throws Exception {
 		File file = new File(subLinePath);
 		ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(voicePath));
 		for (File f : file.listFiles()) {
 			if (f.isFile() && f.getName().endsWith(".mp3")) {
-				addFileToZip(zos, f, zipFolder);
+				addFileToZip(zos, f);
 			}
 		}
 		// Key打头音频
 		file = new File(commonPath);
 		for (File f : file.listFiles()) {
 			if (f.isFile() && f.getName().startsWith("Key-")) {
-				addFileToZip(zos, f, zipFolder);
+				addFileToZip(zos, f);
 			}
 		}
 		zos.flush();
 		zos.close();
 	}
-	private static void addFileToZip(ZipOutputStream zos, File file, String zipFolder) throws IOException {
+	private static void addFileToZip(ZipOutputStream zos, File file) throws IOException {
 		FileInputStream fis = new FileInputStream(file);
-		ZipEntry zipEntry = new ZipEntry(String.format("%s/%s", zipFolder, file.getName()));
+		ZipEntry zipEntry = new ZipEntry(file.getName());
 		zos.putNextEntry(zipEntry);
 		byte[] bytes = new byte[4096];
@@ -1253,16 +1275,16 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 			if (current.getStationLevel() > startSeq.getStationLevel()) {
 				if (i == 1) {
 					// 生成首站
-					mergeOriginStart(lineId, subLineId, seq, current, terminal, languages);
-					mergeNormalArrive(lineId, subLineId, seq, current, terminal, languages);
+					mergeOriginStart(lineId, subLineId, seq, current, current.getDirection(), terminal, languages);
+					mergeNormalArrive(lineId, subLineId, seq, current, current.getDirection(), terminal, languages);
 				} else if (current.getStationLevel() == terminal.getStationLevel()) {
 					// 生成终点站
-					mergeNormalStart(lineId, subLineId, seq, current, terminal, languages);
-					mergeTerminalArrive(lineId, subLineId, seq, current, terminal, languages);
+					mergeNormalStart(lineId, subLineId, seq, current, current.getDirection(), terminal, languages);
+					mergeTerminalArrive(lineId, subLineId, seq, current, current.getDirection(), terminal, languages);
 				} else {
 					// 生成中途站
-					mergeNormalStart(lineId, subLineId, seq, current, terminal, languages);
-					mergeNormalArrive(lineId, subLineId, seq, current, terminal, languages);
+					mergeNormalStart(lineId, subLineId, seq, current, current.getDirection(), terminal, languages);
+					mergeNormalArrive(lineId, subLineId, seq, current, current.getDirection(), terminal, languages);
 				}
 				seq++;
 			}
@@ -1271,11 +1293,10 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		return seq;
 	}
-	private void mergeOriginStart(String lineId, String subLineId, int seq, SeqStationLevel current, SeqStationLevel terminal, Set<String> languages) throws Exception {
+	private void mergeOriginStart(String lineId, String subLineId, int seq, SeqStationLevel current, int direction, SeqStationLevel terminal, Set<String> languages) throws Exception {
 		// 子线路路径
 		String linePath = String.format(linePathPattern, lineId);
 		String subLinePath = String.format("%s%s/", linePath, subLineId);
-		int direction = current.getDirection();
 		List<String> arr = Arrays.asList(commonPath + "cn_origin_1.mp3", linePath + String.format("cn/%03d.mp3", 0), commonPath + "cn_origin_2.mp3", linePath + String.format("cn/%03d.mp3", terminal.getStationLevel()), commonPath + "sh_origin_1.mp3", linePath + String.format("sh/%03d.mp3", 0), commonPath + "sh_origin_2.mp3", linePath + String.format("cn/%03d.mp3", terminal.getStationLevel()), commonPath + "cn_start_1.mp3", linePath + String.format("cn/%03d.mp3", current.getStationLevel()), commonPath + "cn_start_2.mp3", commonPath + "sh_start_1.mp3", linePath + String.format("sh/%03d.mp3", current.getStationLevel()), commonPath + "sh_start_2.mp3", commonPath + "en_1.mp3", linePath + String.format("en/%03d.mp3", current.getStationLevel()), commonPath + "cn_start_3.mp3", commonPath + "sh_start_3.mp3");
 		List<String> inputPaths = new ArrayList<>();
 		for (String path : arr) {
@@ -1289,10 +1310,9 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		AudioOperationUtils.merge(inputPaths, String.format("%s%03da%s-%03d-%s-Start.mp3", subLinePath, seq, direction == 0 ? "u" : "d", direction == 0 ? current.getSeq() : terminal.getSeq() - current.getSeq() + 1, direction == 0 ? "Up" : "Dn"));
 	}
-	private void mergeNormalStart(String lineId, String subLineId, int seq, SeqStationLevel current, SeqStationLevel terminal, Set<String> languages) throws Exception {
+	private void mergeNormalStart(String lineId, String subLineId, int seq, SeqStationLevel current, int direction, SeqStationLevel terminal, Set<String> languages) throws Exception {
 		String linePath = String.format(linePathPattern, lineId);
 		String subLinePath = String.format("%s%s/", linePath, subLineId);
-		int direction = current.getDirection();
 		List<String> arr = Arrays.asList(commonPath + "cn_start.mp3", linePath + String.format("cn/%03d.mp3", current.getStationLevel()), commonPath + "cn_start_2.mp3", commonPath + "sh_start_1.mp3", linePath + String.format("sh/%03d.mp3", current.getStationLevel()), commonPath + "sh_start_2.mp3", commonPath + "en_1.mp3", linePath + String.format("en/%03d.mp3", current.getStationLevel()), commonPath + "cn_start_3.mp3", commonPath + "sh_start_3.mp3");
 		List<String> inputPaths = new ArrayList<>();
 		for (String path : arr) {
@@ -1306,10 +1326,9 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		AudioOperationUtils.merge(inputPaths, String.format("%s%03da%s-%03d-%s-Start.mp3", subLinePath, seq, direction == 0 ? "u" : "d", direction == 0 ? current.getSeq() : terminal.getSeq() - current.getSeq() + 1, direction == 0 ? "Up" : "Dn"));
 	}
-	private void mergeNormalArrive(String lineId, String subLineId, int seq, SeqStationLevel current, SeqStationLevel terminal, Set<String> languages) throws Exception {
+	private void mergeNormalArrive(String lineId, String subLineId, int seq, SeqStationLevel current, int direction, SeqStationLevel terminal, Set<String> languages) throws Exception {
 		String linePath = String.format(linePathPattern, lineId);
 		String subLinePath = String.format("%s%s/", linePath, subLineId);
-		int direction = current.getDirection();
 		List<String> arr = new ArrayList<>(Arrays.asList(commonPath + "cn_arrive.mp3", linePath + String.format("cn/%03d.mp3", current.getStationLevel()), commonPath + "cn_arrive_1.mp3", linePath + String.format("sh/%03d.mp3", current.getStationLevel()), commonPath + "sh_arrive_1.mp3", commonPath + "en_2.mp3", linePath + String.format("en/%03d.mp3", current.getStationLevel())));
 		List<String> inputPaths = new ArrayList<>();
 		if (languages.contains("sh")) {
@@ -1337,10 +1356,9 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		AudioOperationUtils.merge(inputPaths, String.format("%s%03db%s-%03d-%s-Arrive.mp3", subLinePath, seq, direction == 0 ? "u" : "d", direction == 0 ? current.getSeq() : terminal.getSeq() - current.getSeq() + 1, direction == 0 ? "Up" : "Dn"));
 	}
-	private void mergeTerminalArrive(String lineId, String subLineId, int seq, SeqStationLevel current, SeqStationLevel terminal, Set<String> languages) throws Exception {
+	private void mergeTerminalArrive(String lineId, String subLineId, int seq, SeqStationLevel current, int direction, SeqStationLevel terminal, Set<String> languages) throws Exception {
 		String linePath = String.format(linePathPattern, lineId);
 		String subLinePath = String.format("%s%s/", linePath, subLineId);
-		int direction = current.getDirection();
 		List<String> arr = Arrays.asList(commonPath + "cn_terminal.mp3", linePath + String.format("cn/%03d.mp3", current.getStationLevel()), commonPath + "cn_arrive_1.mp3", commonPath + "sh_terminal.mp3", linePath + String.format("sh/%03d.mp3", current.getStationLevel()), commonPath + "sh_arrive_1.mp3", commonPath + "en_3.mp3", linePath + String.format("en/%03d.mp3", current.getStationLevel()), commonPath + "terminal_music.mp3");
 		List<String> inputPaths = new ArrayList<>();
 		for (String path : arr) {