1.百度地图key替换

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

1.百度地图key替换
2.区间子线路+线路文件、报站文件生成的完善，以及线调的处理变化 3.js打包兼容es6
王通
1 parent f6d110c7
Showing 1 changed file with 20 additions and 10 deletions
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
@@ -517,7 +517,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 					FTPClientUtils.deleteFileByPrefix(String.format("%s-", line.getLineCode()), url, port, username, password, String.format("%s/voice/", remotePath));
 					for (LineRegion lineRegion : lineRegions) {
 						voicePath = String.format("%s%s-%d.zip", linePath, lineId, lineRegion.getSeq());
-						textStr = String.format("%s\r\n%s", head, subLine2Ftp(lineRegion));
+						textStr = String.format("%s\r\n%s", head.replace(lineName, String.format("%s(%s)", lineName, "区间")), subLine2Ftp(lineRegion));
 						input = new ByteArrayInputStream(textStr.getBytes("gbk"));
 						clientUtils.uploadFile(url, port, username, password, remotePath + "/voice/", String.format("%s-%d.txt", line.getLineCode(), lineRegion.getSeq()), input);
 						clientUtils.deleteFtpFile(url, port, username, password, remotePath + "/voice/", String.format("%s-%d.zip", line.getLineCode(), lineRegion.getSeq()));
@@ -1159,7 +1159,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 			}
 			merge(lineId, "0", seq, seqs, languages);
 		}
-		zipAudio(String.format("%s%s/", linePath, "0"), voicePath);
+		//zipAudio(String.format("%s%s/", linePath, "0"), voicePath);
+		zipAudio(linePath, lineId, "0");
 		// 线路区间
 		Map<LineRegion, List<SeqStationLevel>> region2map = new HashMap<>();
@@ -1203,7 +1204,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				merge(lineId, subLineId, seq, map1, languages);
 			}
-			zipAudio(String.format("%s%s/", linePath, subLineId), String.format("%s%s-%s.zip", linePath, lineId, subLineId));
+			//zipAudio(String.format("%s%s/", linePath, subLineId), String.format("%s%s-%s.zip", linePath, lineId, subLineId));
+			zipAudio(linePath, lineId, subLineId);
 		}
 	}
@@ -1222,31 +1224,39 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 	/**
 	 * 压缩音频到zip
-	 * @param subLinePath 子线路文件夹
-	 * @param voicePath 语音报站文件压缩包路径
+	 * @param linePath 线路文件夹
+	 * @param lineId
+	 * @param subLineId
 	 */
-	private void zipAudio(String subLinePath, String voicePath) throws Exception {
+	private void zipAudio(String linePath, String lineId, String subLineId) throws Exception {
+		String s = "0".equals(subLineId) ? "" : String.format("-%s", subLineId);
+		String subLinePath = String.format("%s%s/", linePath, subLineId), voicePath = String.format("%s%s%s.zip", linePath, lineId, s);
+		String pack = String.format("%s%s\\", lineId, s);
 		File file = new File(subLinePath);
 		ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(voicePath));
+		ZipEntry zipEntry = new ZipEntry(pack);
+		zos.putNextEntry(zipEntry);
+		zos.closeEntry();
+
 		for (File f : file.listFiles()) {
 			if (f.isFile() && f.getName().endsWith(".mp3")) {
-				addFileToZip(zos, f);
+				addFileToZip(zos, f, pack);
 			}
 		}
 		// Key打头音频
 		file = new File(commonPath);
 		for (File f : file.listFiles()) {
 			if (f.isFile() && f.getName().startsWith("Key-")) {
-				addFileToZip(zos, f);
+				addFileToZip(zos, f, pack);
 			}
 		}
 		zos.flush();
 		zos.close();
 	}
-	private static void addFileToZip(ZipOutputStream zos, File file) throws IOException {
+	private static void addFileToZip(ZipOutputStream zos, File file, String pack) throws IOException {
 		FileInputStream fis = new FileInputStream(file);
-		ZipEntry zipEntry = new ZipEntry(file.getName());
+		ZipEntry zipEntry = new ZipEntry(String.format("%s%s", pack, file.getName()));
 		zos.putNextEntry(zipEntry);
 		byte[] bytes = new byte[4096];