commit

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/SceneReferenceLibService.java

@@ -258,37 +258,42 @@ public class SceneReferenceLibService {
                                     String otherBehavior = root.path("target_action").asText();
                                     String replaceStr = "none";
                                     String maxTime = root.path("max_time").asText();
-                                    Iterator<JsonNode> weather = root.path("scenario_weather").elements();
-                                    List<String> weatherList = new ArrayList<>();
-                                    if (weather.hasNext()) {
-                                        JsonNode node = weather.next();
-                                        weatherList.add(node.asText());
-                                    }
+//                                    Iterator<JsonNode> weather = root.path("scenario_weather").elements();
+//                                    List<String> weatherList = new ArrayList<>();
+//                                    if (weather.hasNext()) {
+//                                        JsonNode node = weather.next();
+//                                        weatherList.add(node.asText());
+//                                    }
                                     String rodeType = root.path("rode_type").asText();
-                                    Iterator<JsonNode> roadPlaneGeometry = root.path("road_plane_geometry").elements();
-                                    List<String> roadPlaneGeometryList = new ArrayList<>();
-                                    if (roadPlaneGeometry.hasNext()) {
-                                        JsonNode node = roadPlaneGeometry.next();
-                                        roadPlaneGeometryList.add(node.asText());
-                                    }
+                                    String weather = root.path("scenario_weather").asText();
+                                    String roadPlaneGeometry = root.path("road_plane_geometry").asText();
 
-                                    Iterator<JsonNode> roadProfileGeometry = root.path("road_profile_geometry").elements();
-                                    List<String> roadProfileGeometryList = new ArrayList<>();
-                                    if (roadProfileGeometry.hasNext()) {
-                                        JsonNode node = roadProfileGeometry.next();
-                                        roadProfileGeometryList.add(node.asText());
-                                    }
-                                    String autonomousDrivingFunction = root.path("autonomous_driving_function").asText();
-                                    String drivingArea = root.path("driving_area").asText();
+//                                    Iterator<JsonNode> roadPlaneGeometry = root.path("road_plane_geometry").elements();
+//                                    List<String> roadPlaneGeometryList = new ArrayList<>();
+//                                    if (roadPlaneGeometry.hasNext()) {
+//                                        JsonNode node = roadPlaneGeometry.next();
+//                                        roadPlaneGeometryList.add(node.asText());
+//                                    }
+
+//                                    Iterator<JsonNode> roadProfileGeometry = root.path("road_profile_geometry").elements();
+//                                    List<String> roadProfileGeometryList = new ArrayList<>();
+//                                    if (roadProfileGeometry.hasNext()) {
+//                                        JsonNode node = roadProfileGeometry.next();
+//                                        roadProfileGeometryList.add(node.asText());
+//                                    }
+                                    String roadProfileGeometry = root.path("road_profile_geometry").asText();
+                                    String autonomousDrivingFunction = root.path("supported_adas").asText();
+                                    String drivingArea = root.path("rode_section").asText();
                                     String sceneDescription = root.path("scene_description").asText();
-                                    String scenaroTag = root.path("scenaro_tag").asText();
+                                    String scenaroTag = root.path("label").asText();
                                     sceneReferenceLibPO.setMainBehavior(StringUtils.equals(mainBehavior, replaceStr) ? "" : mainBehavior);
                                     sceneReferenceLibPO.setOtherBehavior(StringUtils.equals(otherBehavior, replaceStr) ? "" : otherBehavior);
                                     sceneReferenceLibPO.setMaxTime(StringUtils.equals(maxTime, replaceStr) ? "" : maxTime);
-                                    sceneReferenceLibPO.setWeather(String.join(",", weatherList));
+//                                    sceneReferenceLibPO.setWeather(String.join(",", weatherList));
+                                    sceneReferenceLibPO.setWeather(StringUtils.equals(weather, replaceStr) ? "" : weather);
                                     sceneReferenceLibPO.setRoadType(StringUtils.equals(rodeType, replaceStr) ? "" : rodeType);
-                                    sceneReferenceLibPO.setRoadGeometryPlane(String.join(",", roadPlaneGeometryList));
-                                    sceneReferenceLibPO.setRoadGeometryVertical(String.join(",", roadProfileGeometryList));
+                                    sceneReferenceLibPO.setRoadGeometryPlane(StringUtils.equals(roadPlaneGeometry, replaceStr) ? "" : roadPlaneGeometry);
+                                    sceneReferenceLibPO.setRoadGeometryVertical(StringUtils.equals(roadProfileGeometry, replaceStr) ? "" : roadProfileGeometry);
                                     sceneReferenceLibPO.setAutoDriveFunction(StringUtils.equals(autonomousDrivingFunction, replaceStr) ? "" : autonomousDrivingFunction);
                                     sceneReferenceLibPO.setOperationArea(StringUtils.equals(drivingArea, replaceStr) ? "" : drivingArea);
                                     sceneReferenceLibPO.setSceneDescription(StringUtils.equals(sceneDescription, replaceStr) ? "" : sceneDescription);