Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -9,14 +9,7 @@ import io.swagger.annotations.ApiOperation;
|
|||||||
import org.checkerframework.checker.units.qual.A;
|
import org.checkerframework.checker.units.qual.A;
|
||||||
import org.springframework.security.access.prepost.PreAuthorize;
|
import org.springframework.security.access.prepost.PreAuthorize;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PutMapping;
|
|
||||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
import com.solution.common.annotation.Log;
|
import com.solution.common.annotation.Log;
|
||||||
import com.solution.common.core.controller.BaseController;
|
import com.solution.common.core.controller.BaseController;
|
||||||
import com.solution.common.core.domain.AjaxResult;
|
import com.solution.common.core.domain.AjaxResult;
|
||||||
@@ -158,4 +151,15 @@ public class BehaviortreeController extends BaseController
|
|||||||
return success(behaviortreeService.getCommander(scenarioId));
|
return success(behaviortreeService.getCommander(scenarioId));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 修改平台关联的行为树id
|
||||||
|
* @param behaviortreeId
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@ApiOperation("修改平台关联的行为树id")
|
||||||
|
@PutMapping("/{behaviortreeId}")
|
||||||
|
public AjaxResult updateBehaviortreeId(@PathVariable Integer behaviortreeId,
|
||||||
|
@RequestParam(required = false) Integer id){
|
||||||
|
return toAjax(behaviortreeService.updateBehaviortreeId(behaviortreeId,id));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,4 +32,11 @@ public interface PlatformMapper {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
List<PlatformVO> getPlatformByEnglishName(@Param("underlingEnglishName") List<String> underlingEnglishName);
|
List<PlatformVO> getPlatformByEnglishName(@Param("underlingEnglishName") List<String> underlingEnglishName);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 修改平台关联的行为树id
|
||||||
|
* @param behaviortreeId
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
Integer updateBehaviortreeId(@Param("behaviortreeId") Integer behaviortreeId,@Param("id") Integer id);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -84,4 +84,11 @@ public interface IBehaviortreeService
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Integer getCountName(String newName);
|
Integer getCountName(String newName);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 修改平台关联的行为树id
|
||||||
|
* @param behaviortreeId
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
Integer updateBehaviortreeId(Integer behaviortreeId,Integer id);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -156,4 +156,17 @@ public class BehaviortreeServiceImpl implements IBehaviortreeService
|
|||||||
public Integer getCountName(String newName) {
|
public Integer getCountName(String newName) {
|
||||||
return behaviortreeMapper.getCountName(newName);
|
return behaviortreeMapper.getCountName(newName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 修改平台关联的行为树id
|
||||||
|
* @param behaviortreeId
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public Integer updateBehaviortreeId(Integer behaviortreeId,Integer id) {
|
||||||
|
if(ObjectUtil.isEmpty(behaviortreeId) || ObjectUtil.isEmpty(id)){
|
||||||
|
throw new RuntimeException(ExceptionConstants.PARAMETER_EXCEPTION);
|
||||||
|
}
|
||||||
|
return platformMapper.updateBehaviortreeId(behaviortreeId,id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import com.solution.system.service.INodeparameterService;
|
|||||||
* @date 2026-02-05
|
* @date 2026-02-05
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
public class NodeparameterServiceImpl implements INodeparameterService
|
public class NodeparameterServiceImpl implements INodeparameterService
|
||||||
{
|
{
|
||||||
@Autowired
|
@Autowired
|
||||||
private NodeparameterMapper nodeparameterMapper;
|
private NodeparameterMapper nodeparameterMapper;
|
||||||
|
|||||||
@@ -3,8 +3,11 @@
|
|||||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.solution.system.mapper.PlatformMapper">
|
<mapper namespace="com.solution.system.mapper.PlatformMapper">
|
||||||
|
<update id="updateBehaviortreeId">
|
||||||
|
UPDATE platform
|
||||||
|
SET behaviortree_id = #{behaviortreeId}
|
||||||
|
WHERE id = #{id}
|
||||||
|
</update>
|
||||||
|
|
||||||
<select id="selectPlatformChineseName" resultType="java.lang.String"
|
<select id="selectPlatformChineseName" resultType="java.lang.String"
|
||||||
parameterType="java.util.List">
|
parameterType="java.util.List">
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<delete id="deleteByTreeId">
|
<delete id="deleteByTreeId">
|
||||||
delete from treenodeinstance where tree_id=#{treeId}
|
delete from treenodeinstance where tree_id = #{treeId}
|
||||||
</delete>
|
</delete>
|
||||||
|
|
||||||
<sql id="selectTreenodeinstanceVo">
|
<sql id="selectTreenodeinstanceVo">
|
||||||
|
|||||||
Reference in New Issue
Block a user