Merge branch 'refs/heads/develop'

auto-solution-admin/src/main/java/com/solution/web/controller/behaviour/BehaviortreeController.java

@@ -3,6 +3,7 @@ package com.solution.web.controller.behaviour;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.solution.system.domain.AfsimScenario;
 import com.solution.web.core.BehaviortreeProcessor;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -114,4 +115,16 @@ public class BehaviortreeController extends BaseController
     {
         return toAjax(behaviortreeService.deleteBehaviortreeByIds(ids));
     }
+
+
+    /**
+     * 保存场景配置
+     */
+    @ApiOperation("保存场景配置")
+    @PostMapping("/saveSceneConfig")
+    @Log(title = "行为树主", businessType = BusinessType.INSERT)
+    public AjaxResult saveSceneConfig(@RequestBody AfsimScenario afsimScenario)
+    {
+        return toAjax(behaviortreeService.insert(afsimScenario));
+    }
 }

auto-solution-admin/src/main/java/com/solution/web/controller/rule/RuleController.java

@@ -52,5 +52,4 @@ public class RuleController extends BaseController {
     public AjaxResult getCommPlatformComponentNames(Integer scenarioId){
         return success(ruleService.getCommPlatformComponentNames(scenarioId));
     }
-
 }

auto-solution-admin/src/main/java/com/solution/web/core/BehaviortreeProcessor.java

@@ -170,4 +170,5 @@ public class BehaviortreeProcessor {
         return instance;
     }
 
+
 }