Merge branch 'refs/heads/develop'

auto-solution-behaviour/src/main/java/com/solution/system/domain/AfsimScenario.java

@@ -1,64 +0,0 @@
-package com.solution.system.domain;
-
-/**
- * 场景配置表
- * 对应表 afsim_scenario
- */
-public class AfsimScenario {
-    private Integer id;
-    private String name;
-    private String description;
-    private String scenarioPath;
-    private String communicationGraph; // 用于存储场景中的通讯关系
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getScenarioPath() {
-        return scenarioPath;
-    }
-
-    public void setScenarioPath(String scenarioPath) {
-        this.scenarioPath = scenarioPath;
-    }
-
-    public String getCommunicationGraph() {
-        return communicationGraph;
-    }
-
-    public void setCommunicationGraph(String communicationGraph) {
-        this.communicationGraph = communicationGraph;
-    }
-
-    @Override
-    public String toString() {
-        return "AfsimScenario{" +
-                "id=" + id +
-                ", name='" + name + '\'' +
-                ", description='" + description + '\'' +
-                ", scenarioPath='" + scenarioPath + '\'' +
-                ", communicationGraph='" + communicationGraph + '\'' +
-                '}';
-    }
-}

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>