1.

王通
1 parent 37e95b0a
Showing 5 changed files with 100 additions and 21 deletions
pom.xml
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/filter/BaseFilter.java
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
src/main/java/com/bsth/util/IFlyUtils.java
@@ -191,6 +191,11 @@
                     <groupId>org.apache.xmlgraphics</groupId>
                     <artifactId>batik-js</artifactId>
                 </exclusion>
+                <!-- 排除旧版本javassist，使用兼容Java 8+的版本 -->
+                <exclusion>
+                    <groupId>javassist</groupId>
+                    <artifactId>javassist</artifactId>
+                </exclusion>
             </exclusions>
 		</dependency>
 		<dependency>
@@ -393,6 +398,13 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
+        
+        <!-- 更新javassist版本，兼容Java 8+ -->
+        <dependency>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <version>3.27.0-GA</version>
+        </dependency>
         <!-- https://mvnrepository.com/artifact/pentaho/simple-jndi -->
         <dependency>
@@ -437,6 +449,28 @@
 			<version>4.3.2-1.5.5</version>
 			<classifier>${javacpp.platform}</classifier>
 		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.junit.jupiter</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>junit</groupId>
+					<artifactId>junit</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
     </dependencies>
 	<dependencyManagement>
@@ -38,6 +38,8 @@ public class Constants {
 	public static final String XD_REAL_GPS = "/gps/real/line";
 	//public static final String XD_TEMPS = "/pages/control/line/temps/**";
+	public static final String PASSENGER_PAGES = "/pages/passenger/**";
+
 	//车载网关上行接口
 	public static final String UPSTREAM_URL = "/control/upstream";
 	//rfid 上传入口
@@ -20,7 +20,7 @@ public abstract class BaseFilter implements Filter {
 			Constants.ASSETS_URL, Constants.LOGIN_ASSETS_URL, Constants.FAVICON_URL, Constants.LOGIN, Constants.LOGIN_FAILURE,
 			Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS, Constants.UP_RFID_URL,
 			Constants.STATION_AND_SECTION_COUNT, Constants.ACTUATOR_MANAGEMENT_HEALTH, Constants.VEHICLE_DATA_SYNC_URL, Constants.METRONIC_URL,
-			Constants.FILE_AUTH, "/e10adc3949ba59abbe56e057f20f883e.html", "/8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92.html"};
+			Constants.FILE_AUTH, Constants.PASSENGER_PAGES, "/e10adc3949ba59abbe56e057f20f883e.html", "/8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92.html"};
 	@Override
 	public void destroy() {
@@ -1037,33 +1037,59 @@ 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();
 		int idx = 1;
+		if (lineRegion.getDirection() == 1) {
+			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);
-			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");
+			spliceRoute(builder, route, idx, i == len - 1);
 			idx++;
 		}
+		if (lineRegion.getDirection() == 0) {
+			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();
 	}
 	/**
+	 * 按站点路由进行组装
+	 * @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");
+		}
+		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");
+	}
+
+	/**
 	 * tts合成及打包
 	 * @param objects
 	 * @param line
@@ -1137,7 +1163,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		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);
@@ -1147,10 +1173,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;
@@ -1159,11 +1185,25 @@ 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);
+			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));
 		}
 	}
@@ -55,9 +55,12 @@ public class IFlyUtils {
         request.getBusiness().put("sfl", 1);
         request.getBusiness().put("vcn", vcn);
         String charset = "GBK";
-        if (language.equals("en")) {
+        if ("en".equals(language)) {
             charset = "UTF-8";
         }
+        if ("en".equals(language) || "sh".equals(language)) {
+            request.getBusiness().put("volume", 100);
+        }
         request.getData().put("text", Base64.getEncoder().encodeToString(text.replace(",", "[p1000]").getBytes(charset)));
         request.getData().put("status", 2);
         websocketWork(wsUrl, request, new FileOutputStream(file));