diff --git a/auto-solution-admin/src/main/java/com/solution/web/controller/behaviour/BehaviortreeController.java b/auto-solution-admin/src/main/java/com/solution/web/controller/behaviour/BehaviortreeController.java index e7e17d0..6b0c84b 100644 --- a/auto-solution-admin/src/main/java/com/solution/web/controller/behaviour/BehaviortreeController.java +++ b/auto-solution-admin/src/main/java/com/solution/web/controller/behaviour/BehaviortreeController.java @@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletResponse; import com.solution.web.core.BehaviortreeProcessor; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.checkerframework.checker.units.qual.A; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -147,5 +148,14 @@ public class BehaviortreeController extends BaseController return success(behaviortreeService.getUnderling(treeId)); } + /** + * 根据场景id获取总指挥的行为树的原数据 + * @return + */ + @ApiOperation("根据场景id获取总指挥的行为树的原数据") + @GetMapping("/commander/{scenarioId}") + public AjaxResult getCommander(@PathVariable Integer scenarioId){ + return success(behaviortreeService.getCommander(scenarioId)); + } } diff --git a/auto-solution-behaviour/src/main/java/com/solution/system/domain/PlatformChiefCommander.java b/auto-solution-behaviour/src/main/java/com/solution/system/domain/PlatformChiefCommander.java new file mode 100644 index 0000000..2333542 --- /dev/null +++ b/auto-solution-behaviour/src/main/java/com/solution/system/domain/PlatformChiefCommander.java @@ -0,0 +1,46 @@ +package com.solution.system.domain; + +import lombok.Data; +import java.time.LocalDateTime; + +/** + * 收集数据用来生成总指挥官 + */ +@Data +public class PlatformChiefCommander { + + /** + * Primary Key 主键ID（自增） + */ + private Integer id; + + /** + * Create Time 创建时间 + */ + private LocalDateTime createTime; + + /** + * 名称 + */ + private String name; + + /** + * 时间 + */ + private Integer time; + + /** + * 指令 + */ + private String command; + + /** + * 下属指挥官 + */ + private String subordinateCommander; + + /** + * 场景ID + */ + private Integer scenarioId; +} \ No newline at end of file diff --git a/auto-solution-behaviour/src/main/java/com/solution/system/mapper/BehaviortreeMapper.java b/auto-solution-behaviour/src/main/java/com/solution/system/mapper/BehaviortreeMapper.java index 6d69771..66de1a2 100644 --- a/auto-solution-behaviour/src/main/java/com/solution/system/mapper/BehaviortreeMapper.java +++ b/auto-solution-behaviour/src/main/java/com/solution/system/mapper/BehaviortreeMapper.java @@ -3,6 +3,7 @@ package com.solution.system.mapper; import java.util.List; import com.solution.system.domain.Behaviortree; +import com.solution.system.domain.PlatformChiefCommander; /** * 行为树主Mapper接口 @@ -62,4 +63,11 @@ public interface BehaviortreeMapper * @return 结果 */ public int deleteBehaviortreeByIds(Long[] ids); + + /** + * 根据场景id获取总指挥的行为树的原数据 + * @param scenarioId + * @return + */ + List getCommander(Integer scenarioId); } diff --git a/auto-solution-behaviour/src/main/java/com/solution/system/service/IBehaviortreeService.java b/auto-solution-behaviour/src/main/java/com/solution/system/service/IBehaviortreeService.java index 6c99d6d..ecfd78a 100644 --- a/auto-solution-behaviour/src/main/java/com/solution/system/service/IBehaviortreeService.java +++ b/auto-solution-behaviour/src/main/java/com/solution/system/service/IBehaviortreeService.java @@ -3,6 +3,7 @@ package com.solution.system.service; import java.util.List; import com.solution.system.domain.Behaviortree; +import com.solution.system.domain.PlatformChiefCommander; /** * 行为树主Service接口 @@ -69,4 +70,11 @@ public interface IBehaviortreeService * @return */ List getUnderling(Integer treeId); + + /** + * 根据场景id获取总指挥的行为树的原数据 + * @param scenarioId + * @return + */ + List getCommander(Integer scenarioId); } diff --git a/auto-solution-behaviour/src/main/java/com/solution/system/service/impl/BehaviortreeServiceImpl.java b/auto-solution-behaviour/src/main/java/com/solution/system/service/impl/BehaviortreeServiceImpl.java index 86d126b..bb25079 100644 --- a/auto-solution-behaviour/src/main/java/com/solution/system/service/impl/BehaviortreeServiceImpl.java +++ b/auto-solution-behaviour/src/main/java/com/solution/system/service/impl/BehaviortreeServiceImpl.java @@ -5,6 +5,7 @@ import java.util.List; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.solution.common.constant.ExceptionConstants; +import com.solution.system.domain.PlatformChiefCommander; import com.solution.system.domain.PlatformTree; import com.solution.system.mapper.PlatformCommunicationMapper; import com.solution.system.mapper.PlatformMapper; @@ -135,4 +136,14 @@ public class BehaviortreeServiceImpl implements IBehaviortreeService } return underlingChineseName; } + + /** + * 根据场景id获取总指挥的行为树的原数据 + * @param scenarioId + * @return + */ + @Override + public List getCommander(Integer scenarioId) { + return behaviortreeMapper.getCommander(scenarioId); + } } diff --git a/auto-solution-behaviour/src/main/resources/mapper/system/BehaviortreeMapper.xml b/auto-solution-behaviour/src/main/resources/mapper/system/BehaviortreeMapper.xml index f43522a..be73fe6 100644 --- a/auto-solution-behaviour/src/main/resources/mapper/system/BehaviortreeMapper.xml +++ b/auto-solution-behaviour/src/main/resources/mapper/system/BehaviortreeMapper.xml @@ -42,6 +42,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, name, description, created_at, updated_at, english_name,graph, xml_content ,platform_id, scenario_id from behaviortree where id = #{id} + insert into behaviortree