Compare commits

26 Commits

Author SHA1 Message Date
MHW
ce832fb16d 火力规则:代码冲突解决,readme文件补充 2026-03-27 20:37:45 +08:00
MHW
e9503358d3 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	auto-solution-rule/src/main/java/com/solution/rule/service/FireRuleService.java
#	modeler/src/style.less
2026-03-27 17:58:40 +08:00
MHW
3b3370c440 Merge branch 'refs/heads/develop'
# Conflicts:
#	auto-solution-rule/src/main/java/com/solution/rule/service/FireRuleService.java
#	modeler/src/style.less
2026-03-27 17:56:55 +08:00
MHW
d8719c30c6 火力规则:装备类型规则、目标规则实现、阵位规则、航迹规则 2026-03-27 17:54:48 +08:00
MHW
9ff0e50bba 火力规则:装备类型规则、目标规则实现 2026-03-27 16:56:07 +08:00
libertyspy
2838938cfa UPDATE: VERSION-20260327 2026-03-27 14:02:18 +08:00
MHW
c4cc3cc30b 火力规则打击规则实现 2026-03-27 11:35:17 +08:00
libertyspy
d1f720f691 UPDATE: VERSION-20260327 2026-03-27 10:54:44 +08:00
libertyspy
cb1019b7d7 UPDATE: VERSION-20260327 2026-03-27 10:35:23 +08:00
MHW
18827cfbe7 火力规则打击规则实现 2026-03-27 10:27:04 +08:00
MHW
3fe32e4ac3 develop: 临时保存修改 2026-03-27 10:20:45 +08:00
libertyspy
168ced6b27 UPDATE: VERSION-20260327 2026-03-27 10:03:25 +08:00
libertyspy
499734efe8 UPDATE: VERSION-20260327 2026-03-27 10:03:16 +08:00
libertyspy
27c8fc13c6 UPDATE: VERSION-20260327 2026-03-27 10:03:07 +08:00
libertyspy
505092bcf4 UPDATE: VERSION-20260327 2026-03-27 10:02:59 +08:00
libertyspy
41ba11dc9b UPDATE: VERSION-20260327 2026-03-27 09:33:46 +08:00
libertyspy
158512cd12 UPDATE: VERSION-20260326 2026-03-27 00:08:48 +08:00
libertyspy
3a3ab0c9c6 UPDATE: VERSION-20260326 2026-03-27 00:05:50 +08:00
libertyspy
b08c74260d UPDATE: VERSION-20260326 2026-03-27 00:05:04 +08:00
libertyspy
02e9ca26a1 UPDATE: VERSION-20260326 2026-03-26 23:59:15 +08:00
libertyspy
8958ecd6dc UPDATE: VERSION-20260326 2026-03-26 23:36:47 +08:00
libertyspy
6656479327 UPDATE: VERSION-20260326 2026-03-26 22:05:31 +08:00
libertyspy
18ccf490e4 UPDATE: VERSION-20260326 2026-03-26 21:45:31 +08:00
MHW
4a0602ce4e Merge branch 'refs/heads/develop' 2026-03-17 21:22:30 +08:00
MHW
8844830afc 修复lombok导致打包冲突 2026-03-17 21:21:48 +08:00
MHW
bcc450141e 保存场景关系 2026-03-17 11:08:30 +08:00
87 changed files with 24317 additions and 179 deletions

View File

@@ -42,6 +42,12 @@ public class BehaviortreeController extends BaseController
@Autowired
private BehaviortreeProcessor behaviortreeProcessor;
@GetMapping(value = "/platform/{id}")
public AjaxResult fromPlatform(@PathVariable("id") Integer id)
{
return success(behaviortreeService.findOneByPlatformId(id));
}
/**
* 查询行为树主列表
*/

View File

@@ -3,6 +3,7 @@ package com.solution.web.controller.rule;
import com.solution.common.core.controller.BaseController;
import com.solution.common.core.domain.AjaxResult;
import com.solution.rule.domain.FireRuleExecuteDTO;
import com.solution.rule.domain.simplerulepojo.Task;
import com.solution.rule.service.FireRuleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -68,6 +69,11 @@ public class FireRuleController extends BaseController {
return success(ruleService.findAllPlatformComponents());
}
@GetMapping("/platforms/basic")
public AjaxResult platformsBasic(){
return success(ruleService.findAllBasicPlatformComponents());
}
/**
* 根据平台id获取平台下所有组件
* @param platformId
@@ -78,4 +84,15 @@ public class FireRuleController extends BaseController {
public AjaxResult getComponents(@PathVariable Integer platformId){
return success(ruleService.getComponents(platformId));
}
/**
* 开始执行规则匹配
* @param task 敌方参数
* @return
*/
@PostMapping("/rule")
@ApiOperation("开始执行规则匹配")
public AjaxResult execute(@RequestBody Task task){
return success(ruleService.executeTask(task));
}
}

View File

@@ -20,8 +20,11 @@ import com.solution.web.core.graph.GraphEdge;
import com.solution.web.core.graph.GraphNode;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Component
@@ -98,12 +101,19 @@ public class BehaviortreeProcessor {
instanceKeyMap.put(node.getKey(), instance);
if (node.hasParameters()) {
if (node.isMultiable()) {
List<Nodeparameter> nodeparameters = createMultiableNodeparameter(behaviortree, node, instance);
for (Nodeparameter nodeparameter : nodeparameters) {
nodeparameterService.insertNodeparameter(nodeparameter);
}
} else {
// 插入parameter nodeparameter
for (Templateparameterdef parameter : node.getParameters()) {
Nodeparameter nodeparameter = createNodeParameter(behaviortree, parameter, instance);
nodeparameterService.insertNodeparameter(nodeparameter);
}
}
}
nodeKeyIndexMap.put(node.getKey(), index);
index++;
@@ -148,6 +158,47 @@ public class BehaviortreeProcessor {
return connection;
}
private List<Nodeparameter> createMultiableNodeparameter(Behaviortree behaviortree, GraphNode node,
Treenodeinstance instance) {
List<Nodeparameter> nodeparameters = new ArrayList<>();
Map<Long, List<String>> idValues = new HashMap<>();
List<String> tmpValues = null;
Map<Long, List<Templateparameterdef>> mappedValues = new HashMap<>();
List<Templateparameterdef> tmpDefs = null;
for (Templateparameterdef parameter : node.getParameters()) {
tmpDefs = mappedValues.get(parameter.getId() );
if (null == tmpDefs) {
tmpDefs = new ArrayList<>();
}
tmpDefs.add(parameter);
mappedValues.put(parameter.getId(), tmpDefs);
tmpValues = idValues.get(parameter.getId() );
if (null == tmpValues) {
tmpValues = new ArrayList<>();
}
tmpValues.add(parameter.getDefaultValue());
idValues.put(parameter.getId(), tmpValues);
}
int index = 0;
for (Long id : idValues.keySet()) {
tmpValues = idValues.get(id);
Nodeparameter nodeparameter = new Nodeparameter();
nodeparameter.setTreeId(behaviortree.getId());
nodeparameter.setNodeInstanceId(instance.getId());
nodeparameter.setParamDefId(id);
nodeparameter.setValue(StringUtils.collectionToCommaDelimitedString(tmpValues));
nodeparameter.setGroupIndex(index);
nodeparameters.add(nodeparameter);
index++;
}
return nodeparameters;
}
private Nodeparameter createNodeParameter(Behaviortree behaviortree, Templateparameterdef parameter,
Treenodeinstance instance) {
Nodeparameter nodeparameter = new Nodeparameter();
@@ -155,6 +206,7 @@ public class BehaviortreeProcessor {
nodeparameter.setNodeInstanceId(instance.getId());
nodeparameter.setParamDefId(parameter.getId());
nodeparameter.setValue(parameter.getDefaultValue());
nodeparameter.setGroupIndex(parameter.getGroupIndex());
return nodeparameter;
}

View File

@@ -33,6 +33,8 @@ public class GraphNode implements Serializable {
private String category;
private boolean multiable;
private List<Templateparameterdef> parameters;
private List<GraphVariable> 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;
}

View File

@@ -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)

View File

@@ -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)

View File

@@ -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)

View File

@@ -12,6 +12,9 @@ import com.solution.system.domain.Behaviortree;
*/
public interface BehaviortreeMapper
{
Behaviortree findOneByPlatformId(Integer platformId);
/**
* 查询行为树主
*

View File

@@ -12,6 +12,9 @@ import com.solution.system.domain.Behaviortree;
*/
public interface IBehaviortreeService
{
Behaviortree findOneByPlatformId(Integer platformId);
/**
* 查询行为树主
*

View File

@@ -22,6 +22,12 @@ public class BehaviortreeServiceImpl implements IBehaviortreeService
@Autowired
private BehaviortreeMapper behaviortreeMapper;
@Override
public Behaviortree findOneByPlatformId(Integer platformId)
{
return behaviortreeMapper.findOneByPlatformId(platformId);
}
/**
* 查询行为树主
*

View File

@@ -14,6 +14,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="xmlContent" column="xml_content" />
</resultMap>
<select id="findOneByPlatformId" resultMap="BehaviortreeResult">
select * from behaviortree
where platform_id=#{platformId}
limit 1
</select>
<sql id="selectBehaviortreeVo">
select id, name, description, created_at, updated_at, english_name, xml_content from behaviortree
</sql>

View File

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="nodeInstanceId" column="node_instance_id" />
<result property="paramDefId" column="param_def_id" />
<result property="value" column="value" />
<result property="groupIndex" column="group_index" />
</resultMap>
<delete id="deleteByTreeId">
@@ -17,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<sql id="selectNodeparameterVo">
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
</sql>
<select id="selectNodeparameterList" parameterType="Nodeparameter" resultMap="NodeparameterResult">
@@ -41,12 +42,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="nodeInstanceId != null">node_instance_id,</if>
<if test="paramDefId != null">param_def_id,</if>
<if test="value != null">value,</if>
group_index
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="treeId != null">#{treeId},</if>
<if test="nodeInstanceId != null">#{nodeInstanceId},</if>
<if test="paramDefId != null">#{paramDefId},</if>
<if test="value != null">#{value},</if>
#{groupIndex}
</trim>
</insert>
@@ -57,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="nodeInstanceId != null">node_instance_id = #{nodeInstanceId},</if>
<if test="paramDefId != null">param_def_id = #{paramDefId},</if>
<if test="value != null">value = #{value},</if>
group_index=#{groupIndex}
</trim>
where id = #{id}
</update>

View File

@@ -12,10 +12,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="description" column="description" />
<result property="englishName" column="english_name" />
<result property="templateType" column="templete_type" />
<result property="multiable" column="is_multiable" />
</resultMap>
<sql id="selectNodetemplateVo">
select id, type, name, logic_handler, description, english_name, templete_type from nodetemplate
select id, type, name, logic_handler, description, english_name, templete_type, is_multiable from nodetemplate
</sql>
<select id="selectNodetemplateList" parameterType="Nodetemplate" resultMap="NodetemplateResult">

View File

@@ -113,6 +113,12 @@
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.34</version>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>

View File

@@ -16,18 +16,61 @@
rule模块
</description>
<properties>
<!-- Drools 版本,建议使用稳定版,如 7.74.1.Final 或 8.x 系列 -->
<drools.version>7.74.1.Final</drools.version>
</properties>
<dependencies>
<!-- 1. Drools 核心引擎 -->
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-core</artifactId>
<version>${drools.version}</version>
</dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-templates</artifactId>
<version>${drools.version}</version>
</dependency>
<!-- 2. KIE APIDrools 属于 KIE 项目的一部分,此依赖提供核心 API -->
<dependency>
<groupId>org.kie</groupId>
<artifactId>kie-api</artifactId>
<version>${drools.version}</version>
</dependency>
<!-- 3. 规则编译器(用于编译 .drl 等规则文件) -->
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-compiler</artifactId>
<version>${drools.version}</version>
</dependency>
<!-- 4. Spring 整合(如果需要和 Spring/Spring Boot 深度整合) -->
<dependency>
<groupId>org.kie</groupId>
<artifactId>kie-spring</artifactId>
<version>${drools.version}</version>
</dependency>
<!-- 流式解析工具-->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.15.2</version>
</dependency>
<!-- 通用工具-->
<dependency>
<groupId>com.solution</groupId>
<artifactId>solution-common</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>

View File

@@ -0,0 +1,91 @@
package com.solution.rule.config;
import org.kie.api.KieBase;
import org.kie.api.KieServices;
import org.kie.api.builder.KieBuilder;
import org.kie.api.builder.KieFileSystem;
import org.kie.api.builder.KieRepository;
import org.kie.api.builder.Message;
import org.kie.api.runtime.KieContainer;
import org.kie.api.runtime.KieSession;
import org.kie.internal.io.ResourceFactory;
import org.kie.spring.KModuleBeanFactoryPostProcessor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.core.io.support.ResourcePatternResolver;
import java.io.IOException;
@Configuration
public class DroolsConfig {
private static final String RULE_PATH = "classpath*:rules/**/*.drl";
private final KieServices kieServices = KieServices.Factory.get();
/**
* 加载规则文件
*/
@Bean
public KieFileSystem kieFileSystem() throws IOException {
KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
Resource[] resources = resolver.getResources(RULE_PATH);
for (Resource resource : resources) {
kieFileSystem.write(
ResourceFactory.newInputStreamResource(resource.getInputStream())
.setSourcePath("rules/" + resource.getFilename())
);
}
return kieFileSystem;
}
/**
* 构建 KieContainer
*/
@Bean
public KieContainer kieContainer(KieFileSystem kieFileSystem) {
KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem);
kieBuilder.buildAll();
// 检查错误
if (kieBuilder.getResults().hasMessages(Message.Level.ERROR)) {
throw new RuntimeException("Drools规则编译错误\n" +
kieBuilder.getResults().toString());
}
KieRepository repository = kieServices.getRepository();
return kieServices.newKieContainer(repository.getDefaultReleaseId());
}
/**
* KieBase
*/
@Bean
public KieBase kieBase(KieContainer kieContainer) {
return kieContainer.getKieBase();
}
/**
* KieSession推荐加
*/
@Bean
public KieSession kieSession(KieContainer kieContainer) {
return kieContainer.newKieSession();
}
/**
* 必须是 static
*/
@Bean
public static KModuleBeanFactoryPostProcessor kiePostProcessor() {
return new KModuleBeanFactoryPostProcessor();
}
}

View File

@@ -0,0 +1,47 @@
package com.solution.rule.domain;
/*
* This file is part of the kernelstudio package.
*
* (c) 2014-2026 zlin <admin@kernelstudio.com>
*
* 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;
}
}

View File

@@ -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<PlatformComponent> 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<PlatformComponent> getComponents() {
return components;
}
@@ -52,5 +21,4 @@ public class Platform implements Serializable {
public void setComponents(List<PlatformComponent> components) {
this.components = components;
}
}

View File

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* 平台挂载的组件实体类
* 对应表 platform_component
@@ -29,4 +31,7 @@ public class PlatformComponent {
@ApiModelProperty(value = "组件数量")
private Long num;
@ApiModelProperty(value = "平台参数List<String>")
private List<String> platformParams;
}

View File

@@ -0,0 +1,18 @@
package com.solution.rule.domain.dto;
import lombok.Data;
import java.util.List;
@Data
public class ComponentJsonDTO {
//组件类型
private String type;
//组件名称
private String name;
//组件参数列表
private List<PlatformJsonDTO> parameters;
}

View File

@@ -0,0 +1,18 @@
package com.solution.rule.domain.dto;
import lombok.Data;
@Data
public class ComponentParamJsonDTO {
// 参数名称
private String name;
private String def;
// 参数值
private String value;
// 参数单位
private String unit;
}

View File

@@ -0,0 +1,21 @@
package com.solution.rule.domain.dto;
import lombok.Data;
import java.util.List;
@Data
public class PlatformJsonDTO {
// 装备ID
private String id;
// 装备名称
private String name;
// 平台类型 (Platform_type)
private String type;
// 子组件列表(武器、传感器、通信等)
private List<ComponentJsonDTO> components;
}

View File

@@ -1,22 +0,0 @@
package com.solution.rule.domain.dto;
import lombok.Data;
/**
* 规则请求参数
*/
@Data
public class RequestDTO {
//编队数量
private Long formationNum;
//武装直升机数量
private Long gunshipNum;
//无人机数量
private Long droneNum;
//单兵武器数量
private Long singleWeaponNum;
}

View File

@@ -0,0 +1,25 @@
package com.solution.rule.domain.dto;
import lombok.Data;
import javax.sound.midi.Track;
import java.util.List;
@Data
public class TaskJsonDTO {
//任务id
private Long attackId;
//任务名称
private String name;
//任务类型
private String dataType;
//任务下的平台
private List<PlatformJsonDTO> platforms;
//任务轨迹
private List<Track> tracks;
}

View File

@@ -0,0 +1,18 @@
package com.solution.rule.domain.dto;
import lombok.Data;
import java.util.List;
@Data
public class TrackJsonDTO {
// 轨迹ID
private String id;
// 轨迹名称
private String name;
// 轨迹点列表
private List<TrackPointJsonDTO> points;
}

View File

@@ -0,0 +1,25 @@
package com.solution.rule.domain.dto;
public class TrackPointJsonDTO {
// 轨迹点索引
private int index;
// 经度
private double longitude;
// 纬度
private double latitude;
// 高度(米)
private double height;
// 速度(米/秒)
private double speed;
// 航向角(度)
private double heading;
// 时间点(秒)
private double time;
}

View File

@@ -20,4 +20,7 @@ public class WeaponModelDTO {
@ApiModelProperty("平台组件")
private List<PlatformComponent> components;
@ApiModelProperty("平台参数List<String>")
private List<String> platformParams;
}

View File

@@ -0,0 +1,52 @@
package com.solution.rule.domain.request;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.solution.common.utils.sign.Md5Utils;
import lombok.Data;
import java.util.List;
/**
* 单个属性的定义
*/
@Data
public class Attribute {
//uuid
@JsonProperty("_uuid")
private String uuid;
/** 属性数据类型float、int、string、bool、enum */
private String attDataType;
/** 属性定义(英文标识) */
private String attDef;
/** 属性默认值 */
private String attDefaultValue;
/** 属性详细信息 */
private Object attDetail;
/** 属性说明(中文描述) */
private String attExplain;
/** 属性ID */
private String attId;
/** 属性名称(中文) */
private String attName;
/** 属性取值范围(格式:最小值|最大值) */
private String attRange;
/** 属性单位 */
private String attUnit;
/** 是否为内置属性 */
private boolean builtIn;
/** 枚举信息 */
private String enumInfo;
/** 是否为关键属性 */
private boolean isKey;
/** 是否为公共属性 */
private boolean isPublic;
/** 是否可搜索 */
private boolean isSearch;
/** 是否为文本域 */
private boolean isTextarea;
/** 模型信息(可以是对象或数组,此处定义为具体对象) */
private List<ModelInfo> mdlInfo;
/** 是否只读0-可编辑1-只读) */
private int readOnly;
}

View File

@@ -0,0 +1,18 @@
package com.solution.rule.domain.request;
import lombok.Data;
/**
* 字典项实体
*/
@Data
public class DictItem {
/** 编码 */
private String code;
/** 说明 */
private String explain;
/** 名称 */
private String name;
/** 唯一标识符 */
private String uuid;
}

View File

@@ -0,0 +1,10 @@
package com.solution.rule.domain.request;
import lombok.Data;
@Data
public class Equipments {
}

View File

@@ -0,0 +1,16 @@
package com.solution.rule.domain.request;
import lombok.Data;
@Data
public class Force {
//对象句柄
private String ObjectHandle;
//类型
private Integer type;
}

View File

@@ -0,0 +1,26 @@
package com.solution.rule.domain.request;
import lombok.Data;
import java.util.List;
/**
* 阵营实体
*/
@Data
public class ForceSides {
//分组类型
private String groupType;
private List<Force> postures;
//对象句柄
private String ObjectHandle;
//阵营名称
private String ForceSideName;
//作战目标
private String warGoal;
}

View File

@@ -0,0 +1,35 @@
package com.solution.rule.domain.request;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.util.List;
/**
* 模型信息实体
*/
@Data
public class ModelInfo {
/** 模型ID */
@JsonProperty("_id")
private String id;
/** 类别 */
private String category;
/** 分类ID */
private String classifyId;
/** 分类名称 */
private String classifyName;
/** 创建时间(时间戳) */
private long createTime;
/** 字典项列表 */
private List<DictItem> dict;
/** 模型系统ID */
private int mxSysId;
/** 名称 */
private String name;
/** 角色ID */
private int roleId;
/** 空间ID */
private int spaceId;
/** 更新时间(时间戳) */
private long updateTime;
}

View File

@@ -0,0 +1,20 @@
package com.solution.rule.domain.request;
import lombok.Data;
import java.util.List;
import java.util.Map;
/**
* 引用属性对象
*/
@Data
public class RefAttributeObject {
//属性列表
private Map<String, List<Attribute>> attributes;
private TrackParam trackParam;
}

View File

@@ -0,0 +1,23 @@
package com.solution.rule.domain.request;
import lombok.Data;
import java.util.List;
/**
* 接收智唐接口实体
*/
@Data
public class RequestDTO {
//引用属性对象(设备属性定义)
private RefAttributeObject refAttributeObject;
//阵营列表
private List<ForceSides> forceSides;
//装备列表
private List<Equipments> equipments;
//private List<Tasks> tasks;
}

View File

@@ -0,0 +1,26 @@
package com.solution.rule.domain.request;
import lombok.Data;
import java.util.List;
@Data
public class Track {
//航迹名称
private String name;
//航迹开始时间
private int StartTime;
//航迹结束时间
private int EndTime;
//航迹类型
private String TrackType;
//航迹高度类型
private String HeightType;
//航迹海面类型
private String seaType;
//航迹点集合
private List<TrackPoint> TrackPoints;
//航迹所属阵营
private String Color;
//航迹总点数
private int PointCount;
}

View File

@@ -0,0 +1,13 @@
package com.solution.rule.domain.request;
import javax.sound.midi.Track;
import java.util.List;
import java.util.Map;
/**
* 航迹参数
*/
public class TrackParam {
private Map<String, List<Track>> tracks;
}

View File

@@ -0,0 +1,26 @@
package com.solution.rule.domain.request;
import lombok.Data;
/**
* 航迹节点实体
*/
@Data
public class TrackPoint {
//航迹索引
private String index;
//经度
private String longitude;
//纬度
private String latitude;
//高度
private String height;
//航速
private String speed;
//航向角
private String psia;
//时间
private String time;
//活动
private String active;
}

View File

@@ -0,0 +1,19 @@
package com.solution.rule.domain.simplerulepojo;
import lombok.Data;
@Data
public class ComponentParam {
//唯一标识符
private String uuid;
//组件默认参数
private String attDefaultValue;
//参数单位
private String attExplain;
//组件数量
private Integer number;
}

View File

@@ -0,0 +1,18 @@
package com.solution.rule.domain.simplerulepojo;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class Coordinate {
//经度
private BigDecimal longitude;
//纬度
private BigDecimal latitude;
//高度
private Integer height;
}

View File

@@ -0,0 +1,19 @@
package com.solution.rule.domain.simplerulepojo;
import lombok.Data;
import java.util.List;
@Data
public class SubComponents {
//设备id
private String deviceId;
//设备名称
private String deviceName;
//设备组件参数
private List<ComponentParam> componentParams;
}

View File

@@ -0,0 +1,42 @@
package com.solution.rule.domain.simplerulepojo;
import lombok.Data;
import java.util.List;
/**
* 简单任务实体
*/
@Data
public class Task {
//任务id
private String id;
//任务名称
private String drawName;
//任务类型
private String dataType;
//任务所属阵营
private String side;
//任务威胁等级(1-3)
private String threatLevel;
//任务航迹
private List<TrackPoints> trackPoints;
//任务武器
private List<Weapon> taskWeapons;
//任务目标id
private String targetId;
//作战区经纬高
private List<Coordinate> warZoneLocation;
//防区经纬高
private List<Coordinate> defZoneLocation;
}

View File

@@ -0,0 +1,24 @@
package com.solution.rule.domain.simplerulepojo;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class TrackPoints extends Coordinate{
// 轨迹索引
private Integer index;
// // 轨迹点经度
// private BigDecimal longitude;
//
// // 轨迹点纬度
// private BigDecimal latitude;
//
// // 轨迹点高度
// private Integer height;
//速度
private Integer speed;
}

View File

@@ -0,0 +1,30 @@
package com.solution.rule.domain.simplerulepojo;
import lombok.Data;
import java.util.List;
@Data
public class Weapon {
//装备id
private String equipmentId;
//装备名称
private String name;
//装备类型
private String supportType;
//装备组件
private List<SubComponents> components;
//装备部署位置(经纬高)
private Coordinate coordinate;
//武器数量
private Integer number;
//目标id
private String targetId;
}

View File

@@ -0,0 +1,12 @@
package com.solution.rule.domain.simplerulepojo.fact;
import com.solution.rule.domain.simplerulepojo.Task;
import lombok.Data;
@Data
public class FactTask {
private Task blueTask;
private Task redTask;
}

View File

@@ -7,10 +7,12 @@ import com.solution.common.constant.PlatformAndModuleConstants;
import com.solution.rule.domain.PlatformComponent;
import com.solution.rule.domain.RuleParam;
import com.solution.rule.domain.dto.WeaponModelDTO;
import com.solution.rule.handler.opponent.OpponentParamChain;
import com.solution.rule.domain.vo.ComponentCountVO;
import com.solution.rule.domain.vo.PlatformWeaponAggregateVO;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -26,6 +28,9 @@ public class WarplaneHandler extends AbstractRuleChainHandler {
// 组件数量增量常量
private static final long COMPONENT_COUNT_INCREMENT = 1;
@Resource
private OpponentParamChain opponentParamChain;
@Override
public RuleParam doHandler(RuleParam ruleParam) {
// 1. 参数校验
@@ -52,12 +57,16 @@ public class WarplaneHandler extends AbstractRuleChainHandler {
if(component.getName().equals(databaseWeapon.getComponentName())){
PlatformComponent component1 = new PlatformComponent();
component1.setName(databaseWeapon.getComponentName());
// TODO
component1.setPlatformParams(CollUtil.isNotEmpty(component.getPlatformParams())
? component.getPlatformParams()
: dto.getPlatformParams());
opponentParamChain.apply(ruleParam, dto, componentList);
if(databaseWeapon.getCount() > component.getNum()){
component1.setNum(component.getNum() + COMPONENT_COUNT_INCREMENT);
}else {
component1.setNum(databaseWeapon.getCount());
}
//TODO 补充基本信息 暂未完成
componentList.add(component1);
}
}

View File

@@ -0,0 +1,18 @@
package com.solution.rule.handler.opponent;
public abstract class AbstractOpponentParamHandler {
private AbstractOpponentParamHandler next;
public abstract void handle(OpponentParamContext context);
protected void doNext(OpponentParamContext context) {
if (next == null) return;
next.handle(context);
}
public void setNext(AbstractOpponentParamHandler next) {
this.next = next;
}
}

View File

@@ -0,0 +1,24 @@
package com.solution.rule.handler.opponent;
import com.solution.rule.domain.PlatformComponent;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
@Component
@Order(2)
public class Ammo20Handler extends AbstractOpponentParamHandler {
@Override
public void handle(OpponentParamContext context) {
Long ammo = context.getParamLong("ammo");
if (ammo != null && ammo <= 20) {
PlatformComponent reaction = new PlatformComponent();
reaction.setType("weapon");
reaction.setName("reaction_ammo_le_20");
reaction.setNum(1L);
context.addReactionComponent(reaction);
}
doNext(context);
}
}

View File

@@ -0,0 +1,24 @@
package com.solution.rule.handler.opponent;
import com.solution.rule.domain.PlatformComponent;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
@Component
@Order(3)
public class Distance50Handler extends AbstractOpponentParamHandler {
@Override
public void handle(OpponentParamContext context) {
Long distance = context.getParamLong("distance");
if (distance != null && distance <= 50) {
PlatformComponent reaction = new PlatformComponent();
reaction.setType("weapon");
reaction.setName("reaction_distance_le_50");
reaction.setNum(1L);
context.addReactionComponent(reaction);
}
doNext(context);
}
}

View File

@@ -0,0 +1,21 @@
package com.solution.rule.handler.opponent;
import com.solution.rule.domain.PlatformComponent;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
@Component
@Order(4)
public class FallbackHandler extends AbstractOpponentParamHandler {
@Override
public void handle(OpponentParamContext context) {
PlatformComponent reaction = new PlatformComponent();
reaction.setType("weapon");
reaction.setName("reaction_default");
reaction.setNum(0L);
context.addReactionComponent(reaction);
doNext(context);
}
}

View File

@@ -0,0 +1,40 @@
package com.solution.rule.handler.opponent;
import cn.hutool.core.collection.CollUtil;
import com.solution.rule.domain.PlatformComponent;
import com.solution.rule.domain.RuleParam;
import com.solution.rule.domain.dto.WeaponModelDTO;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.util.List;
@Component
public class OpponentParamChain {
@Resource
private List<AbstractOpponentParamHandler> handlers;
private AbstractOpponentParamHandler first;
@PostConstruct
private void construct() {
if (CollUtil.isEmpty(handlers)) {
return;
}
this.first = handlers.get(0);
for (int i = 0; i < handlers.size(); i++) {
AbstractOpponentParamHandler current = handlers.get(i);
AbstractOpponentParamHandler next = (i == handlers.size() - 1) ? null : handlers.get(i + 1);
current.setNext(next);
}
}
public void apply(RuleParam ruleParam, WeaponModelDTO dto, List<PlatformComponent> resultComponents) {
if (first == null) return;
OpponentParamContext context = new OpponentParamContext(ruleParam, dto, resultComponents);
first.handle(context);
}
}

View File

@@ -0,0 +1,88 @@
package com.solution.rule.handler.opponent;
import com.solution.rule.domain.PlatformComponent;
import com.solution.rule.domain.RuleParam;
import com.solution.rule.domain.dto.WeaponModelDTO;
import lombok.Getter;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@Getter
public class OpponentParamContext {
private static final Pattern NUMBER_PATTERN = Pattern.compile("(\\d+(?:\\.\\d+)?)");
private final RuleParam ruleParam;
private final WeaponModelDTO weaponModelDTO;
private final List<PlatformComponent> resultComponents;
private final Map<String, String> paramMap;
public OpponentParamContext(RuleParam ruleParam, WeaponModelDTO weaponModelDTO, List<PlatformComponent> resultComponents) {
this.ruleParam = ruleParam;
this.weaponModelDTO = weaponModelDTO;
this.resultComponents = resultComponents;
this.paramMap = parseParams(weaponModelDTO);
}
public String getParamRaw(String key) {
if (key == null) return null;
return paramMap.get(key.toLowerCase(Locale.ROOT));
}
public Long getParamLong(String key) {
String raw = getParamRaw(key);
if (raw == null) return null;
Matcher m = NUMBER_PATTERN.matcher(raw);
if (!m.find()) return null;
try {
return (long) Double.parseDouble(m.group(1));
} catch (Exception e) {
return null;
}
}
public void addReactionComponent(PlatformComponent component) {
if (component == null || component.getName() == null) return;
for (PlatformComponent existing : resultComponents) {
if (component.getName().equals(existing.getName())) {
return;
}
}
resultComponents.add(component);
}
private static Map<String, String> parseParams(WeaponModelDTO dto) {
Map<String, String> map = new HashMap<>();
if (dto == null || dto.getPlatformParams() == null) return map;
for (String item : dto.getPlatformParams()) {
if (item == null) continue;
String s = item.trim();
if (s.isEmpty()) continue;
String[] parts;
if (s.contains("=")) {
parts = s.split("=", 2);
} else if (s.contains(":")) {
parts = s.split(":", 2);
} else if (s.contains("")) {
parts = s.split("", 2);
} else {
continue;
}
if (parts.length != 2) continue;
String key = parts[0].trim().toLowerCase(Locale.ROOT);
String val = parts[1].trim();
if (!key.isEmpty() && !val.isEmpty()) {
map.put(key, val);
}
}
return map;
}
}

View File

@@ -0,0 +1,123 @@
## opponent对方参数嵌套责任链说明
本目录新增了一套**“嵌套责任链”**,用于在已有规则链(`AbstractRuleChainHandler` / `RuleChainHandler`)执行过程中,再额外对“对方传入的平台参数”做二次判断,并把**我方的反应**写入到 `RuleParam.resultWeapons` 对应平台的 `components` 中。
> 你原本已经在用“规则链”处理 `RuleParam`;这里是在 `WarplaneHandler` 内部再次调用一条新的链,因此属于 **责任链嵌套责任链**。
---
### 1. 改动点概览(这个目录配套的改动)
- **`WeaponModelDTO` 增加字段**
- `platformParams: List<String>`
- 用于接收平台维度的参数列表(例如对方速度、弹量、距离等)。
- **`PlatformComponent` 增加字段**
- `platformParams: List<String>`
- 用于在“组件维度”也能承载同样的参数(如果你希望参数挂在组件上)。
- **`WarplaneHandler`第55行 `// TODO` 下方)接入嵌套链**
- 将平台参数透传到结果组件 `component1.platformParams`
- 优先取 `component.platformParams`
- 若组件没传,则取 `dto.platformParams`
- 调用 `OpponentParamChain.apply(ruleParam, dto, componentList)`
- 读取 `dto.platformParams` 中的对方参数
- 按责任链规则生成“反应组件”
- 把反应组件加入当前平台的 `componentList`(最终进入 `RuleParam.resultWeapons`
---
### 2. 对方参数的传参格式约定
目前解析逻辑位于 `OpponentParamContext`,支持以下分隔符:
- `key=value`
- `key:value`
- `keyvalue`(中文冒号)
并会从 `value` 中提取**第一个数字**作为判断依据(例如 `200km` 会提取为 `200`)。
建议前端/调用方传参示例:
```text
["speed=200km", "ammo=20", "distance=50km"]
```
目前内置识别的 key
- `speed`:速度
- `ammo`:弹量
- `distance`:距离
---
### 3. 目录结构与职责(类说明)
- **`OpponentParamChain`**
- 责任链的“组装与入口”。
- Spring `@Component` + `@PostConstruct`:自动获取容器中的 `AbstractOpponentParamHandler` 实现列表并按顺序串起来。
- `apply(ruleParam, dto, resultComponents)`:对外入口,创建上下文并触发链路执行。
- **`AbstractOpponentParamHandler`**
- 对方参数链的抽象 Handler。
- 只负责:
- `handle(context)`:当前节点处理
- `doNext(context)`:传递到下一个节点
- **`OpponentParamContext`**
- 链路执行上下文(把链执行需要的对象集中起来):
- `RuleParam ruleParam`:当前规则执行参数
- `WeaponModelDTO weaponModelDTO`:当前处理的平台 DTO承载 `platformParams`
- `List<PlatformComponent> resultComponents`:本平台最终要返回的组件列表(也就是要写入 `resultWeapons` 的列表)
- 关键能力:
- `getParamLong(key)`:从 `platformParams` 中按 key 取值并解析出数字
- `addReactionComponent(component)`:把“反应组件”加入 `resultComponents`(按 name 做简单去重,避免循环里重复加入)
---
### 4. 当前内置的 4 个链节点(最少四个)
这 4 个节点都实现了 `AbstractOpponentParamHandler`,并通过 `@Order` 控制执行顺序:
- **`Speed200Handler`@Order(1)**
- 条件:`speed >= 200`
- 反应:加入组件
- `name = reaction_speed_ge_200`
- `type = weapon`
- `num = 1`
- **`Ammo20Handler`@Order(2)**
- 条件:`ammo <= 20`
- 反应:加入组件
- `name = reaction_ammo_le_20`
- `type = weapon`
- `num = 1`
- **`Distance50Handler`@Order(3)**
- 条件:`distance <= 50`
- 反应:加入组件
- `name = reaction_distance_le_50`
- `type = weapon`
- `num = 1`
- **`FallbackHandler`@Order(4)**
- 兜底:无论是否命中其它规则,都加入一个默认反应(便于你观察链是否运行)
- 反应:加入组件
- `name = reaction_default`
- `type = weapon`
- `num = 0`
> 注意:这些“反应组件”目前只是用 `PlatformComponent` 承载并加入到返回的 `components` 列表中,保证**一定能落到 `RuleParam.resultWeapons`**。
---
### 5. 如何扩展新规则(你后续要加更多链节点时)
按照下面步骤即可:
1. 在本目录新增一个类,继承 `AbstractOpponentParamHandler`
2. 加上 `@Component``@Order(n)`n 决定执行顺序)
3.`handle` 中从 `context.getParamLong("xxx")` 取值判断
4. 组装一个 `PlatformComponent` 作为“反应”,调用 `context.addReactionComponent(...)`
5. 最后 `doNext(context)` 传递到下一节点

View File

@@ -0,0 +1,24 @@
package com.solution.rule.handler.opponent;
import com.solution.rule.domain.PlatformComponent;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
@Component
@Order(1)
public class Speed200Handler extends AbstractOpponentParamHandler {
@Override
public void handle(OpponentParamContext context) {
Long speed = context.getParamLong("speed");
if (speed != null && speed >= 200) {
PlatformComponent reaction = new PlatformComponent();
reaction.setType("weapon");
reaction.setName("reaction_speed_ge_200");
reaction.setNum(1L);
context.addReactionComponent(reaction);
}
doNext(context);
}
}

View File

@@ -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<Platform> findPlatformComponents(Integer scenarioId);
List<Platform> findAllPlatformComponents();
List<BasicPlatform> findAllBasicPlatformComponents();
}

View File

@@ -0,0 +1,120 @@
//package com.solution.rule.parser;
//
//import com.fasterxml.jackson.core.JsonParser;
//import com.fasterxml.jackson.core.JsonToken;
//import com.fasterxml.jackson.databind.ObjectMapper;
//import javax.servlet.http.HttpServletRequest;
//import java.io.IOException;
//import java.util.*;
//
//public class JsonStreamParser {
//
// // 核心:解析所有集合 → 内存关联ID → 组装完整数据
// public List<AssembledWeapon> parseAndAssemble(HttpServletRequest request) throws IOException {
// ObjectMapper mapper = new ObjectMapper();
// try (JsonParser parser = mapper.getFactory().createParser(request.getInputStream())) {
//
// // ========== 步骤1流式解析把所有关联集合存到内存 ==========
// String version = null;
// // 存储所有集合key=集合名(weaponList/weaponParams)value=数据列表
// Map<String, List<Map<String, Object>>> allCollections = new HashMap<>();
//
// // 解析状态
// String currentCollection = null;
// Map<String, Object> currentItem = null;
//
// JsonToken token;
// while ((token = parser.nextToken()) != null) {
// switch (token) {
// case START_OBJECT:
// if (currentCollection != null) currentItem = new HashMap<>();
// break;
// case END_OBJECT:
// if (currentCollection != null && currentItem != null) {
// allCollections.get(currentCollection).add(currentItem);
// currentItem = null;
// }
// break;
// case START_ARRAY:
// currentCollection = parser.getCurrentName();
// allCollections.putIfAbsent(currentCollection, new ArrayList<>());
// break;
// case END_ARRAY:
// currentCollection = null;
// break;
// case FIELD_NAME:
// String field = parser.getCurrentName();
// // 解析版本号
// if ("version".equals(field) && isInMeta(parser)) {
// version = parser.nextTextValue();
// break;
// }
// // 解析普通字段
// if (currentItem != null) {
// parser.nextToken();
// currentItem.put(field, getValue(parser));
// }
// break;
// }
// }
//
// // ========== 步骤2核心通过ID关联匹配组装完整数据 ==========
// return assembleFullWeaponData(allCollections);
// }
// }
//
// /**
// * 【核心逻辑】ID关联匹配武器列表 + 参数列表 → 完整武器
// */
// private List<AssembledWeapon> assembleFullWeaponData(Map<String, List<Map<String, Object>>> allCollections) {
// List<AssembledWeapon> result = new ArrayList<>();
//
// // 1. 获取武器主列表
// List<Map<String, Object>> weaponList = allCollections.getOrDefault("weaponList", Collections.emptyList());
// // 2. 获取武器参数列表
// List<Map<String, Object>> paramList = allCollections.getOrDefault("weaponParams", Collections.emptyList());
//
// // 3. 构建【ID -> 参数】索引MapO(1)快速匹配,效率最高)
// Map<Long, Map<String, Object>> paramIndex = new HashMap<>();
// for (Map<String, Object> param : paramList) {
// Long weaponId = Long.valueOf(param.get("weaponId").toString());
// paramIndex.put(weaponId, param);
// }
//
// // 4. 遍历武器通过ID匹配参数组装完整对象
// for (Map<String, Object> weapon : weaponList) {
// AssembledWeapon fullWeapon = new AssembledWeapon();
// Long weaponId = Long.valueOf(weapon.get("id").toString());
//
// // 填充基础信息
// fullWeapon.setId(weaponId);
// fullWeapon.setName((String) weapon.get("name"));
//
// // 匹配参数通过ID
// Map<String, Object> param = paramIndex.get(weaponId);
// if (param != null) {
// fullWeapon.setDamage(Integer.valueOf(param.get("damage").toString()));
// fullWeapon.setMagazine(Integer.valueOf(param.get("magazine").toString()));
// fullWeapon.setType((String) param.get("type"));
// }
//
// result.add(fullWeapon);
// }
//
// return result;
// }
//
// // ---------------- 工具方法 ----------------
// private boolean isInMeta(JsonParser parser) {
// return parser.getParsingContext().getParent() != null
// && "meta".equals(parser.getParsingContext().getParent().getCurrentName());
// }
//
// private Object getValue(JsonParser parser) throws IOException {
// if (parser.getCurrentToken().isNumeric()) return parser.getLongValue();
// if (parser.getCurrentToken() == JsonToken.VALUE_STRING) return parser.getText();
// if (parser.getCurrentToken() == JsonToken.VALUE_TRUE) return true;
// if (parser.getCurrentToken() == JsonToken.VALUE_FALSE) return false;
// return null;
// }
//}

View File

@@ -1,8 +1,10 @@
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;
import com.solution.rule.domain.simplerulepojo.Task;
import com.solution.rule.domain.vo.PlatformComponentNamesVO;
import com.solution.rule.domain.vo.PlatformWeaponAggregateVO;
@@ -47,4 +49,13 @@ public interface FireRuleService {
List<Platform> findPlatformComponents(Integer scenarioId);
List<Platform> findAllPlatformComponents();
List<BasicPlatform> findAllBasicPlatformComponents();
/**
* 开始执行规则匹配
* @param task
* @return
*/
Task executeTask(Task task);
}

View File

@@ -3,19 +3,22 @@ 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.simplerulepojo.Task;
import com.solution.rule.domain.simplerulepojo.Weapon;
import com.solution.rule.domain.vo.ComponentCountVO;
import com.solution.rule.domain.vo.PlatformComponentNamesVO;
import com.solution.rule.domain.vo.PlatformWeaponAggregateVO;
import com.solution.rule.domain.vo.WeaponModelVO;
import com.solution.rule.mapper.FireRuleMapper;
import com.solution.rule.service.FireRuleService;
import com.solution.rule.simpstrategy.FireRUleType;
import com.solution.rule.simpstrategy.FireRuleStrategy;
import com.solution.rule.simpstrategy.FireRuleStrategyFactory;
import com.solution.rule.strategy.SceneStrategy;
import com.solution.rule.strategy.SceneStrategyFactory;
import org.kie.api.KieBase;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -33,9 +36,15 @@ public class FireRuleServiceImpl implements FireRuleService {
@Autowired
private SceneStrategyFactory strategyFactory;
@Autowired
private FireRuleStrategyFactory fireStrategyFactory;
@Autowired
private FireRuleMapper ruleMapper;
@Autowired
private KieBase kieBase;
/* @Override
public WeaponModelVO execute(Integer sceneType, WeaponModelDTO weaponModelDTO) {
if(ObjectUtil.isNull(sceneType) || ObjectUtil.isEmpty(weaponModelDTO)){
@@ -155,6 +164,28 @@ public class FireRuleServiceImpl implements FireRuleService {
return ruleMapper.getComponents(platformId);
}
/**
* 执行任务
* @param task
* @return
*/
@Override
public Task executeTask(Task task) {
if(ObjectUtil.isEmpty(task)){
throw new RuntimeException(ExceptionConstants.PARAMETER_EXCEPTION);
}
String dataType = task.getDataType();
if("打击".contains(dataType)){
FireRuleStrategy strategy = fireStrategyFactory.getStrategy(0);
task = strategy.mappingTask(task);
} else {
FireRuleStrategy strategy = fireStrategyFactory.getStrategy(1);
task = strategy.mappingTask(task);
}
return task;
}
/**
* 获取所有组件以及数量
* @return
@@ -181,4 +212,9 @@ public class FireRuleServiceImpl implements FireRuleService {
return ruleMapper.findAllPlatformComponents();
}
@Override
public List<BasicPlatform> findAllBasicPlatformComponents() {
return ruleMapper.findAllBasicPlatformComponents();
}
}

View File

@@ -0,0 +1,40 @@
package com.solution.rule.simpstrategy;
import com.solution.rule.enums.SceneType;
public enum FireRUleType {
HIT(0, "打击"),
DISTURB(2, "干扰");
private final int code;
private final String description;
FireRUleType(int code, String description) {
this.code = code;
this.description = description;
}
public int getCode() {
return code;
}
public String getDescription() {
return description;
}
/**
* 根据数字编码获取对应的枚举
* @param code 前端传递的数字
* @return 枚举实例
* @throws IllegalArgumentException 如果找不到对应枚举
*/
public static FireRUleType fromCode(int code) {
for (FireRUleType type : values()) {
if (type.code == code) {
return type;
}
}
throw new IllegalArgumentException("未知的任务类型编码: " + code);
}
}

View File

@@ -0,0 +1,13 @@
package com.solution.rule.simpstrategy;
import com.solution.rule.domain.FireRuleExecuteDTO;
import com.solution.rule.domain.simplerulepojo.Task;
import com.solution.rule.enums.SceneType;
public interface FireRuleStrategy {
Task mappingTask(Task task);
FireRUleType getFireRuleType();
}

View File

@@ -0,0 +1,45 @@
package com.solution.rule.simpstrategy;
import com.solution.rule.enums.SceneType;
import com.solution.rule.strategy.SceneStrategy;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import java.util.EnumMap;
import java.util.List;
import java.util.Map;
@Component
public class FireRuleStrategyFactory {
@Autowired
private List<FireRuleStrategy> strategyList;
private final Map<FireRUleType, FireRuleStrategy> strategyMap = new EnumMap<>(FireRUleType.class);
@PostConstruct
public void init() {
for (FireRuleStrategy strategy : strategyList) {
FireRUleType type = strategy.getFireRuleType();
if (strategyMap.containsKey(type)) {
throw new IllegalStateException("重复的场景类型: " + type);
}
strategyMap.put(type, strategy);
}
}
/**
* 根据前端传递的数字编码获取对应的策略
* @param code 前端传递的数字
* @return 策略实现
* @throws IllegalArgumentException 如果编码无效或策略未注册
*/
public FireRuleStrategy getStrategy(int code) {
FireRUleType type = FireRUleType.fromCode(code);
FireRuleStrategy strategy = strategyMap.get(type);
if (strategy == null) {
throw new IllegalArgumentException("未找到任务 " + code + " 对应的策略实现");
}
return strategy;
}
}

View File

@@ -0,0 +1,50 @@
package com.solution.rule.simpstrategy.impl;
import com.solution.rule.domain.simplerulepojo.Task;
import com.solution.rule.domain.simplerulepojo.fact.FactTask;
import com.solution.rule.simpstrategy.FireRUleType;
import com.solution.rule.simpstrategy.FireRuleStrategy;
import org.kie.api.KieBase;
import org.kie.api.runtime.KieSession;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.HashMap;
import java.util.Map;
@Component
public class BlowStrategy implements FireRuleStrategy {
private static final String TASK_TYPE = "打击任务";
@Autowired
private KieBase kieBase;
@Override
public Task mappingTask(Task task) {
KieSession kieSession = kieBase.newKieSession();
FactTask factTask = new FactTask();
Task redTask = new Task();
redTask.setTargetId(task.getId());
redTask.setSide("红方");
Map<String, Object> globalParams = new HashMap<>();
kieSession.setGlobal("globalParams", globalParams);
factTask.setRedTask(redTask);
factTask.setBlueTask(task);
kieSession.insert(factTask);
// 👇 核心:根据策略选择规则组
kieSession.getAgenda()
.getAgendaGroup(TASK_TYPE)
.setFocus();
kieSession.fireAllRules();
return redTask;
}
@Override
public FireRUleType getFireRuleType() {
return FireRUleType.HIT;
}
}

View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8" ?>
<kmodule xmlns="http://www.drools.org/xsd/kmodule">
<!--
name:指定kbase的名称可以任意但是需要唯一
packages:指定规则文件的目录,需要根据实际情况填写,否则无法加载到规则文件
default:指定当前kbase是否为默认
-->
<kbase name="myKbase1" packages="rules" default="true">
<!--
name:指定ksession名称可以任意但是需要唯一
default:指定当前session是否为默认
-->
<ksession name="ksession-rule" default="true"/>
</kbase>
</kmodule>

View File

@@ -85,6 +85,16 @@
WHERE platform_id=#{platformId}
</select>
<resultMap id="VPBasicPlatformMap" type="com.solution.rule.domain.BasicPlatform">
<result property="id" column="id"/>
<result property="name" column="name"/>
<result property="description" column="description"/>
</resultMap>
<select id="findAllBasicPlatformComponents" resultMap="VPBasicPlatformMap">
SELECT *
FROM platform
</select>
<resultMap id="VPlatformMap" type="com.solution.rule.domain.Platform">
<result property="id" column="id"/>
<result property="name" column="name"/>

View File

@@ -0,0 +1,133 @@
# fire-rule.drl 说明文档
本文档对应当前 `auto-solution-rule/src/main/resources/rules/fire-rule.drl` 的实现,分为三部分:
- 业务人员修改
- 业务人员理解
- 开发人员理解
---
## 一、业务人员修改(只改这里)
只改 `buildBusinessConfig()` 的配置值,不要改 `rule/function` 代码。
### 1) 武器匹配配置
- `map_air_targets`:蓝方空中目标 -> 红方武器(逗号分隔,多选)
- `map_ground_targets`:蓝方地面目标 -> 红方武器
- `map_armor_targets`:蓝方装甲目标 -> 红方武器
- `map_artillery_targets`:蓝方炮类目标 -> 红方武器
- `map_missile_targets`:蓝方导弹能力目标 -> 红方武器
- `enableAirRule/enableGroundRule/enableArmorRule/enableMissileVehicleRule`:是否启用对应策略
- `allowMultiGroup`:是否允许多组策略叠加
### 2) 导弹联动配置
- `enableMissileLinkage`:导弹联动开关
- `missileCountOffset`:红方导弹数量偏移
- `missileRangeOffset`:红方导弹范围偏移
- `minBlueMissileCountForLinkage`:蓝方导弹数量触发阈值
### 3) targetId 绑定配置
- `enableTargetAutoBind`:是否自动给红方武器写 `targetId`
- `minTargetBindRatio`:最低绑定比例(例:`0.7`
- `allowReserveWithoutTarget`:是否允许少量红方武器 `targetId` 为空
### 4) 阵位部署配置
- `enablePositionRules`:阵位规则总开关
- `fireUnitSpacingMeters`:火力单元间距(米)
- `airDeployZonePreference`:飞机优先区(`combat`/`defense`
- `defensePriorityWeapons`:优先防区部署武器(逗号分隔)
- `groundDeployHeight` / `airDeployHeight`:地面/空中部署高度
- 区域输入固定来自 `blueTask.warZoneLocation``blueTask.defZoneLocation`(各 4 点经纬度)
### 5) 航迹策略配置
- `enableTrajectoryRules`:航迹规则总开关
- `strategyMode``auto/shortest/flank/interfere`
- `enableShortest/enableFlank/enableInterfere`:策略开关
- `nearDefDistanceMeters``farDefDistanceMeters``fastSpeedThreshold`:智能选择阈值
- `flankOffsetMeters`:绕后偏移
- `interfereOffsetMeters``interfereZigzagAmplitude`:干扰偏移与摆动
- `keepBlueHeight`:是否沿用蓝方高度
- `redTrackHeightOverride`:不沿用时红方统一高度
---
## 二、业务人员理解(规则在做什么)
### 1) 武器匹配
- 根据蓝方武器类型匹配红方武器。
- 映射可多选,可关闭,可允许不命中。
### 2) 组件与参数
- 红方武器自动补组件和参数。
- 炮类武器组件限制为“炮弹”,单位“范围米”。
### 3) 任务自动命名
- 任务名按红方最终武器自动生成,确保名称和武器一致。
### 4) 目标绑定
- 红方武器 `targetId` 自动绑定蓝方 `equipmentId`
- 支持同类优先匹配和绑定比例控制。
- 允许少量空目标做火力冗余。
### 5) 阵位部署
- 依据作战区/防区多边形4点生成部署点。
- 飞机按偏好区部署,重火力优先防区。
- 支持“每 N 米一个火力单元”覆盖。
### 6) 航迹生成
- 红方 `trackPoints` 根据蓝方 `trackPoints` 生成。
- 点数保持一致。
- 策略可手动选或自动选:
- near+fast -> shortest
- far+fast -> interfere
- 其他 -> flank
### 7) 阵位输入示例Task 字段)
```json
{
"warZoneLocation": [
{ "longitude": 116.3801, "latitude": 39.9001 },
{ "longitude": 116.3901, "latitude": 39.9001 },
{ "longitude": 116.3901, "latitude": 39.9101 },
{ "longitude": 116.3801, "latitude": 39.9101 }
],
"defZoneLocation": [
{ "longitude": 116.3825, "latitude": 39.9025 },
{ "longitude": 116.3875, "latitude": 39.9025 },
{ "longitude": 116.3875, "latitude": 39.9075 },
{ "longitude": 116.3825, "latitude": 39.9075 }
]
}
```
---
## 三、开发人员理解(维护重点)
### 1) 主要规则链agenda-group: 打击任务)
- `红方武器自适应装配规则`
- `导弹联动增强规则`
- `任务自动匹配规则`
- `阵位规则-区域解析与点位生成`
- `阵位规则-武器部署赋位`
- `航迹规则-生成红方航迹`
`任务匹配1/2``装备组件匹配``组件参数匹配` 为 legacy 占位。
### 2) 关键函数
- 武器装配:`configureRedWeaponsByBlue(...)`
- 导弹联动:`applyMissileLinkage(...)`
- 任务命名:`assignTaskNameByRedWeapons(...)`
- 目标绑定:`bindTargetIdsForRedWeapons(...)`
- 阵位部署:`prepareDeploymentPools(...)``applyWeaponDeployment(...)`
- 航迹生成:`applyTrajectoryGeneration(...)``chooseTrajectoryStrategy(...)``generateRedTrackPoints(...)`
### 3) Drools 注意事项
- DRL function 避免泛型签名(如 `List<Coordinate>`),统一用原始 `List/Map`
- 读取配置统一走 `readIntCfg/readBooleanCfg/readDoubleCfg`
- 新规则尽量参数化放进 `buildBusinessConfig()`,不要硬编码常量在函数里。
### 4) 输入约定
- 阵位:`blueTask.warZoneLocation/defZoneLocation``List<Coordinate>`4 点)
- 航迹:`blueTask.trackPoints` 非空才会生成红方航迹
- 目标绑定:蓝方武器应提供 `equipmentId`

File diff suppressed because it is too large Load Diff

View File

@@ -30,10 +30,6 @@
<artifactId>solution-common</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>

View File

@@ -34,7 +34,6 @@ public class SceneServiceImpl implements SceneService {
@Transactional(rollbackFor = Exception.class)
@Override
public int saveOrUpdate(AfsimScenario afsimScenario) {
//TODO 报错待修改
if (null != afsimScenario.getId() && afsimScenario.getId() > 0) {
// 更新场景
int updated = sceneMapper.update(afsimScenario);

View File

@@ -1204,7 +1204,7 @@
.ant-tabs-content {
//padding: 15px;
padding: 4px;
background: #041832;
background: #041b36db;
}
&.settings-tab,
@@ -1508,7 +1508,9 @@
border-inline-end-width: 1px;
}
}
.ant-select:not(.ant-select-customize-input) .ant-select-selector{
border: 1px solid #2c2a2a;
}
.ant-select .ant-select-selection-placeholder,
.ant-select .ant-select-selection-search-input{
background: transparent

View File

@@ -1,7 +1,7 @@
/*
* This file is part of the kernelstudio package.
*
* (c) 2014-2025 zlin <admin@kernelstudio.com>
* (c) 2014-2026 zlin <admin@kernelstudio.com>
*
* For the full copyright and license information, please view the LICENSE file
* that was distributed with this source code.
@@ -23,14 +23,14 @@ export class EventError {
export class EventListener {
private readonly _listeners: Record<string, Function[]>;
private _listeners: Record<string, Function[]>;
constructor(listeners: Record<string, Function[]> = {}) {
this._listeners = listeners;
}
all(): Record<string, Function[]> {
return {...this._listeners}; // 返回副本,避免外部直接修改
return { ...this._listeners }; // 返回副本,避免外部直接修改
}
has(name: string): boolean {
@@ -55,16 +55,24 @@ export class EventListener {
[...listeners].forEach(f => f(options));
}
}
clear(){
for (const key in this._listeners) {
if (this._listeners.hasOwnProperty(key)) {
delete this._listeners[key];
}
}
}
}
export const safePreventDefault = (event: any) => {
if (event && typeof event.preventDefault === 'function') {
event.preventDefault();
}
}
};
export const safeStopPropagation = (event: any) => {
if (event && typeof event.stopPropagation === 'function') {
event.stopPropagation();
}
}
};

View File

@@ -0,0 +1,21 @@
/*
* This file is part of the kernelstudio package.
*
* (c) 2014-2025 zlin <admin@kernelstudio.com>
*
* For the full copyright and license information, please view the LICENSE file
* that was distributed with this source code.
*/
import { HttpRequestClient } from '@/utils/request';
import type { BasicResponse } from '@/types';
import type { PlatformListableResponse } from './types';
const req = HttpRequestClient.create<BasicResponse>({
baseURL: '/api',
});
export const findAllBasicPlatforms = (): Promise<PlatformListableResponse> => {
return req.get<PlatformListableResponse>('/system/firerule/platforms/basic');
};

View File

@@ -46,6 +46,7 @@
<script lang="ts">
import { defineComponent, nextTick, onBeforeUnmount, onMounted, ref } from 'vue';
import {useRouter} from 'vue-router';
import { message } from 'ant-design-vue';
import { getTeleport } from '@antv/x6-vue-shape';
import { Graph, Node, type NodeProperties } from '@antv/x6';
@@ -54,8 +55,9 @@ import { Wrapper } from '@/components/wrapper';
import { safePreventDefault, safeStopPropagation } from '@/utils/event';
import Header from '../header.vue';
import type { PlatformWithComponents, Scenario } from './types';
import { createGraphTaskElement, createLineOptions, type GraphContainer, type GraphTaskElement, resolveGraph, useGraphCanvas } from '../graph';
import type { Scenario } from './types';
import type { PlatformWithComponents } from '../types';
import { createLineOptions, type GraphContainer, type GraphTaskElement, resolveGraph, useGraphCanvas } from '../graph';
import { registerScenarioElement } from './register';
import { createGraphScenarioElement, createGraphTaskElementFromScenario } from './utils';
@@ -63,7 +65,7 @@ import { createGraphScenarioElement, createGraphTaskElementFromScenario } from '
import PlatformCard from './platform-card.vue';
import NodesCard from './nodes-card.vue';
import { saveScenario } from './api';
import {resolveConnectionRelation} from './relation'
import { resolveConnectionRelation } from './relation';
const TeleportContainer = defineComponent(getTeleport());
@@ -82,6 +84,7 @@ export default defineComponent({
TeleportContainer,
},
setup() {
const router = useRouter();
const canvas = ref<HTMLDivElement | null>(null);
const graph = ref<Graph | null>(null);
const currentZoom = ref<number>(1);
@@ -105,6 +108,19 @@ export default defineComponent({
resizeCanvas,
} = useGraphCanvas();
const destroy = ()=> {
window.removeEventListener('resize', handleResize);
if (graph.value) {
try {
graph.value.clearCells();
} catch (error) {
console.warn('销毁画布时出错:', error);
}
graph.value = null;
console.log('画布已销毁');
}
}
// 处理拖动开始
const handleDragStart = (nm: PlatformWithComponents) => {
draggedNodeData.value = nm;
@@ -293,6 +309,23 @@ export default defineComponent({
currentScenarioEditing.value = null !== currentScenario.value;
});
handleGraphEvent('node:dblclick', (args: any) => {
const node = args.node as Node<NodeProperties>;
const element = node.getData() as GraphTaskElement;
console.error('element',element)
if(element && element.platformId ){
window.location.href = `/app/decision/designer?platform=${element.platformId}`
} else {
window.location.href = '/app/decision/designer'
}
// destroy()
// window.location.href = '/app/decision/designer'
// router.push({
// path: '/app/decision/designer'
// })
});
handleGraphEvent('node:click', (args: any) => {
const node = args.node as Node<NodeProperties>;
const newElement = node.getData() as GraphTaskElement;
@@ -382,18 +415,7 @@ export default defineComponent({
});
// 清理
onBeforeUnmount(() => {
window.removeEventListener('resize', handleResize);
if (graph.value) {
try {
graph.value.clearCells();
} catch (error) {
console.warn('销毁画布时出错:', error);
}
graph.value = null;
console.log('画布已销毁');
}
});
onBeforeUnmount(() => destroy());
return {
scenariosCardRef,

View File

@@ -7,8 +7,9 @@
* that was distributed with this source code.
*/
import { Graph, Node,Edge } from '@antv/x6';
import type { Platform, PlatformComponent, PlatformRelation } from './types';
import { Edge, Graph, Node } from '@antv/x6';
import type { PlatformRelation } from './types';
import type { Platform, PlatformComponent } from '../types';
import type { GraphTaskElement } from '../graph';
/**

View File

@@ -8,7 +8,7 @@
*/
import type { ApiDataResponse, NullableString, PageableResponse } from '@/types';
import type { NullableString, PageableResponse } from '@/types';
import type { GraphContainer } from '../graph';
import type { Platform, PlatformComponent } from '../types';

View File

@@ -9,7 +9,7 @@
import type { GraphRect, GraphTaskElement } from '../graph';
import { generateKey } from '@/utils/strings';
import type { PlatformWithComponents } from './types';
import type { PlatformWithComponents } from '../types';
export const createGraphTaskElementFromScenario = (
platform: PlatformWithComponents,
@@ -28,6 +28,7 @@ export const createGraphTaskElementFromScenario = (
template: 0,
templateType: null,
category: null,
multiable: false,
group: null,
description: platform.description,
order: 0,

View File

@@ -24,6 +24,10 @@ export const findTreesByQuery = (query: Partial<BehaviorTreeRequest> = {}): Prom
return req.get<BehaviorTreePageResponse>('/system/behaviortree/list', query);
};
export const findOneTreeByPlatformId = (platformId: number): Promise<BehaviorTreeDetailsResponse> => {
return req.get(`/system/behaviortree/platform/${platformId}`);
};
export const findOneTreeById = (id: number): Promise<BehaviorTreeDetailsResponse> => {
return req.get(`/system/behaviortree/${id}`);
};

View File

@@ -37,6 +37,7 @@
</div>
<Properties
v-if="graph"
:platforms="platforms"
:element="selectedNodeTaskElement"
:graph="graph as any"
:node="selectedModelNode as any"
@@ -51,6 +52,7 @@
<script lang="ts">
import { defineComponent, nextTick, onBeforeUnmount, onMounted, ref } from 'vue';
import { useRoute } from 'vue-router';
import { message } from 'ant-design-vue';
import { getTeleport } from '@antv/x6-vue-shape';
import { Graph, Node, type NodeProperties } from '@antv/x6';
@@ -65,8 +67,9 @@ import { createGraphTaskElementFromTemplate } from './utils';
import { createGraphTaskElement, createLineOptions, type GraphContainer, type GraphTaskElement, hasElements, hasRootElementNode, resolveGraph, useGraphCanvas } from '../graph';
import { registerNodeElement } from './register';
import { createTree, findOneTreeById, updateTree } from './api';
import { findAllBasicPlatforms } from '../api';
import type { Platform } from '../types';
import { createTree, findOneTreeById, updateTree, findOneTreeByPlatformId } from './api';
import TressCard from './trees-card.vue';
import NodesCard from './nodes-card.vue';
@@ -88,6 +91,7 @@ export default defineComponent({
TeleportContainer,
},
setup() {
const currentRoute = useRoute();
const canvas = ref<HTMLDivElement | null>(null);
const graph = ref<Graph | null>(null);
const currentZoom = ref<number>(1);
@@ -100,6 +104,7 @@ export default defineComponent({
const selectedNodeTaskElement = ref<GraphTaskElement | null>(null);
const changed = ref<boolean>(false);
const treesCardRef = ref<InstanceType<typeof TressCard> | null>(null);
const platforms = ref<Platform[]>([]);
const {
handleGraphEvent,
@@ -109,8 +114,23 @@ export default defineComponent({
fitToScreen,
centerContent,
resizeCanvas,
destroyGraph,
clearGraph,
} = useGraphCanvas();
const destroy = ()=> {
window.removeEventListener('resize', handleResize);
destroyGraph();
graph.value = null;
}
const loadPlatforms = () => {
platforms.value = [];
findAllBasicPlatforms().then(r => {
platforms.value = r.data ?? [];
});
};
// 处理拖动开始
const handleDragStart = (nm: NodeDragTemplate) => {
draggedNodeData.value = nm;
@@ -201,6 +221,8 @@ export default defineComponent({
};
const handleSelectTree = (tree: BehaviorTree) => {
destroyGraph();
console.info('handleSelectTree', tree);
findOneTreeById(tree.id).then(r => {
if (r.data) {
@@ -221,7 +243,9 @@ export default defineComponent({
graph: nodeGraph,
};
currentTreeEditing.value = true;
createElements();
nextTick(() => {
initGraph();
});
} else {
message.error(r.msg ?? '行为树不存在.');
}
@@ -229,12 +253,8 @@ export default defineComponent({
};
const createElements = () => {
clearGraph();
nextTick(() => {
try {
graph.value?.clearCells();
} catch (e: any) {
console.error('clear cells error, cause:', e);
}
setTimeout(() => {
if (currentBehaviorTree.value?.graph && graph.value) {
if (currentBehaviorTree.value?.graph.nodes) {
@@ -262,6 +282,8 @@ export default defineComponent({
};
const handleCreateTree = () => {
destroyGraph();
currentBehaviorTree.value = {
id: 0,
name: '行为树',
@@ -282,7 +304,9 @@ export default defineComponent({
selectedModelNode.value = null;
selectedNodeTaskElement.value = null;
createElements();
nextTick(() => {
initGraph();
});
};
// 初始化X6画布
@@ -340,6 +364,18 @@ export default defineComponent({
initGraph();
window.addEventListener('resize', handleResize);
console.log('节点挂载完成');
const platformId = currentRoute.query.platform;
if (platformId) {
const id = Number(platformId);
if (!isNaN(id)) {
findOneTreeByPlatformId(id).then(r => {
if (r.data) {
handleSelectTree(r.data);
}
});
}
}
});
};
@@ -393,23 +429,14 @@ export default defineComponent({
// 初始化
onMounted(() => {
init();
loadPlatforms();
});
// 清理
onBeforeUnmount(() => {
window.removeEventListener('resize', handleResize);
if (graph.value) {
try {
graph.value.clearCells();
} catch (error) {
console.warn('销毁画布时出错:', error);
}
graph.value = null;
console.log('画布已销毁');
}
});
onBeforeUnmount(() => destroy());
return {
platforms,
treesCardRef,
handleCreateTree,
currentTreeEditing,

View File

@@ -69,61 +69,71 @@
</a-tabs>
<a-tabs v-if="currentElement" v-model:activeKey="activeBottomTabsKey" class="ks-model-builder-tabs parameters-tabs">
<a-tabs v-if="currentElement?.parameters && currentElement?.parameters.length > 0" v-model:activeKey="activeBottomTabsKey" class="ks-model-builder-tabs parameters-tabs">
<template #leftExtra>
<span class="ks-model-builder-title-icon icon-input"></span>
</template>
<template #rightExtra v-if="multiableParameters">
<a-tooltip title="添加平台" placement="left">
<div class="ks-add-parameter-action" @click="()=> addParameterTab()">
<a-space>
<PlusCircleOutlined/>
<span>添加</span>
</a-space>
</div>
</a-tooltip>
</template>
<a-tab-pane key="1" tab="节点变量">
<template v-if="currentElement.parameters && currentElement.parameters.length > 0">
<a-form
v-if="currentElement.parameters && currentElement.parameters.length > 0"
autocomplete="off"
layout="vertical"
name="basic"
style="padding-bottom:15px;"
>
<a-form-item v-for="setting in currentElement.parameters" :label="setting.description">
<a-input-number v-if="setting.dataType === 'double'" v-model:value="setting.defaultValue" :placeholder="setting.description" size="small" style="width:100%;" />
<a-input v-else v-model:value="setting.defaultValue" :placeholder="setting.description" size="small" />
</a-form-item>
</a-form>
<a-empty v-else>
</a-empty>
<!-- <div class="w-full">-->
<!-- <a-space>-->
<!-- <a-button size="small" type="primary" @click="addVariable">添加</a-button>-->
<!-- </a-space>-->
<!-- <a-table-->
<!-- :columns="actionSpaceColumns"-->
<!-- :dataSource="currentElement.variables"-->
<!-- :pagination="false"-->
<!-- :scroll="{ x: 500 }"-->
<!-- class="mt-1"-->
<!-- row-key="key"-->
<!-- size="small"-->
<!-- style="overflow-y:auto;height:35vh;"-->
<!-- >-->
<!-- <template #bodyCell="{column, record, index}">-->
<!-- <template v-if="column.dataIndex === 'index'">-->
<!-- {{ index + 1 }}-->
<!-- </template>-->
<!-- <template v-else-if="column.dataIndex === '_actions'">-->
<!-- <a-button-->
<!-- class="btn-link-delete"-->
<!-- danger-->
<!-- size="small"-->
<!-- type="text"-->
<!-- @click="()=> removeVariable(record)"-->
<!-- >-->
<!-- 删除-->
<template v-if="multiableParameters">
<a-tabs class="ks-parameter-setting-tabs"
v-model:activeKey="groupedParametersActiveTab"
tab-position="left"
hide-add
size="small"
type="editable-card"
@edit="onEditParameterTab">
<a-tab-pane v-for="(grouped,index) in groupedParameters" :key="index" :tab="`平台 ${index + 1}`" :closable="true">
<a-form-item v-for="setting in grouped" :label="setting.description">
<a-input-number v-if="setting.dataType === 'double'"
v-model:value="setting.defaultValue"
:placeholder="setting.description" size="small" style="width:100%;" />
<a-select :placeholder="`请选择${setting.description}`"
allow-clear
v-else-if="setting.paramKey === 'platforms'" v-model:value="setting.defaultValue">
<a-select-option v-for="pl in platforms" :value="pl.name">{{pl.description}}</a-select-option>
</a-select>
<a-input v-else v-model:value="setting.defaultValue"
:placeholder="setting.description" size="small" />
</a-form-item>
</a-tab-pane>
<!-- <template #leftExtra>-->
<!-- <a-button class="ks-btn" size="small" style="margin-bottom: 15px; width: 100%" block @click="()=> addParameterTab()">-->
<!-- <PlusOutlined />-->
<!--&lt;!&ndash; <span>添加</span>&ndash;&gt;-->
<!-- </a-button>-->
<!-- </template>-->
<!-- <template v-else>-->
<!-- <a-input v-model:value="record[column.dataIndex]" size="small" />-->
<!-- </template>-->
<!-- </template>-->
<!-- </a-table>-->
<!-- </div>-->
</a-tabs>
</template>
<template v-else>
<a-form-item v-for="setting in currentElement.parameters" :label="setting.description">
<a-input-number v-if="setting.dataType === 'double'" v-model:value="setting.defaultValue"
:placeholder="setting.description" size="small" style="width:100%;" />
<a-input v-else v-model:value="setting.defaultValue" :placeholder="setting.description" size="small" />
</a-form-item>
</template>
</a-form>
</template>
<a-empty v-else>
</a-empty>
</a-tab-pane>
</a-tabs>
@@ -146,11 +156,12 @@
<script lang="ts">
import { defineComponent, onMounted, type PropType, ref, watch } from 'vue';
import { CheckOutlined } from '@ant-design/icons-vue';
import type { ElementVariable, GraphTaskElement } from '../graph';
import { CheckOutlined, PlusCircleOutlined, PlusOutlined } from '@ant-design/icons-vue';
import type { ElementParameter, ElementVariable, GraphTaskElement } from '../graph';
import type { BehaviorTree } from './tree';
import type { Graph, Node, NodeProperties } from '@antv/x6';
import { generateKey } from '@/utils/strings';
import type { Platform } from '@/views/decision/types';
const actionSpaceColumns = [
{ title: '序号', dataIndex: 'index', key: 'index', width: 40 },
@@ -161,15 +172,18 @@ const actionSpaceColumns = [
];
export default defineComponent({
components: { CheckOutlined },
components: { CheckOutlined, PlusOutlined, PlusCircleOutlined },
props: {
tree: { type: [Object, null] as PropType<BehaviorTree | null | undefined>, required: false },
treeEditing: { type: Boolean as PropType<boolean>, required: true, default: false },
node: { type: [Object, null] as PropType<Node<NodeProperties> | null | undefined>, required: false },
graph: { type: [Object, null] as PropType<Graph | null | undefined>, required: true },
platforms: { type: Array as PropType<Platform[]>, required: true },
},
emits: ['update-element', 'update-tree'],
setup(props, { emit }) {
const platforms = ref<Platform[]>(props.platforms ?? []);
const activeTopTabsKey = ref<string>('1');
const activeBottomTabsKey = ref<string>('1');
const activeBottomTabs2Key = ref<string>('1');
@@ -179,10 +193,98 @@ export default defineComponent({
const currentNode = ref<Node | null>(props.node ?? null);
const currentElement = ref<GraphTaskElement | null>(null);
const load = () => {
const emptyParameters = ref<ElementParameter[]>([]);
const groupedParameters = ref<Array<ElementParameter[]>>([]);
const multiableParameters = ref<boolean>(false);
const groupedParametersActiveTab = ref<number>(0);
const createEmptyParameters = (): ElementParameter[] => {
try {
return JSON.parse(JSON.stringify(currentElement.value?.parameters ?? [])) as ElementParameter[];
} catch (e: any) {
return [];
}
};
const dumpParameters = (): ElementParameter[] => {
return JSON.parse(JSON.stringify(emptyParameters.value)) as ElementParameter[];
};
const addParameterTab = () => {
let newParameters = dumpParameters();
// 新增一个空的参数分组
groupedParameters.value.push(newParameters);
// 自动切换到新增的分组
groupedParametersActiveTab.value = groupedParameters.value.length - 1;
};
const removeParameterTab = (index: number) => {
// 边界判断:防止删除不存在的分组 / 只剩一个分组时禁止删除
if (index < 0 || index >= groupedParameters.value.length) return;
if (groupedParameters.value.length <= 1) return;
// 从数组中删除对应索引的分组
groupedParameters.value.splice(index, 1);
if (groupedParameters.value.length === 0) {
groupedParameters.value.push(dumpParameters());
}
// 删除后处理激活状态:
// 如果删除的是最后一个分组,激活前一个
if (groupedParametersActiveTab.value >= groupedParameters.value.length) {
groupedParametersActiveTab.value = groupedParameters.value.length - 1;
}
};
const onEditParameterTab = (targetKey: number | MouseEvent, action: string) => {
if (action === 'add') {
addParameterTab();
} else {
removeParameterTab(targetKey as number);
}
};
const resolveGroupedParameters = () => {
emptyParameters.value = createEmptyParameters();
// 解构获取当前元素的关键属性,简化代码
const { multiable, parameters } = currentElement.value || {};
// 1. 不满足多分组条件:直接清空分组
if (multiable !== true || !parameters || parameters.length === 0) {
groupedParameters.value = [];
multiableParameters.value = multiable === true;
return;
}
// 2. 满足条件:根据 groupIndex 对参数进行分组
// 第一步:用 Map 做临时分组key=groupIndexvalue=当前分组的参数数组)
const groupMap = new Map<number, ElementParameter[]>();
parameters.forEach(param => {
const index = param.groupIndex;
// 如果 Map 中没有该分组,先初始化空数组
if (!groupMap.has(index)) {
groupMap.set(index, []);
}
// 将当前参数推入对应分组
groupMap.get(index)!.push(param);
});
// 第二步:将 Map 转换为二维数组(按 groupIndex 升序排序)
groupedParameters.value = Array.from(groupMap.entries())
// 按分组索引从小到大排序(保证分组顺序正确)
.sort((a, b) => a[0] - b[0])
// 只保留分组后的参数数组,丢弃 key
.map(item => item[1]);
multiableParameters.value = multiable === true && groupedParameters.value.length > 0;
};
const resolveNode = (n?: Node | null | undefined) => {
groupedParametersActiveTab.value = 0;
currentNode.value = n ?? null;
if (n) {
const data = n.getData();
@@ -190,6 +292,7 @@ export default defineComponent({
} else {
currentElement.value = null;
}
resolveGroupedParameters();
};
const addVariable = () => {
@@ -220,6 +323,17 @@ export default defineComponent({
if (currentNode.value && currentElement.value) {
// 深拷贝当前元素数据
const newElement = JSON.parse(JSON.stringify(currentElement.value)) as GraphTaskElement;
if (multiableParameters.value) {
newElement.parameters = groupedParameters.value.flatMap((group, groupIndex) => {
// 遍历每个分组,给组内所有参数统一设置/保持 groupIndex
return group.map(param => ({
...param,
groupIndex: groupIndex // 强制保证:当前参数的分组索引 = 所在分组的索引
}));
});
}
// 更新节点数据
currentNode.value.replaceData(newElement);
// 触发事件通知父组件
@@ -227,6 +341,9 @@ export default defineComponent({
}
};
const load = () => {
};
watch(
() => props.node,
(n?: Node | null | undefined) => resolveNode(n),
@@ -249,11 +366,21 @@ export default defineComponent({
{ deep: true, immediate: true },
);
watch(() => groupedParameters.value, () => updateNode(), { deep: true });
watch(() => currentElement.value, () => updateNode(), { deep: true });
watch(() => props.platforms, (n: Platform[] | null | undefined) => platforms.value = n ?? [], { deep: true, immediate: true });
onMounted(() => load());
return {
platforms,
addParameterTab,
groupedParametersActiveTab,
multiableParameters,
onEditParameterTab,
groupedParameters,
actionSpaceColumns,
activeTopTabsKey,
activeBottomTabsKey,

View File

@@ -19,6 +19,7 @@ export interface NodeTemplate {
templateType: NullableString;
englishName: NullableString;
parameters: ElementParameter[],
multiable?: boolean,
}
export interface NodeDragTemplate extends NodeTemplate {

View File

@@ -27,6 +27,7 @@ export const createGraphTaskElementFromTemplate = (
category: template.type,
group: template.group,
description: template.description,
multiable: template.multiable === true,
order: 0,
position: {
x: realRect.x ?? 0,

View File

@@ -67,6 +67,7 @@ export interface ElementParameter {
defaultValue: NullableString,
description: NullableString,
templateType: NullableString,
groupIndex: number,
}
@@ -84,6 +85,7 @@ export interface GraphTaskElement extends GraphBaseElement {
inputs: any;
outputs: any;
order: number;
multiable:boolean,
variables: ElementVariable[];
parameters: ElementParameter[];
children?: GraphTaskElement[],

View File

@@ -7,7 +7,7 @@
* that was distributed with this source code.
*/
import { computed, type ComputedRef, ref, type Ref } from 'vue';
import { computed, type ComputedRef, ref, type Ref, nextTick } from 'vue';
import { type Dom, Graph, Node } from '@antv/x6';
import type { NodeViewPositionEventArgs } from '@antv/x6/es/view/node/type';
import { createGraphCanvas } from './canvas';
@@ -24,6 +24,8 @@ export interface UseGraphCanvas {
graph: ComputedRef<Graph>;
zoomIn: () => void;
zoomOut: () => void;
destroyGraph: () => void;
clearGraph: () => void;
fitToScreen: () => void;
centerContent: () => void;
resizeCanvas: () => void;
@@ -39,6 +41,36 @@ export const useGraphCanvas = (readonly: boolean = false): UseGraphCanvas => {
const eventListener = new EventListener();
const currentZoom = ref<number>(0);
const clearGraph = ()=> {
if (graph.value) {
try {
// graph.value.off();
graph.value.clearCells();
} catch (e) {
console.error('清空画布失败:', e);
}
}
}
const destroyGraph = ()=> {
eventListener.clear();
if (graph.value) {
clearGraph();
// 等待 Vue 完成卸载
nextTick(() => {
graph.value?.dispose(); // 销毁 Graph 实例
graph.value = null;
if (container.value) {
container.value.innerHTML = ''; // 清空容器内容
}
});
} else if (container.value) {
container.value.innerHTML = '';
}
}
const handleGraphEvent = (name: string, fn: Function) => {
eventListener.on(name, fn);
};
@@ -183,6 +215,11 @@ export const useGraphCanvas = (readonly: boolean = false): UseGraphCanvas => {
emitGraphEvent('node:click', ctx);
});
graph.value.on('node:dblclick', (ctx: NodeViewPositionEventArgs<Dom.ClickEvent>) => {
console.info('node:dblclick', ctx);
emitGraphEvent('node:dblclick', ctx);
});
// 监听节点选中事件
graph.value.on('node:selected', ({ node }) => {
console.info('node select', node);
@@ -238,6 +275,8 @@ export const useGraphCanvas = (readonly: boolean = false): UseGraphCanvas => {
return {
container,
readonly,
destroyGraph,
clearGraph,
graph: graphInstance,
eventListener,
currentZoom,

View File

@@ -18,6 +18,10 @@ export interface Platform {
[key: string]: unknown;
}
export interface PlatformListableResponse extends ApiDataResponse<Platform[]> {
}
export interface PlatformComponent {
id: number,
name: NullableString,

View File

@@ -15,7 +15,6 @@ declare module 'vue' {
ABadge: typeof import('ant-design-vue/es')['Badge']
AButton: typeof import('ant-design-vue/es')['Button']
ACard: typeof import('ant-design-vue/es')['Card']
ACascader: typeof import('ant-design-vue/es')['Cascader']
ACol: typeof import('ant-design-vue/es')['Col']
ACollapse: typeof import('ant-design-vue/es')['Collapse']
ACollapsePanel: typeof import('ant-design-vue/es')['CollapsePanel']
@@ -60,7 +59,6 @@ declare global {
const ABadge: typeof import('ant-design-vue/es')['Badge']
const AButton: typeof import('ant-design-vue/es')['Button']
const ACard: typeof import('ant-design-vue/es')['Card']
const ACascader: typeof import('ant-design-vue/es')['Cascader']
const ACol: typeof import('ant-design-vue/es')['Col']
const ACollapse: typeof import('ant-design-vue/es')['Collapse']
const ACollapsePanel: typeof import('ant-design-vue/es')['CollapsePanel']

23
pom.xml
View File

@@ -274,6 +274,29 @@
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<source>11</source>
<target>11</target>
<annotationProcessorPaths>
<!-- 顺序无关,但每个都需要指定版本 -->
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.34</version>
</path>
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>1.5.5.Final</version>
</path>
<!-- 如果有其他 processor 也加在这里 -->
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
</build>

202
t.txt Normal file
View File

@@ -0,0 +1,202 @@
"Tasks": [
{
"color": "rgb(220,39,39)",
"dataType": "taskPlane",
"drawName": "xxx随队干扰任务",
"editPermission": [
"edits",
"noHidden",
"noGroups",
"del",
"downLoad"
],
"groupType": "tasks",
"id": "0614808c-6621-40a0-b254-d13d2959fc19",
"idKey": "id",
"isSelected": false,
"name": "xxx随队干扰任务",
"parentId": "56a96b1b-14a8-4daf-a2d0-47c7faa4b831_taskPlane",
"permission": [
"14bc8ff9-3c93-4218-b01a-e144add196f9",
"56a96b1b-14a8-4daf-a2d0-47c7faa4b831"
],
"show": true,
"side": "红方",
"sort": 1774271360496,
"task": {
"at_time": 0,
"attackId": "b4256ee6-50a6-4bd0-a358-eb1e772a8e3f",
"color": "rgb(220,39,39)",
"departureAirport": "",
"execute": [
{
"disturbList": [
{
"arrayPositionId": "",
"at_time": "1200",
"deceiveType": "",
"decoyLen": "",
"decoyNum": "",
"disturbPos": [],
"disturbStrength": "100",
"disturbStyle": [
"0"
],
"disturbTime": "1",
"disturbTimes": [],
"dragAcceleSpeed": "",
"dragSpeed": "",
"dragTime": "",
"endTime": "2000",
"followFormation": "",
"groupId": "d5aa0dc8-8baa-4d3b-9eb6-a268c5da7633",
"interferTargetList": [
"xxx车__933e3796-792f-41f7-ac96-70174c9c24af__b52c23cb-80a5-408d-9868-2ae2a3db5187"
],
"keepTime": "",
"podPosition": "",
"routeId": "",
"stopTime": "",
"targetId": "",
"weaponId": "",
"weaponType": ""
}
],
"droneSwarmList": [
{
"ID": "32a86eed-5f14-43ed-95e0-0bb111ef2602",
"at_time": "",
"decoyNum": "",
"disturbNum": "",
"droneNum": "",
"dropPosition": "",
"hitNum": "",
"load": "",
"targetId": "",
"weaponId": "",
"weaponType": ""
}
],
"earlyWaringList": [
{
"PositionRouteId": "",
"arrayPositionId": "",
"at_time": "",
"earlyWarTactics": "",
"endTime": ""
}
],
"floatAirList": [
{
"Direction": "",
"FlySpeed": "",
"at_time": "",
"load": ""
}
],
"moveRouteId": "",
"netAttackList": [
{
"arrayPositionId": "",
"at_time": "",
"endTime": "",
"node": ""
}
],
"patrolList": [
{
"PositionRouteId": "",
"arrayPositionId": "",
"endTime": "",
"patrolRules": "",
"patrolTeams": "",
"startTime": ""
}
],
"refulList": [
{
"arrayPositionId": "",
"at_time": "",
"fulHeight": "",
"hangTime": "",
"hangTimeH": "",
"refulRule": "",
"targetId": ""
}
],
"spyonList": [
{
"PositionRouteId": "",
"arrayPositionId": "",
"at_time": "",
"endTime": "",
"spyonArea": "",
"spyonTactics": "",
"spyonTeams": ""
}
],
"targetList": [
{
"ID": "b3515b7e-bc28-47f5-8be5-1cab0e25097e",
"arrayPositionId": "",
"arrayPositionIdBak": "",
"at_time": {
"timeUp": true,
"value": 0
},
"attackType": "",
"boost": "",
"bootTime": "",
"companion": "",
"cruiseRouteId": "",
"cruiseRouteOffset": [
{
"UpOrDown": true,
"value": 0
},
{
"BeforeOrAfter": true,
"value": 0
},
{
"LeftOrRight": true,
"value": 0
}
],
"decoyNum": "0",
"decoyTime": "0",
"disturbNum": "0",
"disturbStartTime": "0",
"droneNum": "",
"fireType": "absolute",
"hitNum": "",
"launchAngle": "",
"launchAzimuth": "",
"noFlyZone": "",
"orbitInclination": "",
"refulId": "",
"salvo": {
"salvoUp": true,
"value": 0
},
"strategy": [],
"targetId": "",
"times_interval": 1,
"weaponId": "",
"weaponRelease": "",
"weaponType": "",
"weaponUseCount": 1
}
],
"type": "interference"
}
],
"landAirport": "",
"missionList": [],
"name": "xxx随队干扰任务",
"side": "红方",
"sideId": "56a96b1b-14a8-4daf-a2d0-47c7faa4b831",
"speed": 600,
"type": "interference",
"weaponId": ""
},

File diff suppressed because it is too large Load Diff