Merge remote-tracking branch 'origin/lggj' into lggj

ljq
2 parents f3e9b931 6e0df3f6
Showing 1 changed file with 3 additions and 5 deletions
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
@@ -1128,8 +1128,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		// 文本转语音并进行分割
 		// 音频存放及压缩文件路径
-		String linePath = String.format(linePathPattern, lineId), voicePath = String.format("%s%s.zip", linePath, lineId);
-		// 先清理历史生成的文件
+		String linePath = String.format(linePathPattern, lineId);
+        // 先清理历史生成的文件
 		cleanHistoryAudio(new File(linePath));
 		for (String language : languages) {
 			try {
@@ -1159,7 +1159,6 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 			}
 			merge(lineId, "0", seq, seqs, languages);
 		}
-		//zipAudio(String.format("%s%s/", linePath, "0"), voicePath);
 		zipAudio(linePath, lineId, "0");
 		// 线路区间
@@ -1204,7 +1203,6 @@ 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(linePath, lineId, subLineId);
 		}
 	}
@@ -1231,7 +1229,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 	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);
+		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);