场景标签功能优化

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/SceneAccidentService.java

@@ -183,7 +183,7 @@ public class SceneAccidentService {
             }else{
                 List<String> targetDriving=new ArrayList<>();
                 targetDriving.add(params.getCutIn());
-                params.setConflictBehavior(targetDriving);
+                params.setTargetDriving(targetDriving);
             }
         }
         if(ObjectUtil.isNotNull(params.getDriveCurve())){
@@ -194,7 +194,7 @@ public class SceneAccidentService {
             }else{
                 List<String> targetDriving=new ArrayList<>();
                 targetDriving.add(params.getDriveCurve());
-                params.setConflictBehavior(targetDriving);
+                params.setTargetDriving(targetDriving);
             }
         }
         if(ObjectUtil.isNotNull(params.getCarConflict())){

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/SceneNaturalService.java

@@ -364,7 +364,7 @@ public class SceneNaturalService {
                     vo.setLabel(vo.getLabel() + ",隧道");
                 }
             }
-            if (vo.getTargetBehavior().equals("机动车从左侧切入成功") ||vo.getTargetBehavior().equals("机动车从右侧切入成功")) {
+            if (vo.getTargetBehavior().indexOf("机动车从左侧切入成功")>-1 ||vo.getTargetBehavior().indexOf("机动车从右侧切入成功")>-1) {
                 if (ObjectUtil.isNull(vo.getLabel())) {
                     vo.setLabel("切入");
                 } else {
@@ -378,14 +378,14 @@ public class SceneNaturalService {
                     vo.setLabel(vo.getLabel() + ",切出");
                 }
             }
-            if (vo.getSelfBehavior().equals("直路掉头") ||vo.getSelfBehavior().equals("路口掉头")) {
+            if (vo.getSelfBehavior().indexOf("直路掉头")>-1 ||vo.getSelfBehavior().indexOf("路口掉头")>-1) {
                 if (ObjectUtil.isNull(vo.getLabel())) {
                     vo.setLabel("掉头");
                 } else {
                     vo.setLabel(vo.getLabel() + ",掉头");
                 }
             }
-            if (vo.getSelfBehavior().equals("向左变道成功") ||vo.getSelfBehavior().equals("向右变道成功")||vo.getSelfBehavior().equals("向左连续变道")||vo.getSelfBehavior().equals("向右连续变道")||vo.getSelfBehavior().equals("向左变道超车")||vo.getSelfBehavior().equals("向右变道超车")) {
+            if (vo.getSelfBehavior().indexOf("向左变道成功") >-1||vo.getSelfBehavior().equals("向右变道成功")||vo.getSelfBehavior().indexOf("向左连续变道")>-1||vo.getSelfBehavior().indexOf("向右连续变道")>-1||vo.getSelfBehavior().indexOf("向左变道超车")>-1||vo.getSelfBehavior().indexOf("向右变道超车")>-1) {
                 if (ObjectUtil.isNull(vo.getLabel())) {
                     vo.setLabel("变道");
                 } else {