diff --git a/auto-solution-behaviour/src/main/java/com/solution/system/domain/Nodeconnection.java b/auto-solution-behaviour/src/main/java/com/solution/system/domain/Nodeconnection.java index c833843..14617c3 100644 --- a/auto-solution-behaviour/src/main/java/com/solution/system/domain/Nodeconnection.java +++ b/auto-solution-behaviour/src/main/java/com/solution/system/domain/Nodeconnection.java @@ -18,6 +18,8 @@ public class Nodeconnection extends BaseEntity /** 连接ID (主键) */ private Long id; + private Long treeId; + /** 父节点 (外键: TreeInstanceNode.id) */ @Excel(name = "父节点 (外键: TreeInstanceNode.id)") private Long parentNodeId; @@ -40,7 +42,15 @@ public class Nodeconnection extends BaseEntity return id; } - public void setParentNodeId(Long parentNodeId) + public Long getTreeId() { + return treeId; + } + + public void setTreeId(Long treeId) { + this.treeId = treeId; + } + + public void setParentNodeId(Long parentNodeId) { this.parentNodeId = parentNodeId; } diff --git a/auto-solution-behaviour/src/main/java/com/solution/system/domain/Nodeparameter.java b/auto-solution-behaviour/src/main/java/com/solution/system/domain/Nodeparameter.java index 2865279..59acd0a 100644 --- a/auto-solution-behaviour/src/main/java/com/solution/system/domain/Nodeparameter.java +++ b/auto-solution-behaviour/src/main/java/com/solution/system/domain/Nodeparameter.java @@ -18,6 +18,8 @@ public class Nodeparameter extends BaseEntity /** 节点参数ID (主键) */ private Long id; + private Long treeId; + /** 关联到哪个节点实例 (外键: TreeInstanceNode.id) */ @Excel(name = "关联到哪个节点实例 (外键: TreeInstanceNode.id)") private Long nodeInstanceId; @@ -40,7 +42,15 @@ public class Nodeparameter extends BaseEntity return id; } - public void setNodeInstanceId(Long nodeInstanceId) + public Long getTreeId() { + return treeId; + } + + public void setTreeId(Long treeId) { + this.treeId = treeId; + } + + public void setNodeInstanceId(Long nodeInstanceId) { this.nodeInstanceId = nodeInstanceId; } diff --git a/auto-solution-behaviour/src/main/java/com/solution/system/domain/Nodetemplate.java b/auto-solution-behaviour/src/main/java/com/solution/system/domain/Nodetemplate.java index 8bba2f9..2689757 100644 --- a/auto-solution-behaviour/src/main/java/com/solution/system/domain/Nodetemplate.java +++ b/auto-solution-behaviour/src/main/java/com/solution/system/domain/Nodetemplate.java @@ -40,7 +40,7 @@ public class Nodetemplate extends BaseEntity /** 模版类型,节点模版或者条件判断,例如“node”,precondition“ */ @Excel(name = "模版类型,节点模版或者条件判断,例如“node”,precondition“") - private String templeteType; + private String templateType; public Nodetemplate() { } @@ -52,7 +52,7 @@ public class Nodetemplate extends BaseEntity this.logicHandler = template.logicHandler; this.description = template.description; this.englishName = template.englishName; - this.templeteType = template.templeteType; + this.templateType = template.templateType; } public void setId(Long id) @@ -115,14 +115,14 @@ public class Nodetemplate extends BaseEntity return englishName; } - public void setTempleteType(String templeteType) + public void setTemplateType(String templateType) { - this.templeteType = templeteType; + this.templateType = templateType; } - public String getTempleteType() + public String getTemplateType() { - return templeteType; + return templateType; } @Override @@ -134,7 +134,7 @@ public class Nodetemplate extends BaseEntity .append("logicHandler", getLogicHandler()) .append("description", getDescription()) .append("englishName", getEnglishName()) - .append("templeteType", getTempleteType()) + .append("templateType", getTemplateType()) .toString(); } } diff --git a/auto-solution-behaviour/src/main/java/com/solution/system/mapper/NodeconnectionMapper.java b/auto-solution-behaviour/src/main/java/com/solution/system/mapper/NodeconnectionMapper.java index 3cdedeb..b134886 100644 --- a/auto-solution-behaviour/src/main/java/com/solution/system/mapper/NodeconnectionMapper.java +++ b/auto-solution-behaviour/src/main/java/com/solution/system/mapper/NodeconnectionMapper.java @@ -2,6 +2,7 @@ package com.solution.system.mapper; import java.util.List; import com.solution.system.domain.Nodeconnection; +import org.apache.ibatis.annotations.Param; /** * 节点连接Mapper接口 @@ -11,6 +12,8 @@ import com.solution.system.domain.Nodeconnection; */ public interface NodeconnectionMapper { + void deleteByTreeId(@Param("treeId") Long treeId); + /** * 查询节点连接 * diff --git a/auto-solution-behaviour/src/main/java/com/solution/system/mapper/NodeparameterMapper.java b/auto-solution-behaviour/src/main/java/com/solution/system/mapper/NodeparameterMapper.java index c413eea..ab5f7ed 100644 --- a/auto-solution-behaviour/src/main/java/com/solution/system/mapper/NodeparameterMapper.java +++ b/auto-solution-behaviour/src/main/java/com/solution/system/mapper/NodeparameterMapper.java @@ -2,6 +2,7 @@ package com.solution.system.mapper; import java.util.List; import com.solution.system.domain.Nodeparameter; +import org.apache.ibatis.annotations.Param; /** * 节点参数Mapper接口 @@ -11,6 +12,8 @@ import com.solution.system.domain.Nodeparameter; */ public interface NodeparameterMapper { + void deleteByTreeId(@Param("treeId") Long treeId); + /** * 查询节点参数 * diff --git a/auto-solution-behaviour/src/main/java/com/solution/system/mapper/TreenodeinstanceMapper.java b/auto-solution-behaviour/src/main/java/com/solution/system/mapper/TreenodeinstanceMapper.java index 07b1642..25ef323 100644 --- a/auto-solution-behaviour/src/main/java/com/solution/system/mapper/TreenodeinstanceMapper.java +++ b/auto-solution-behaviour/src/main/java/com/solution/system/mapper/TreenodeinstanceMapper.java @@ -2,6 +2,7 @@ package com.solution.system.mapper; import java.util.List; import com.solution.system.domain.Treenodeinstance; +import org.apache.ibatis.annotations.Param; /** * 行为树实例节点Mapper接口 @@ -11,6 +12,8 @@ import com.solution.system.domain.Treenodeinstance; */ public interface TreenodeinstanceMapper { + void deleteByTreeId(@Param(value = "treeId") Long treeId); + /** * 查询行为树实例节点 * diff --git a/auto-solution-behaviour/src/main/java/com/solution/system/service/INodeconnectionService.java b/auto-solution-behaviour/src/main/java/com/solution/system/service/INodeconnectionService.java index aca1779..6ede79f 100644 --- a/auto-solution-behaviour/src/main/java/com/solution/system/service/INodeconnectionService.java +++ b/auto-solution-behaviour/src/main/java/com/solution/system/service/INodeconnectionService.java @@ -2,6 +2,7 @@ package com.solution.system.service; import java.util.List; import com.solution.system.domain.Nodeconnection; +import org.apache.ibatis.annotations.Param; /** * 节点连接Service接口 @@ -11,6 +12,9 @@ import com.solution.system.domain.Nodeconnection; */ public interface INodeconnectionService { + + void deleteByTreeId(@Param("treeId") Long treeId); + /** * 查询节点连接 * diff --git a/auto-solution-behaviour/src/main/java/com/solution/system/service/INodeparameterService.java b/auto-solution-behaviour/src/main/java/com/solution/system/service/INodeparameterService.java index 4390eeb..1f3546c 100644 --- a/auto-solution-behaviour/src/main/java/com/solution/system/service/INodeparameterService.java +++ b/auto-solution-behaviour/src/main/java/com/solution/system/service/INodeparameterService.java @@ -11,6 +11,9 @@ import com.solution.system.domain.Nodeparameter; */ public interface INodeparameterService { + + void deleteByTreeId(Long treeId); + /** * 查询节点参数 * diff --git a/auto-solution-behaviour/src/main/java/com/solution/system/service/ITreenodeinstanceService.java b/auto-solution-behaviour/src/main/java/com/solution/system/service/ITreenodeinstanceService.java index 4e4f968..d66f54f 100644 --- a/auto-solution-behaviour/src/main/java/com/solution/system/service/ITreenodeinstanceService.java +++ b/auto-solution-behaviour/src/main/java/com/solution/system/service/ITreenodeinstanceService.java @@ -11,6 +11,9 @@ import com.solution.system.domain.Treenodeinstance; */ public interface ITreenodeinstanceService { + + void deleteByTreeId(Long treeId); + /** * 查询行为树实例节点 * diff --git a/auto-solution-behaviour/src/main/java/com/solution/system/service/impl/NodeconnectionServiceImpl.java b/auto-solution-behaviour/src/main/java/com/solution/system/service/impl/NodeconnectionServiceImpl.java index c7ad225..a53ded7 100644 --- a/auto-solution-behaviour/src/main/java/com/solution/system/service/impl/NodeconnectionServiceImpl.java +++ b/auto-solution-behaviour/src/main/java/com/solution/system/service/impl/NodeconnectionServiceImpl.java @@ -19,6 +19,11 @@ public class NodeconnectionServiceImpl implements INodeconnectionService @Autowired private NodeconnectionMapper nodeconnectionMapper; + @Override + public void deleteByTreeId(Long treeId) { + nodeconnectionMapper.deleteByTreeId(treeId); + } + /** * 查询节点连接 * diff --git a/auto-solution-behaviour/src/main/java/com/solution/system/service/impl/NodeparameterServiceImpl.java b/auto-solution-behaviour/src/main/java/com/solution/system/service/impl/NodeparameterServiceImpl.java index 12a7f5b..e1f0ec8 100644 --- a/auto-solution-behaviour/src/main/java/com/solution/system/service/impl/NodeparameterServiceImpl.java +++ b/auto-solution-behaviour/src/main/java/com/solution/system/service/impl/NodeparameterServiceImpl.java @@ -19,6 +19,11 @@ public class NodeparameterServiceImpl implements INodeparameterService @Autowired private NodeparameterMapper nodeparameterMapper; + @Override + public void deleteByTreeId(Long treeId) { + nodeparameterMapper.deleteByTreeId(treeId); + } + /** * 查询节点参数 * diff --git a/auto-solution-behaviour/src/main/java/com/solution/system/service/impl/TreenodeinstanceServiceImpl.java b/auto-solution-behaviour/src/main/java/com/solution/system/service/impl/TreenodeinstanceServiceImpl.java index 7c552a8..4992af9 100644 --- a/auto-solution-behaviour/src/main/java/com/solution/system/service/impl/TreenodeinstanceServiceImpl.java +++ b/auto-solution-behaviour/src/main/java/com/solution/system/service/impl/TreenodeinstanceServiceImpl.java @@ -19,6 +19,11 @@ public class TreenodeinstanceServiceImpl implements ITreenodeinstanceService @Autowired private TreenodeinstanceMapper treenodeinstanceMapper; + @Override + public void deleteByTreeId(Long treeId) { + treenodeinstanceMapper.deleteByTreeId(treeId); + } + /** * 查询行为树实例节点 * diff --git a/auto-solution-behaviour/src/main/resources/mapper/system/NodeconnectionMapper.xml b/auto-solution-behaviour/src/main/resources/mapper/system/NodeconnectionMapper.xml index ec64696..be4308f 100644 --- a/auto-solution-behaviour/src/main/resources/mapper/system/NodeconnectionMapper.xml +++ b/auto-solution-behaviour/src/main/resources/mapper/system/NodeconnectionMapper.xml @@ -6,18 +6,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + delete from nodeconnection where tree_id=#{treeId} + + - select id, parent_node_id, child_node_id, order_index from nodeconnection + select id, tree_id, parent_node_id, child_node_id, order_index from nodeconnection @@ -32,11 +37,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into nodeparameter + tree_id, node_instance_id, param_def_id, value, + #{treeId}, #{nodeInstanceId}, #{paramDefId}, #{value}, @@ -46,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update nodeparameter + tree_id = #{treeId}, node_instance_id = #{nodeInstanceId}, param_def_id = #{paramDefId}, value = #{value}, diff --git a/auto-solution-behaviour/src/main/resources/mapper/system/NodetemplateMapper.xml b/auto-solution-behaviour/src/main/resources/mapper/system/NodetemplateMapper.xml index 54cf476..d4e71a8 100644 --- a/auto-solution-behaviour/src/main/resources/mapper/system/NodetemplateMapper.xml +++ b/auto-solution-behaviour/src/main/resources/mapper/system/NodetemplateMapper.xml @@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and logic_handler = #{logicHandler} and description = #{description} and english_name like concat('%', #{englishName}, '%') - and templete_type = #{templeteType} + and templete_type = #{templateType} @@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" logic_handler, description, english_name, - templete_type, + templete_type, #{type}, @@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{logicHandler}, #{description}, #{englishName}, - #{templeteType}, + #{templateType}, @@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" logic_handler = #{logicHandler}, description = #{description}, english_name = #{englishName}, - templete_type = #{templeteType}, + templete_type = #{templateType}, where id = #{id} diff --git a/auto-solution-behaviour/src/main/resources/mapper/system/TreenodeinstanceMapper.xml b/auto-solution-behaviour/src/main/resources/mapper/system/TreenodeinstanceMapper.xml index 6132e5e..ac5ee3f 100644 --- a/auto-solution-behaviour/src/main/resources/mapper/system/TreenodeinstanceMapper.xml +++ b/auto-solution-behaviour/src/main/resources/mapper/system/TreenodeinstanceMapper.xml @@ -15,6 +15,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + delete from treenodeinstance where tree_id=#{treeId} + + select id, tree_id, template_id, instance_name, is_root, precondition_templete_id, uuid,desciption from treenodeinstance