Merge branch 'refs/heads/develop'

auto-solution-admin/pom.xml

@@ -76,6 +76,11 @@
             <artifactId>solution-rule</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.solution</groupId>
+            <artifactId>solution-scene</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

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

@@ -3,7 +3,6 @@ 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;
@@ -116,15 +115,4 @@ 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-behaviour/src/main/java/com/solution/system/mapper/BehaviortreeMapper.java

@@ -2,7 +2,6 @@ package com.solution.system.mapper;
 
 import java.util.List;
 
-import com.solution.system.domain.AfsimScenario;
 import com.solution.system.domain.Behaviortree;
 
 /**
@@ -60,11 +59,4 @@ public interface BehaviortreeMapper
      * @return 结果
      */
     public int deleteBehaviortreeByIds(Long[] ids);
-
-    /**
-     * 保存场景配置
-     * @param afsimScenario
-     * @return
-     */
-    int insert(AfsimScenario afsimScenario);
 }

auto-solution-behaviour/src/main/java/com/solution/system/service/IBehaviortreeService.java

@@ -2,9 +2,7 @@ package com.solution.system.service;
 
 import java.util.List;
 
-import com.solution.system.domain.AfsimScenario;
 import com.solution.system.domain.Behaviortree;
-import sun.management.spi.PlatformMBeanProvider;
 
 /**
  * 行为树主Service接口
@@ -61,11 +59,4 @@ public interface IBehaviortreeService
      * @return 结果
      */
     public int deleteBehaviortreeById(Long id);
-
-    /**
-     * 保存场景配置
-     * @param afsimScenario
-     * @return
-     */
-    int insert(AfsimScenario afsimScenario);
 }

auto-solution-behaviour/src/main/java/com/solution/system/service/impl/BehaviortreeServiceImpl.java

@@ -4,7 +4,6 @@ import java.util.List;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.solution.common.constant.ExceptionConstants;
-import com.solution.system.domain.AfsimScenario;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.solution.system.mapper.BehaviortreeMapper;
@@ -94,17 +93,4 @@ public class BehaviortreeServiceImpl implements IBehaviortreeService
     {
         return behaviortreeMapper.deleteBehaviortreeById(id);
     }
-
-    /**
-     * 保存场景配置
-     * @param afsimScenario
-     * @return
-     */
-    @Override
-    public int insert(AfsimScenario afsimScenario) {
-        if(ObjectUtil.isEmpty(afsimScenario) || ObjectUtil.isEmpty(afsimScenario.getCommunicationGraph())){
-            throw new RuntimeException(ExceptionConstants.SCENE_CONFIG_NOT_NULL);
-        }
-        return behaviortreeMapper.insert(afsimScenario);
-    }
 }

auto-solution-behaviour/src/main/resources/mapper/system/BehaviortreeMapper.xml

@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <insert id="insert" parameterType="com.solution.system.domain.AfsimScenario">
+    <insert id="insert" parameterType="com.solution.scene.domain.AfsimScenario">
         INSERT INTO afsim_scenario (name, description, scenario_path, communication_graph)
         VALUES (#{name}, #{description}, #{scenarioPath}, #{communicationGraph})
     </insert>

auto-solution-scene/pom.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>solution</artifactId>
+        <groupId>com.solution</groupId>
+        <version>3.9.1</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>solution-scene</artifactId>
+
+    <description>
+        scene模块
+    </description>
+
+    <dependencies>
+
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>com.solution</groupId>
+            <artifactId>solution-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-boot-starter</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

auto-solution-scene/src/main/java/com/solution/scene/controller/SceneController.java

@@ -0,0 +1,51 @@
+package com.solution.scene.controller;
+
+import com.solution.common.annotation.Log;
+import com.solution.common.core.controller.BaseController;
+import com.solution.common.core.domain.AjaxResult;
+import com.solution.common.core.page.TableDataInfo;
+import com.solution.common.enums.BusinessType;
+import com.solution.scene.domain.AfsimScenario;
+import com.solution.scene.service.SceneService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+/**
+ * 场景管理
+ */
+@Api("场景管理")
+@RestController
+@RequestMapping("/api/system/scene")
+public class SceneController extends BaseController {
+
+    @Autowired
+    private SceneService sceneService;
+
+    /**
+     * 保存场景配置
+     */
+    @ApiOperation("保存场景配置")
+    @PostMapping("/saveSceneConfig")
+    @Log(title = "行为树主", businessType = BusinessType.INSERT)
+    public AjaxResult saveSceneConfig(@RequestBody AfsimScenario afsimScenario)
+    {
+        return toAjax(sceneService.insert(afsimScenario));
+    }
+
+    /**
+     * 获取场景列表
+     * @return
+     */
+    @GetMapping("/list")
+    @ApiOperation("获取场景列表")
+    public TableDataInfo list(){
+        startPage();
+        List<AfsimScenario> list = sceneService.selectSceneList();
+        return getDataTable(list);
+    }
+}

auto-solution-scene/src/main/java/com/solution/scene/domain/AfsimScenario.java

@@ -1,4 +1,4 @@
-package com.solution.system.domain;
+package com.solution.scene.domain;
 
 /**
  * 场景配置表

auto-solution-scene/src/main/java/com/solution/scene/mapper/SceneMapper.java

@@ -0,0 +1,24 @@
+package com.solution.scene.mapper;
+
+import com.solution.scene.domain.AfsimScenario;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface SceneMapper {
+
+    /**
+     * 保存场景配置
+     * @param afsimScenario
+     * @return
+     */
+    int insert(AfsimScenario afsimScenario);
+
+
+    /**
+     * 获取场景列表
+     * @return
+     */
+    List<AfsimScenario> selectSceneList();
+}

auto-solution-scene/src/main/java/com/solution/scene/service/SceneService.java

@@ -0,0 +1,21 @@
+package com.solution.scene.service;
+
+import com.solution.scene.domain.AfsimScenario;
+
+import java.util.List;
+
+public interface SceneService {
+
+    /**
+     * 保存场景配置
+     * @param afsimScenario
+     * @return
+     */
+    int insert(AfsimScenario afsimScenario);
+
+    /**
+     * 获取场景列表
+     * @return
+     */
+    List<AfsimScenario> selectSceneList();
+}

auto-solution-scene/src/main/java/com/solution/scene/service/impl/SceneServiceImpl.java

@@ -0,0 +1,31 @@
+package com.solution.scene.service.impl;
+
+import com.solution.scene.domain.AfsimScenario;
+import com.solution.scene.mapper.SceneMapper;
+import com.solution.scene.service.SceneService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class SceneServiceImpl implements SceneService {
+
+
+    @Autowired
+    private SceneMapper sceneMapper;
+
+    @Override
+    public int insert(AfsimScenario afsimScenario) {
+        return sceneMapper.insert(afsimScenario);
+    }
+
+    /**
+     * 获取场景列表
+     * @return
+     */
+    @Override
+    public List<AfsimScenario> selectSceneList() {
+        return sceneMapper.selectSceneList();
+    }
+}

auto-solution-scene/src/main/resources/mapper/scene/SceneMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.solution.scene.mapper.SceneMapper">
+
+    <insert id="insert" parameterType="com.solution.scene.domain.AfsimScenario">
+        INSERT INTO afsim_scenario (name, description, scenario_path, communication_graph)
+        VALUES (#{name}, #{description}, #{scenarioPath}, #{communicationGraph})
+    </insert>
+
+    <select id="selectSceneList" resultType="com.solution.scene.domain.AfsimScenario">
+        SELECT id, name, description, scenario_path, communication_graph FROM afsim_scenario
+    </select>
+
+</mapper>

pom.xml

@@ -238,6 +238,12 @@
                 <version>${solution.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.solution</groupId>
+                <artifactId>solution-scene</artifactId>
+                <version>${solution.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -252,6 +258,7 @@
         <module>auto-solution-generator</module>
         <module>auto-solution-common</module>
         <module>auto-solution-rule</module>
+        <module>auto-solution-scene</module>
     </modules>
     <packaging>pom</packaging>