diff --git a/auto-solution-admin/src/main/java/com/solution/web/controller/rule/FireRuleController.java b/auto-solution-admin/src/main/java/com/solution/web/controller/rule/FireRuleController.java index e8e8b53..d3d500e 100644 --- a/auto-solution-admin/src/main/java/com/solution/web/controller/rule/FireRuleController.java +++ b/auto-solution-admin/src/main/java/com/solution/web/controller/rule/FireRuleController.java @@ -68,6 +68,11 @@ public class FireRuleController extends BaseController { return success(ruleService.findAllPlatformComponents()); } + @GetMapping("/platforms/basic") + public AjaxResult platformsBasic(){ + return success(ruleService.findAllBasicPlatformComponents()); + } + /** * 根据平台id获取平台下所有组件 * @param platformId diff --git a/auto-solution-admin/src/main/java/com/solution/web/core/graph/GraphNode.java b/auto-solution-admin/src/main/java/com/solution/web/core/graph/GraphNode.java index 71f3d2a..fa3b643 100644 --- a/auto-solution-admin/src/main/java/com/solution/web/core/graph/GraphNode.java +++ b/auto-solution-admin/src/main/java/com/solution/web/core/graph/GraphNode.java @@ -33,6 +33,8 @@ public class GraphNode implements Serializable { private String category; + private boolean multiable; + private List parameters; private List variables; @@ -61,6 +63,14 @@ public class GraphNode implements Serializable { '}'; } + public boolean isMultiable() { + return multiable; + } + + public void setMultiable(boolean multiable) { + this.multiable = multiable; + } + public String getCategory() { return category; } 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 59acd0a..9c637d8 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 @@ -32,6 +32,8 @@ public class Nodeparameter extends BaseEntity @Excel(name = "节点实例设置的具体参数值 (覆盖模板默认值)") private String value; + private int groupIndex; + public void setId(Long id) { this.id = id; @@ -80,6 +82,14 @@ public class Nodeparameter extends BaseEntity return value; } + public int getGroupIndex() { + return groupIndex; + } + + public void setGroupIndex(int groupIndex) { + this.groupIndex = groupIndex; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) 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 2689757..d3eaee6 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 @@ -42,6 +42,8 @@ public class Nodetemplate extends BaseEntity @Excel(name = "模版类型,节点模版或者条件判断,例如“node”,precondition“") private String templateType; + private boolean multiable; + public Nodetemplate() { } @@ -53,6 +55,7 @@ public class Nodetemplate extends BaseEntity this.description = template.description; this.englishName = template.englishName; this.templateType = template.templateType; + this.multiable = template.multiable; } public void setId(Long id) @@ -125,6 +128,14 @@ public class Nodetemplate extends BaseEntity return templateType; } + public boolean isMultiable() { + return multiable; + } + + public void setMultiable(boolean multiable) { + this.multiable = multiable; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/auto-solution-behaviour/src/main/java/com/solution/system/domain/Templateparameterdef.java b/auto-solution-behaviour/src/main/java/com/solution/system/domain/Templateparameterdef.java index b62ab7a..e830cd4 100644 --- a/auto-solution-behaviour/src/main/java/com/solution/system/domain/Templateparameterdef.java +++ b/auto-solution-behaviour/src/main/java/com/solution/system/domain/Templateparameterdef.java @@ -42,6 +42,8 @@ public class Templateparameterdef extends BaseEntity @Excel(name = "判断参数模版是节点的参数模版还是条件的参数模版") private String templateType; + private int groupIndex; + public void setId(Long id) { this.id = id; @@ -112,6 +114,14 @@ public class Templateparameterdef extends BaseEntity return templateType; } + public int getGroupIndex() { + return groupIndex; + } + + public void setGroupIndex(int groupIndex) { + this.groupIndex = groupIndex; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/auto-solution-behaviour/src/main/resources/mapper/system/NodeparameterMapper.xml b/auto-solution-behaviour/src/main/resources/mapper/system/NodeparameterMapper.xml index b0a4f20..1cddc6f 100644 --- a/auto-solution-behaviour/src/main/resources/mapper/system/NodeparameterMapper.xml +++ b/auto-solution-behaviour/src/main/resources/mapper/system/NodeparameterMapper.xml @@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -17,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, treeId, node_instance_id, param_def_id, value from nodeparameter + select id, treeId, node_instance_id, param_def_id,`value`, group_index from nodeparameter diff --git a/auto-solution-rule/src/main/java/com/solution/rule/domain/BasicPlatform.java b/auto-solution-rule/src/main/java/com/solution/rule/domain/BasicPlatform.java new file mode 100644 index 0000000..457f6a1 --- /dev/null +++ b/auto-solution-rule/src/main/java/com/solution/rule/domain/BasicPlatform.java @@ -0,0 +1,47 @@ +package com.solution.rule.domain; +/* + * This file is part of the kernelstudio package. + * + * (c) 2014-2026 zlin + * + * For the full copyright and license information, please view the LICENSE file + * that was distributed with this source code. + */ + +import java.io.Serializable; +import java.util.List; + +public class BasicPlatform implements Serializable { + + + private Integer id; + + private String name; + + private String description; + + 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; + } + +} diff --git a/auto-solution-rule/src/main/java/com/solution/rule/domain/Platform.java b/auto-solution-rule/src/main/java/com/solution/rule/domain/Platform.java index 6a1b57a..00ed514 100644 --- a/auto-solution-rule/src/main/java/com/solution/rule/domain/Platform.java +++ b/auto-solution-rule/src/main/java/com/solution/rule/domain/Platform.java @@ -8,43 +8,12 @@ package com.solution.rule.domain; * that was distributed with this source code. */ -import java.io.Serializable; import java.util.List; -public class Platform implements Serializable { - - private Integer id; - - private String name; - - private String description; +public class Platform extends BasicPlatform { private List components; - 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 List getComponents() { return components; } @@ -52,5 +21,4 @@ public class Platform implements Serializable { public void setComponents(List components) { this.components = components; } - } diff --git a/auto-solution-rule/src/main/java/com/solution/rule/mapper/FireRuleMapper.java b/auto-solution-rule/src/main/java/com/solution/rule/mapper/FireRuleMapper.java index 5c821bb..7d35deb 100644 --- a/auto-solution-rule/src/main/java/com/solution/rule/mapper/FireRuleMapper.java +++ b/auto-solution-rule/src/main/java/com/solution/rule/mapper/FireRuleMapper.java @@ -1,5 +1,6 @@ package com.solution.rule.mapper; +import com.solution.rule.domain.BasicPlatform; import com.solution.rule.domain.Platform; import com.solution.rule.domain.PlatformComponent; import com.solution.rule.domain.vo.ComponentCountVO; @@ -44,4 +45,6 @@ public interface FireRuleMapper { List findPlatformComponents(Integer scenarioId); List findAllPlatformComponents(); + + List findAllBasicPlatformComponents(); } diff --git a/auto-solution-rule/src/main/java/com/solution/rule/service/FireRuleService.java b/auto-solution-rule/src/main/java/com/solution/rule/service/FireRuleService.java index 74f98b6..8ba2e78 100644 --- a/auto-solution-rule/src/main/java/com/solution/rule/service/FireRuleService.java +++ b/auto-solution-rule/src/main/java/com/solution/rule/service/FireRuleService.java @@ -1,5 +1,6 @@ package com.solution.rule.service; +import com.solution.rule.domain.BasicPlatform; import com.solution.rule.domain.FireRuleExecuteDTO; import com.solution.rule.domain.Platform; import com.solution.rule.domain.PlatformComponent; @@ -47,4 +48,6 @@ public interface FireRuleService { List findPlatformComponents(Integer scenarioId); List findAllPlatformComponents(); + + List findAllBasicPlatformComponents(); } diff --git a/auto-solution-rule/src/main/java/com/solution/rule/service/impl/FireRuleServiceImpl.java b/auto-solution-rule/src/main/java/com/solution/rule/service/impl/FireRuleServiceImpl.java index 33bf00d..c9a1a09 100644 --- a/auto-solution-rule/src/main/java/com/solution/rule/service/impl/FireRuleServiceImpl.java +++ b/auto-solution-rule/src/main/java/com/solution/rule/service/impl/FireRuleServiceImpl.java @@ -3,10 +3,7 @@ package com.solution.rule.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.solution.common.constant.ExceptionConstants; -import com.solution.rule.domain.FireRuleExecuteDTO; -import com.solution.rule.domain.Platform; -import com.solution.rule.domain.PlatformComponent; -import com.solution.rule.domain.RuleParam; +import com.solution.rule.domain.*; import com.solution.rule.domain.dto.WeaponModelDTO; import com.solution.rule.domain.vo.ComponentCountVO; import com.solution.rule.domain.vo.PlatformComponentNamesVO; @@ -181,4 +178,9 @@ public class FireRuleServiceImpl implements FireRuleService { return ruleMapper.findAllPlatformComponents(); } + @Override + public List findAllBasicPlatformComponents() { + return ruleMapper.findAllBasicPlatformComponents(); + } + } diff --git a/auto-solution-rule/src/main/resources/mapper/rule/FireRuleMapper.xml b/auto-solution-rule/src/main/resources/mapper/rule/FireRuleMapper.xml index a4c577f..9bde0f1 100644 --- a/auto-solution-rule/src/main/resources/mapper/rule/FireRuleMapper.xml +++ b/auto-solution-rule/src/main/resources/mapper/rule/FireRuleMapper.xml @@ -85,6 +85,16 @@ WHERE platform_id=#{platformId} AND platform_component.type = "comm" + + + + + + + diff --git a/modeler/src/style.less b/modeler/src/style.less index ad463ef..90ecaf0 100644 --- a/modeler/src/style.less +++ b/modeler/src/style.less @@ -1829,4 +1829,45 @@ } } +} + +.ks-add-parameter-action{ + color: #eee; + position: absolute; + right: 14px; + top: 6px; + cursor: pointer; +} + +.ks-parameter-setting-tabs{ + .ant-tabs-nav{ + background: none; + } + .ant-tabs-nav-list{ + margin-left: 0; + } + &.ant-tabs-left >.ant-tabs-content-holder, + &.ant-tabs-left >div>.ant-tabs-content-holder{ + border-left-color: #09264b; + } + .ant-tabs-tab-remove{ + //position: absolute; + //right: 10px; + //top: 7px; + .anticon{ + color: rgb(173 206 224); + } + } + &.ant-tabs-left >.ant-tabs-nav .ant-tabs-tab{ + border-radius: 0!important; + } + &.ant-tabs-card >.ant-tabs-nav .ant-tabs-tab-active, + &.ant-tabs-card >div>.ant-tabs-nav .ant-tabs-tab-active { + background: #09264c; + } + + &.ant-tabs-left >.ant-tabs-content-holder >.ant-tabs-content>.ant-tabs-tabpane, + &.ant-tabs-left >div>.ant-tabs-content-holder >.ant-tabs-content>.ant-tabs-tabpane{ + padding-left: 5px; + } } \ No newline at end of file diff --git a/modeler/src/views/decision/communication/communication.vue b/modeler/src/views/decision/communication/communication.vue index 757fe09..3a9ff9b 100644 --- a/modeler/src/views/decision/communication/communication.vue +++ b/modeler/src/views/decision/communication/communication.vue @@ -46,6 +46,7 @@