Merge branch 'refs/heads/develop'

auto-solution-admin/src/main/java/com/solution/web/controller/rule/FireRuleController.java

@@ -59,10 +59,15 @@ public class FireRuleController extends BaseController {
      * @return
      */
     @GetMapping("/platforms/{scenarioId}")
-    public AjaxResult platforms(@PathVariable Integer scenarioId){
+    public AjaxResult platformsScenarioId(@PathVariable Integer scenarioId){
         return success(ruleService.findPlatformComponents(scenarioId));
     }
 
+    @GetMapping("/platforms")
+    public AjaxResult platforms(){
+        return success(ruleService.findAllPlatformComponents());
+    }
+
     /**
      * 根据平台id获取平台下所有组件
      * @param platformId

auto-solution-admin/src/main/java/com/solution/web/controller/scene/SceneController.java

@@ -1,4 +1,4 @@
-package com.solution.scene.controller;
+package com.solution.web.controller.scene;
 
 import com.solution.common.annotation.Log;
 import com.solution.common.core.controller.BaseController;
@@ -6,6 +6,7 @@ import com.solution.common.core.domain.AjaxResult;
 import com.solution.common.core.page.TableDataInfo;
 import com.solution.common.enums.BusinessType;
 import com.solution.scene.domain.AfsimScenario;
+import com.solution.scene.domain.AfsimScenarioForm;
 import com.solution.scene.service.SceneService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

auto-solution-common/pom.xml

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

auto-solution-common/src/main/java/com/solution/common/constant/PlatformAndModuleConstants.java

@@ -6,4 +6,6 @@ public class PlatformAndModuleConstants {
     public static final String RED_NEBO_M_1 = "red_nebo_m_1";
 
     public static final String RED_NEBO_M_2 = "red_nebo_m_2";
+
+    public static final String RED_TANK_1 = "red_tank_1";
 }

auto-solution-rule/pom.xml

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

auto-solution-rule/src/main/java/com/solution/rule/handler/WarplaneHandler.java

@@ -38,8 +38,6 @@ public class WarplaneHandler extends AbstractRuleChainHandler {
 
         List<PlatformWeaponAggregateVO> resultWeapons = new ArrayList<>();
 
-        //TODO获取所有组件以及count
-
         Iterator<WeaponModelDTO> iterator = dtoList.iterator();
         while (iterator.hasNext()) {
             WeaponModelDTO dto = iterator.next();

auto-solution-rule/src/main/java/com/solution/rule/mapper/FireRuleMapper.java

@@ -42,4 +42,6 @@ public interface FireRuleMapper {
     List<PlatformComponent> getComponents(Integer platformId);
 
     List<Platform> findPlatformComponents(Integer scenarioId);
+
+    List<Platform> findAllPlatformComponents();
 }

auto-solution-rule/src/main/java/com/solution/rule/service/FireRuleService.java

@@ -45,4 +45,6 @@ public interface FireRuleService {
      * @return
      */
     List<Platform> findPlatformComponents(Integer scenarioId);
+
+    List<Platform> findAllPlatformComponents();
 }

auto-solution-rule/src/main/java/com/solution/rule/service/impl/FireRuleServiceImpl.java

@@ -176,4 +176,9 @@ public class FireRuleServiceImpl implements FireRuleService {
         return new ArrayList<>();
     }
 
+    @Override
+    public List<Platform> findAllPlatformComponents() {
+        return ruleMapper.findAllPlatformComponents();
+    }
+
 }

auto-solution-rule/src/main/resources/mapper/rule/FireRuleMapper.xml

@@ -96,14 +96,19 @@
     </resultMap>
     <select id="findPlatformComponents" resultMap="VPlatformMap"
             parameterType="java.lang.Integer">
-        SELECT
+        SELECT DISTINCT
             p.*,
             pc.*
         FROM platform p
         LEFT JOIN platform_component pc ON p.id = pc.platform_id
-        WHERE pc.type = "comm"
+        WHERE pc.type = 'comm'
           AND p.scenario_id = #{scenarioId}
-        GROUP BY p.id;
+        ORDER BY p.name,pc.name
+    </select>
+
+    <select id="findAllPlatformComponents" resultMap="VPlatformMap">
+        SELECT *
+        FROM platform
     </select>
 
 </mapper>

auto-solution-scene/pom.xml

@@ -18,16 +18,18 @@
 
     <dependencies>
 
+
+        <dependency>
+            <groupId>com.solution</groupId>
+            <artifactId>solution-rule</artifactId>
+        </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>

auto-solution-scene/src/main/java/com/solution/scene/domain/AfsimScenario.java

@@ -1,5 +1,7 @@
 package com.solution.scene.domain;
 
+import java.util.List;
+
 /**
  * 场景配置表
  * 对应表 afsim_scenario
@@ -11,6 +13,16 @@ public class AfsimScenario {
     private String scenarioPath;
     private String communicationGraph; // 用于存储场景中的通讯关系
 
+    public List<ScenarioRelation> getRelations() {
+        return relations;
+    }
+
+    public void setRelations(List<ScenarioRelation> relations) {
+        this.relations = relations;
+    }
+
+    private List<ScenarioRelation> relations;
+
     public Integer getId() {
         return id;
     }

auto-solution-scene/src/main/java/com/solution/scene/domain/AfsimScenarioForm.java

@@ -0,0 +1,25 @@
+package com.solution.scene.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.util.List;
+
+public class AfsimScenarioForm extends AfsimScenario {
+
+    private List<ScenarioRelation> relations;
+
+    public List<ScenarioRelation> getRelations() {
+        return relations;
+    }
+
+    public void setRelations(List<ScenarioRelation> relations) {
+        this.relations = relations;
+    }
+
+}

auto-solution-scene/src/main/java/com/solution/scene/domain/ScenarioRelation.java

@@ -0,0 +1,108 @@
+package com.solution.scene.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 com.solution.rule.domain.Platform;
+import com.solution.rule.domain.PlatformComponent;
+
+import java.io.Serializable;
+
+public class ScenarioRelation implements Serializable {
+
+    private String edgeId;
+
+    private String sourceId;
+
+    private String sourcePort;
+    
+    private Platform sourcePlatform;
+
+    private PlatformComponent sourceComponent;
+
+    private String targetId;
+
+    private String targetPort;
+
+    private Platform targetPlatform;
+
+    private PlatformComponent targetComponent;
+
+    public String getEdgeId() {
+        return edgeId;
+    }
+
+    public void setEdgeId(String edgeId) {
+        this.edgeId = edgeId;
+    }
+
+    public String getSourceId() {
+        return sourceId;
+    }
+
+    public void setSourceId(String sourceId) {
+        this.sourceId = sourceId;
+    }
+
+    public String getSourcePort() {
+        return sourcePort;
+    }
+
+    public void setSourcePort(String sourcePort) {
+        this.sourcePort = sourcePort;
+    }
+
+    public Platform getSourcePlatform() {
+        return sourcePlatform;
+    }
+
+    public void setSourcePlatform(Platform sourcePlatform) {
+        this.sourcePlatform = sourcePlatform;
+    }
+
+    public PlatformComponent getSourceComponent() {
+        return sourceComponent;
+    }
+
+    public void setSourceComponent(PlatformComponent sourceComponent) {
+        this.sourceComponent = sourceComponent;
+    }
+
+    public String getTargetId() {
+        return targetId;
+    }
+
+    public void setTargetId(String targetId) {
+        this.targetId = targetId;
+    }
+
+    public String getTargetPort() {
+        return targetPort;
+    }
+
+    public void setTargetPort(String targetPort) {
+        this.targetPort = targetPort;
+    }
+
+    public Platform getTargetPlatform() {
+        return targetPlatform;
+    }
+
+    public void setTargetPlatform(Platform targetPlatform) {
+        this.targetPlatform = targetPlatform;
+    }
+
+    public PlatformComponent getTargetComponent() {
+        return targetComponent;
+    }
+
+    public void setTargetComponent(PlatformComponent targetComponent) {
+        this.targetComponent = targetComponent;
+    }
+
+}

auto-solution-scene/src/main/java/com/solution/scene/mapper/PlatFormCommunicationMapper.java

@@ -0,0 +1,27 @@
+package com.solution.scene.mapper;
+
+import com.solution.scene.domain.AfsimScenarioForm;
+import com.solution.scene.domain.ScenarioRelation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface PlatFormCommunicationMapper {
+
+    /**
+     * 存储通信关系
+     * @param scenaryId,afsimScenarios
+     */
+    int insert(@Param("scenaryId") Integer scenaryId,
+               @Param("afsimScenarios") List<ScenarioRelation> afsimScenarios);
+
+
+    /**
+     * 删除通信关系
+     * @param scenaryId
+     * @return
+     */
+    int delete(Integer scenaryId);
+}

auto-solution-scene/src/main/java/com/solution/scene/mapper/SceneMapper.java

@@ -1,6 +1,7 @@
 package com.solution.scene.mapper;
 
 import com.solution.scene.domain.AfsimScenario;
+import com.solution.scene.domain.AfsimScenarioForm;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

auto-solution-scene/src/main/java/com/solution/scene/service/SceneService.java

@@ -1,6 +1,7 @@
 package com.solution.scene.service;
 
 import com.solution.scene.domain.AfsimScenario;
+import com.solution.scene.domain.AfsimScenarioForm;
 
 import java.util.List;
 
@@ -13,7 +14,7 @@ public interface SceneService {
      */
     int insert(AfsimScenario afsimScenario);
 
-    int update(AfsimScenario afsimScenario);
+    int update(AfsimScenarioForm afsimScenario);
 
     int saveOrUpdate(AfsimScenario afsimScenario);
 

auto-solution-scene/src/main/java/com/solution/scene/service/impl/SceneServiceImpl.java

@@ -1,10 +1,13 @@
 package com.solution.scene.service.impl;
 
 import com.solution.scene.domain.AfsimScenario;
+import com.solution.scene.domain.AfsimScenarioForm;
+import com.solution.scene.mapper.PlatFormCommunicationMapper;
 import com.solution.scene.mapper.SceneMapper;
 import com.solution.scene.service.SceneService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -15,22 +18,42 @@ public class SceneServiceImpl implements SceneService {
     @Autowired
     private SceneMapper sceneMapper;
 
+    @Autowired
+    private PlatFormCommunicationMapper platFormCommunicationMapper;
+
     @Override
     public int insert(AfsimScenario afsimScenario) {
         return sceneMapper.insert(afsimScenario);
     }
 
     @Override
-    public int update(AfsimScenario afsimScenario) {
+    public int update(AfsimScenarioForm afsimScenario) {
         return sceneMapper.update(afsimScenario);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public int saveOrUpdate(AfsimScenario afsimScenario) {
         if (null != afsimScenario.getId() && afsimScenario.getId() > 0) {
-            return sceneMapper.update(afsimScenario);
+            // 更新场景
+            int updated = sceneMapper.update(afsimScenario);
+            // 先删除通信关系
+            platFormCommunicationMapper.delete(afsimScenario.getId());
+            // 再插入通信关系
+            if (afsimScenario.getRelations() != null && !afsimScenario.getRelations().isEmpty()) {
+                platFormCommunicationMapper.insert(afsimScenario.getId(), afsimScenario.getRelations());
+            }
+            return updated;
+        } else {
+            // 新增场景
+            int inserted = sceneMapper.insert(afsimScenario);
+            // 确保获取到生成的 ID
+            if (afsimScenario.getId() != null && afsimScenario.getRelations() != null && !afsimScenario.getRelations().isEmpty()) {
+                // 存储通信关系
+                platFormCommunicationMapper.insert(afsimScenario.getId(), afsimScenario.getRelations());
+            }
+            return inserted;
         }
-        return insert(afsimScenario);
     }
 
     /**

auto-solution-scene/src/main/resources/mapper/scene/PlatFormCommunicationMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.solution.scene.mapper.PlatFormCommunicationMapper">
+
+
+    <insert id="insert" parameterType="com.solution.scene.domain.AfsimScenarioForm">
+        INSERT INTO platform_communication (scenary_id, command_platform, subordinate_platform, command_comm, subordinate_comm)
+        VALUES
+        <foreach collection="afsimScenarios" item="item" separator=",">
+            (#{scenaryId}, #{item.sourcePlatform.name}, #{item.targetPlatform.name}, #{item.sourceComponent.name}, #{item.targetComponent.name})
+         </foreach>
+     </insert>
+     <delete id="delete" parameterType="java.lang.Integer">
+         DELETE FROM platform_communication
+         WHERE scenary_id = #{scenaryId}
+     </delete>
+ </mapper>

auto-solution-scene/src/main/resources/mapper/scene/SceneMapper.xml

@@ -12,7 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="communicationGraph"    column="communication_graph"    />
     </resultMap>
 
-    <insert id="insert" parameterType="com.solution.scene.domain.AfsimScenario">
+    <insert id="insert" parameterType="com.solution.scene.domain.AfsimScenario" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO afsim_scenario (name, description, scenario_path, communication_graph)
         VALUES (#{name}, #{description}, #{scenarioPath}, #{communicationGraph})
     </insert>

modeler/src/style.less

@@ -1291,6 +1291,10 @@
   }
 }
 
+.ant-select:not(.ant-select-customize-input) .ant-select-selector{
+  border: 1px solid #475f71
+}
+
 .ant-input-affix-wrapper.ant-input-password input:-webkit-autofill,
 .ant-input-affix-wrapper.ant-input-password input:-webkit-autofill:hover,
 .ant-input-affix-wrapper.ant-input-password input:-webkit-autofill:focus,
@@ -1504,9 +1508,7 @@
     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

modeler/src/views/decision/algorithm/management.vue

@@ -274,8 +274,11 @@ const getAlgorithmTypeName = (type: NullableString): NullableString => {
 const load = () => {
   algorithms.value = [];
   algorithmsTotal.value = 0;
-  formRef.value?.resetFields();
-  selectedAlgorithm.value = resolveItem(defaultAlgorithm);
+
+  if(selectedAlgorithm.value.id <= 0){
+    formRef.value?.resetFields();
+    selectedAlgorithm.value = resolveItem(defaultAlgorithm);
+  }
 
   findAlgorithmsByQuery(query.value).then(r => {
     algorithms.value = r.rows ?? [];

modeler/src/views/decision/communication/api.ts

@@ -8,7 +8,8 @@
  */
 
 import { HttpRequestClient } from '@/utils/request';
-import type { PlatformWithComponentsResponse, ScenarioPageableResponse, ScenarioRequest, Scenario } from './types';
+import type { Scenario, ScenarioPageableResponse, ScenarioRequest } from './types';
+import type { PlatformWithComponentsResponse } from '../types';
 import type { BasicResponse } from '@/types';
 
 const req = HttpRequestClient.create<BasicResponse>({

modeler/src/views/decision/communication/communication.vue

@@ -63,6 +63,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'
 
 const TeleportContainer = defineComponent(getTeleport());
 
@@ -194,7 +195,6 @@ export default defineComponent({
     };
 
     const handleSelect = (scenario: Scenario) => {
-      console.info('handleSelect', scenario);
       let nodeGraph: GraphContainer | null = null;
       try {
         nodeGraph = JSON.parse(scenario.communicationGraph as unknown as string) as unknown as GraphContainer;
@@ -210,10 +210,10 @@ export default defineComponent({
       currentScenario.value = {
         ...scenario,
         graph: nodeGraph,
+        relations: []
       };
       currentScenarioEditing.value = true;
       createElements();
-
     };
 
     const createElements = () => {
@@ -228,7 +228,6 @@ export default defineComponent({
             if (currentScenario.value?.graph.nodes) {
               currentScenario.value?.graph.nodes.forEach(ele => {
                 const node = createGraphScenarioElement(ele as GraphTaskElement);
-                console.info('create node: ', ele);
                 // 将节点添加到画布
                 graph.value?.addNode(node as Node);
               });
@@ -255,10 +254,11 @@ export default defineComponent({
         name: null,
         description: null,
         communicationGraph: null,
+        relations: [],
         graph: {
           edges: [],
           nodes: [],
-        }
+        },
       };
       currentGraph.value = {
         edges: [],
@@ -341,6 +341,10 @@ export default defineComponent({
 
     const handleSave = () => {
       const graphData: GraphContainer = resolveGraph(graph.value as Graph);
+
+      const relations = resolveConnectionRelation(graph.value as Graph);
+      console.error('relations',relations)
+
       console.info('handleSave', graphData);
       if (!currentScenario.value) {
         message.error('当前决策树不存在');
@@ -350,6 +354,7 @@ export default defineComponent({
         ...currentScenario.value,
         graph: graphData,
         communicationGraph: JSON.stringify(graphData),
+        relations: relations
       };
       if (!newScenario.name) {
         message.error('场景名称不能为空.');

modeler/src/views/decision/communication/node.vue

@@ -23,9 +23,11 @@
           >
             <div
               :data-port="`in-${item.id || index}`"
+              :port="`in-${item.id || index}`"
               :title="`入桩: ${item.name}`"
               class="port port-in"
               magnet="passive"
+              :data-item="JSON.stringify(item)"
             >
               <div class="triangle-left"></div>
             </div>
@@ -38,9 +40,11 @@
             <!-- 右侧出桩：只能作为连线源 -->
             <div
               :data-port="`out-${item.id || index}`"
+              :port="`out-${item.id || index}`"
               :title="`出桩: ${item.name}`"
               class="port port-out"
               magnet="active"
+              :data-item="JSON.stringify(item)"
             >
               <div class="triangle-right" ></div>
             </div>
@@ -130,7 +134,6 @@ export default defineComponent({
 
     onMounted(() => {
       _props.node?.on('change:data', handleDataChange);
-      console.error('element',element.value)
     });
 
     onUnmounted(() => {

modeler/src/views/decision/communication/nodes-card.vue

@@ -27,10 +27,11 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, onMounted, type PropType, ref } from 'vue';
+import { defineComponent, type PropType, ref, watch } from 'vue';
 import { safePreventDefault, safeStopPropagation } from '@/utils/event';
-import {findPlatformWithComponents} from './api'
-import { type PlatformWithComponents, type Scenario } from './types';
+import { findPlatformWithComponents } from './api';
+import { type Scenario } from './types';
+import { type PlatformWithComponents } from '../types';
 
 export default defineComponent({
   emits: ['drag-item-start', 'drag-item-end'],
@@ -40,21 +41,14 @@ export default defineComponent({
       required: true,
     }
   },
-  setup(_props, { emit }) {
+  setup(props, { emit }) {
 
     const activeKey = ref<number>(1);
     const templateData = ref<PlatformWithComponents[]>([]);
     const isDraggingOver = ref<boolean>(false);
     const draggedNodeData = ref<PlatformWithComponents | null>(null);
-    const currentScenario = ref<Scenario|null>(_props.scenario)
-
-    const loadTress = () => {
-      templateData.value = []
-      findPlatformWithComponents(_props.scenario?.id).then(r => {
-        templateData.value = r.data ?? []
-      });
-    };
-
+    const currentScenario = ref<Scenario|null>(props.scenario)
+ 
     const handleDragStart = (e: DragEvent, nm: PlatformWithComponents) => {
       let dragNode: PlatformWithComponents = { ...nm };
       draggedNodeData.value = dragNode as PlatformWithComponents;
@@ -92,16 +86,17 @@ export default defineComponent({
     };
 
 
-    const load = ()=> {
-      findPlatformWithComponents(1).then(re=> {
-        console.error(re);
+    const load = (id: number)=> {
+      findPlatformWithComponents(id).then(re=> {
+        templateData.value = re.data ?? []
       })
     }
 
-    onMounted(() => {
-      loadTress();
-      load();
-    });
+    watch(()=> props.scenario,(n: Scenario|null|undefined )=> {
+      if(n){
+        load(n.id);
+      }
+    }, {deep: true, immediate: true} )
 
     return {
       activeKey,

modeler/src/views/decision/communication/platform-card.vue

@@ -79,6 +79,7 @@ export default defineComponent({
       findScenarioByQuery(scenarioQuery.value).then(r => {
         scenario.value = r.rows;
         totalTress.value = r.total ?? 0;
+        // emit('select', r.rows[0]);
       });
     };
 

modeler/src/views/decision/communication/relation.ts

@@ -0,0 +1,134 @@
+/*
+ * 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 { Graph, Node,Edge } from '@antv/x6';
+import type { Platform, PlatformComponent, PlatformRelation } from './types';
+import type { GraphTaskElement } from '../graph';
+
+/**
+ * 解析节点端口连接关系（去重版）
+ * @param graph X6 画布实例
+ * @returns 去重后的端口连接关系列表
+ */
+export function resolveConnectionRelation(graph: Graph): PlatformRelation[] {
+  const edges: Edge[] = graph.getEdges();
+  const items: PlatformRelation[] = [];
+  const existsKeys: Set<string> = new Set(); // 改用 Set 提升查询性能
+  const tempEdgeIds: Set<string> = new Set(); // 存储临时边 ID
+
+  // 过滤无效/临时边
+  const validEdges = edges.filter(edge => {
+    // 过滤临时边（X6 拖拽连线时生成的未完成边）
+    const isTempEdge = edge?.attr('line/stroke') === 'transparent' || edge.id.includes('temp');
+    if (isTempEdge) {
+      tempEdgeIds.add(edge.id);
+      return false;
+    }
+
+    // 过滤未正确关联节点的边
+    const sourceCell = edge.getSourceCell();
+    const targetCell = edge.getTargetCell();
+    if (!sourceCell || !targetCell || !(sourceCell instanceof Node) || !(targetCell instanceof Node)) {
+      return false;
+    }
+
+    // 过滤端口 ID 为空的边
+    const sourcePortId = edge.getSourcePortId();
+    const targetPortId = edge.getTargetPortId();
+    if (!sourcePortId || !targetPortId) {
+      return false;
+    }
+
+    return true;
+  });
+
+  validEdges.forEach(edge => {
+    try {
+      const sourceCell = edge.getSourceCell() as Node;
+      const targetCell = edge.getTargetCell() as Node;
+
+      const sourcePortId = edge.getSourcePortId()!;
+      const targetPortId = edge.getTargetPortId()!;
+
+      // 1. 获取端口 DOM 元素和数据
+      const sourceView = graph.findViewByCell(sourceCell);
+      const targetView = graph.findViewByCell(targetCell);
+      if (!sourceView || !targetView) return;
+
+      const sourcePortEl = sourceView.container.querySelector(`[data-port="${sourcePortId}"]`);
+      const targetPortEl = targetView.container.querySelector(`[data-port="${targetPortId}"]`);
+      if (!sourcePortEl || !targetPortEl) return;
+
+      // 2. 解析端口数据
+      let sourcePortData: PlatformComponent | null = null;
+      let targetPortData: PlatformComponent | null = null;
+      try {
+        const sourceDataAttr = sourcePortEl.getAttribute('data-item');
+        sourcePortData = sourceDataAttr ? JSON.parse(sourceDataAttr) : null;
+      } catch (e) {
+        console.warn(`解析源节点 ${sourceCell.id} 端口 ${sourcePortId} 数据失败`, e);
+        return; // 数据解析失败直接跳过
+      }
+      try {
+        const targetDataAttr = targetPortEl.getAttribute('data-item');
+        targetPortData = targetDataAttr ? JSON.parse(targetDataAttr) : null;
+      } catch (e) {
+        console.warn(`解析目标节点 ${targetCell.id} 端口 ${targetPortId} 数据失败`, e);
+        return; // 数据解析失败直接跳过
+      }
+
+      // 过滤端口数据为空的情况
+      if (!sourcePortData || !targetPortData) return;
+
+      // 解析节点平台数据
+      const sourceData = sourceCell.getData() as GraphTaskElement;
+      const targetData = targetCell.getData() as GraphTaskElement;
+
+      // 过滤平台数据不完整的节点
+      if (!sourceData.platformId || !targetData.platformId) return;
+
+      const sourcePlatform: Platform = {
+        id: sourceData.platformId as number,
+        key: sourceData.key,
+        name: sourceData.name,
+        description: sourceData.description,
+        scenarioId: sourceData.scenarioId as number,
+      };
+
+      const targetPlatform: Platform = {
+        id: targetData.platformId as number,
+        key: targetData.key,
+        name: targetData.name,
+        description: targetData.description,
+        scenarioId: targetData.scenarioId as number,
+      };
+
+      // 生成唯一标识（支持单向/双向去重
+      const uniqueKey = `${sourceCell.id}@${sourcePortId}->${targetCell.id}@${targetPortId}`;
+
+      if (!existsKeys.has(uniqueKey)) {
+        existsKeys.add(uniqueKey);
+        items.push({
+          sourceId: sourceCell.id,
+          sourcePort: sourcePortId,
+          sourcePlatform: sourcePlatform,
+          sourceComponent: sourcePortData,
+          targetId: targetCell.id,
+          targetPort: targetPortId,
+          targetPlatform: targetPlatform,
+          targetComponent: targetPortData,
+          edgeId: edge.id,
+        });
+      }
+    } catch (error) {
+      console.error(`解析边 ${edge.id} 连接关系失败`, error);
+    }
+  });
+  return items;
+}

modeler/src/views/decision/communication/types.ts

@@ -10,6 +10,20 @@
 
 import type { ApiDataResponse, NullableString, PageableResponse } from '@/types';
 import type { GraphContainer } from '../graph';
+import type { Platform, PlatformComponent } from '../types';
+
+export interface PlatformRelation {
+  sourceId: NullableString,
+  sourcePort: NullableString,
+  sourcePlatform: Platform,
+  sourceComponent: PlatformComponent,
+  targetId: NullableString,
+  targetPort: NullableString,
+  targetPlatform: Platform,
+  targetComponent: PlatformComponent,
+  [key: string]: unknown;
+}
+
 
 export interface Scenario {
   id: number,
@@ -18,6 +32,7 @@ export interface Scenario {
   // 用于存储场景中的通讯关系
   communicationGraph: NullableString,
   graph: GraphContainer
+  relations: PlatformRelation[]
 }
 
 export interface ScenarioRequest extends Scenario {
@@ -29,25 +44,3 @@ export interface ScenarioPageableResponse extends PageableResponse<Scenario> {
 
 }
 
-export interface Platform {
-  id: number,
-  name: NullableString,
-  description: NullableString,
-  scenarioId: number,
-}
-
-export interface PlatformComponent {
-  id: number,
-  name: NullableString,
-  type: NullableString,
-  description: NullableString,
-  platformId: number,
-}
-
-export interface PlatformWithComponents extends Platform {
-  components: PlatformComponent[],
-}
-
-export interface PlatformWithComponentsResponse extends ApiDataResponse<PlatformWithComponents[]> {
-
-}

modeler/src/views/decision/communication/utils.ts

@@ -44,6 +44,33 @@ export const createGraphTaskElementFromScenario = (
   } as GraphTaskElement;
 };
 
+const portsGroups = {
+  in: {
+    position: 'left', // 入桩在左侧
+    attrs: {
+      circle: {
+        r: 6,
+        magnet: 'passive', // 被动吸附（仅作为连线目标）
+        stroke: '#5da1df',
+        strokeWidth: 2,
+        fill: '#fff',
+      },
+    },
+  },
+  out: {
+    position: 'right', // 出桩在右侧
+    attrs: {
+      circle: {
+        r: 6,
+        magnet: 'active', // 主动吸附（作为连线源）
+        stroke: '#5da1df',
+        strokeWidth: 2,
+        fill: '#5da1df',
+      },
+    },
+  },
+};
+
 export const createGraphScenarioElement = (element: GraphTaskElement): any => {
   let realHeight = 120;
   let width: number = 250;
@@ -58,6 +85,24 @@ export const createGraphScenarioElement = (element: GraphTaskElement): any => {
     }
   }
 
+  // const portsItems = (element.components || []).map((comp, index) => {
+  //   const compId = comp.id || index;
+  //   return [
+  //     // 入桩（对应 DOM: data-port="in-${compId}"）
+  //     {
+  //       id: `in-${compId}`, // portId 必须和 DOM 的 data-port 一致
+  //       group: 'in',
+  //       data: comp, // 直接存储 port 数据，避免后续解析 DOM
+  //     },
+  //     // 出桩（对应 DOM: data-port="out-${compId}"）
+  //     {
+  //       id: `out-${compId}`,
+  //       group: 'out',
+  //       data: comp,
+  //     },
+  //   ];
+  // }).flat(); // 扁平化数组
+
   return {
     shape: 'scenario',
     id: element.key,
@@ -75,5 +120,9 @@ export const createGraphScenarioElement = (element: GraphTaskElement): any => {
       },
     },
     data: element,
+    // ports: {
+    //   groups: portsGroups,
+    //   items: portsItems,
+    // },
   };
 };

modeler/src/views/decision/graph/canvas.ts

@@ -58,7 +58,7 @@ export const createGraphConnectingAttributes = (): Partial<Connecting> => {
             ...lineOptions.attrs?.line,
             targetMarker: null,
             sourceMarker: null,
-          }
+          },
         },
         animation: lineOptions.animation,
         markup: lineOptions.markup,

modeler/src/views/decision/graph/element.ts

@@ -53,7 +53,7 @@ export interface GraphBaseElement {
   position: GraphPosition;
   category: NullableString;
   element?: GraphDraggableElement;
-  components?: GraphComponentElement[]
+  components?: GraphComponentElement[];
 
   [key: string]: unknown;
 }

modeler/src/views/decision/graph/hooks.ts

@@ -224,6 +224,7 @@ export const useGraphCanvas = (readonly: boolean = false): UseGraphCanvas => {
 
   const createCanvas = (c: HTMLDivElement): Graph => {
     container.value = c;
+
     graph.value = createGraphCanvas(c, readonly);
     initEvents();
 

modeler/src/views/decision/graph/index.ts

@@ -7,10 +7,10 @@
  * that was distributed with this source code.
  */
 
-export * from './line'
-export * from './ports'
-export * from './element'
-export * from './canvas'
-export * from './hooks'
-export * from './props'
-export * from './utils'
+export * from './line';
+export * from './ports';
+export * from './element';
+export * from './canvas';
+export * from './hooks';
+export * from './props';
+export * from './utils';

modeler/src/views/decision/graph/utils.ts

@@ -18,7 +18,7 @@ export const createGraphTaskElement = (element: GraphTaskElement, width: number
   if (!realHeight) {
     realHeight = 120;
   }
-  if(element.group === 'condition' || element.group === 'control') {
+  if (element.group === 'condition' || element.group === 'control') {
     realHeight = 60;
   }
   return {
@@ -74,8 +74,10 @@ export const resolveGraphEdgeElements = (graph: Graph): GraphEdgeElement[] => {
           key: edge.id,
           type: 'edge',
           status: nodeData?.status,
+          sourcePort: edge.getSourcePortId(),
           source: edge.getSource() ? edge.getSource() as unknown as string : null,
           target: edge.getSource() ? edge.getTarget() as unknown as string : null,
+          targetPort: edge.getTargetPortId(),
           attrs: edge.getAttrs() ?? {},
           router: edge.getRouter() ?? {},
           connector: edge.getConnector() ?? null,

modeler/src/views/decision/rule/PlatformSelect.vue

@@ -0,0 +1,118 @@
+<template>
+  <a-space>
+    <!-- 平台选择框 -->
+    <a-select
+      style="width:280px"
+      v-model:value="innerPlatformId"
+      placeholder="请选择平台"
+      :disabled="loading"
+    >
+      <a-select-option
+        v-for="item in platforms"
+        :key="`platform-${item.id}`"
+        :value="item.id"
+      >
+        {{ item.description || item.name || '未命名平台' }}
+      </a-select-option>
+    </a-select>
+
+    <!-- 组件选择框 -->
+    <a-select
+      style="width:280px;"
+      v-model:value="innerComponentId"
+      placeholder="请选择组件"
+      :disabled="!innerPlatformId || loading"
+    >
+      <a-select-option
+        v-for="item in selectedPlatformComponents"
+        :key="`component-${item.id}`"
+        :value="item.id"
+      >
+        {{ item.description || item.name || '未命名组件' }}
+      </a-select-option>
+    </a-select>
+  </a-space>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent, type PropType, ref, watch } from 'vue';
+import type { PlatformComponentPayload } from '../types';
+import { usePlatformComponents } from './store';
+
+export default defineComponent({
+  name: 'PlatformSelect',
+  props: {
+    platformId: {
+      type: [Number, null] as PropType<number | null>,
+      required: false,
+      default: null,
+    },
+    componentId: {
+      type: [Number, null] as PropType<number | null>,
+      required: false,
+      default: null,
+    },
+  },
+  emits: {
+    change: (payload: PlatformComponentPayload) => true,
+  },
+  setup(props, { emit }) {
+    const { loading, platforms, platformMap, componentMap } = usePlatformComponents();
+
+    const innerPlatformId = ref<number | null>(props.platformId);
+    const innerComponentId = ref<number | null>(props.componentId);
+
+    const selectedPlatformComponents = computed(() => {
+      const platform = platforms.value.find(p => p.id === innerPlatformId.value);
+      return platform?.components || [];
+    });
+
+    const emitChange = () => {
+      // 根据ID获取完整对象
+      const platform = platformMap.value.get(innerPlatformId.value || -1) || null;
+      const component = componentMap.value.get(innerComponentId.value || -1) || null;
+
+      const validComponent = component && component.platformId === innerPlatformId.value
+        ? component
+        : null;
+
+      emit('change', {
+        platform: platform ? {
+          id: platform.id,
+          name: platform.name,
+          description: platform.description,
+          scenarioId: platform.scenarioId,
+        } : null,
+        component: validComponent,
+      } as PlatformComponentPayload);
+    };
+
+    watch([() => props.platformId, () => props.componentId],
+      ([newPlatformId, newComponentId]) => {
+        if (!loading.value) {
+          innerPlatformId.value = newPlatformId;
+          innerComponentId.value = newComponentId;
+        }
+      },
+      { immediate: true, deep: false },
+    );
+
+    watch(innerPlatformId, (newVal) => {
+      if (newVal !== innerPlatformId.value) {
+        innerComponentId.value = null;
+      }
+      emitChange();
+    });
+
+    watch(innerComponentId, emitChange);
+
+    return {
+      loading,
+      platforms,
+      selectedPlatformComponents,
+      innerPlatformId,
+      innerComponentId,
+    };
+  }
+});
+</script>

modeler/src/views/decision/rule/api.ts

@@ -9,6 +9,7 @@
 
 import { HttpRequestClient } from '@/utils/request';
 import type { FireRule, FireRulePageableResponse, FireRuleRequest } from './types';
+import type { PlatformWithComponentsResponse } from '../types';
 import type { BasicResponse } from '@/types';
 
 const req = HttpRequestClient.create<BasicResponse>({
@@ -31,5 +32,8 @@ export const deleteFireRule = (id: number): Promise<BasicResponse> => {
   return req.delete(`/system/rule/${id}`);
 };
 
+export const findAllPlatformWithComponents = (): Promise<PlatformWithComponentsResponse> => {
+  return req.get(`/system/firerule/platforms`);
+};
 
  

modeler/src/views/decision/rule/management.vue

@@ -32,9 +32,7 @@
     </template>
 
     <div class="w-full h-full">
-
       <a-card class="ks-page-card ks-algorithm-card">
-
         <template #title>
           <a-space>
             <span class="point"></span>
@@ -43,7 +41,6 @@
         </template>
 
         <div class="ks-scrollable" style="height: 80.5vh;overflow-y: auto;padding-right: 10px">
-
           <a-row :gutter="15">
             <a-col :span="16">
               <a-form
@@ -57,14 +54,14 @@
                 <a-form-item
                   label="规则名称"
                   :rules="[{ required: true, message: '请输入规则名称!', trigger: ['input', 'change'] }]"
-                  :name="['name']"
+                  name="name"
                 >
                   <a-input v-model:value="selectedFireRule.name" placeholder="请输入规则名称" />
                 </a-form-item>
 
                 <a-form-item
                   label="场景类型"
-                  :name="['sceneType']"
+                  name="sceneType"
                 >
                   <a-select v-model:value="selectedFireRule.sceneType" placeholder="请选择场景类型">
                     <a-select-option :value="null">通用</a-select-option>
@@ -73,43 +70,92 @@
                   </a-select>
                 </a-form-item>
 
+                <!-- 触发条件 - 传递ID，保持PlatformComponentPayload结构 -->
                 <a-form-item
                   label="触发条件"
-                  :rules="[{ required: true, message: '请输入触发条件!', trigger: ['input', 'change'] }]"
-                  :name="['conditions']"
+                  :rules="[{ required: true, message: '请输入触发条件!', trigger: ['change'] }]"
+                  name="conditionsArray"
                 >
-                  <a-input v-model:value="selectedFireRule.conditions" placeholder="请输入触发条件" />
+                  <a-form-item-rest>
+                    <div class="ks-sidebar-list-param-list">
+                      <div
+                        class="ks-sidebar-list-param-item"
+                        v-for="(item,index) in selectedFireRule.conditionsArray"
+                        :key="`condition-${index}-${item.platform?.id || 'null'}-${item.component?.id || 'null'}`"
+                      >
+                        <a-row :gutter="15">
+                          <a-col :span="21">
+                            <!-- 只传递ID参数 -->
+                            <PlatformSelect
+                              :platform-id="item.platform?.id || null"
+                              :component-id="item.component?.id || null"
+                              @change="(payload)=> handleUpdateCondition(payload, index)"
+                            />
+                          </a-col>
+                          <a-col :span="3">
+                            <a-space class="ks-sidebar-list-param-actions">
+                              <MinusCircleOutlined @click.stop="()=> handleMinusCondition(index)" />
+                              <PlusCircleOutlined @click.stop="()=> handleAddCondition()" v-if="index === 0" />
+                            </a-space>
+                          </a-col>
+                        </a-row>
+                      </div>
+                    </div>
+                  </a-form-item-rest>
                 </a-form-item>
 
+                <!-- 响应动作 - 传递ID，保持PlatformComponentPayload结构 -->
                 <a-form-item
                   label="响应动作"
-                  :rules="[{ required: true, message: '请输入响应动作!', trigger: ['input', 'change'] }]"
-                  :name="['actions']"
+                  :rules="[{ required: true, message: '请输入响应动作!', trigger: ['change'] }]"
+                  name="actionsArray"
                 >
-                  <a-input v-model:value="selectedFireRule.actions" placeholder="请输入响应动作" />
+                  <a-form-item-rest>
+                    <div class="ks-sidebar-list-param-list">
+                      <div
+                        class="ks-sidebar-list-param-item"
+                        v-for="(item,index) in selectedFireRule.actionsArray"
+                        :key="`action-${index}-${item.platform?.id || 'null'}-${item.component?.id || 'null'}`"
+                      >
+                        <a-row :gutter="15">
+                          <a-col :span="21">
+                            <!-- 只传递ID参数 -->
+                            <PlatformSelect
+                              :platform-id="item.platform?.id || null"
+                              :component-id="item.component?.id || null"
+                              @change="(payload)=> handleUpdateAction(payload, index)"
+                            />
+                          </a-col>
+                          <a-col :span="3">
+                            <a-space class="ks-sidebar-list-param-actions">
+                              <MinusCircleOutlined @click.stop="()=> handleMinusAction(index)" />
+                              <PlusCircleOutlined @click.stop="()=> handleAddAction()" v-if="index === 0" />
+                            </a-space>
+                          </a-col>
+                        </a-row>
+                      </div>
+                    </div>
+                  </a-form-item-rest>
                 </a-form-item>
 
                 <a-form-item
                   label="优先级（数值越小优先级越高）"
                   :rules="[{ required: true, message: '请输入优先级!', trigger: ['input', 'change'] }]"
-                  :name="['priority']"
+                  name="priority"
                 >
                   <a-input-number style="width:100%;" v-model:value="selectedFireRule.priority" placeholder="请输入优先级" />
                 </a-form-item>
 
                 <a-form-item
                   label="是否启用"
-                  :name="['priority']"
+                  name="enabled"
                 >
                   <a-switch v-model:checked="selectedFireRule.enabled" />
                 </a-form-item>
 
-                <a-form-item
-                  :wrapper-col="{offset: 6}"
-                >
+                <a-form-item :wrapper-col="{offset: 6}">
                   <a-space>
                     <a-button @click="handleSave" type="primary">保存规则</a-button>
-
                     <a-popconfirm
                       v-if="selectedFireRule && selectedFireRule.id > 0"
                       title="确定删除?"
@@ -117,100 +163,134 @@
                     >
                       <a-button danger>删除规则</a-button>
                     </a-popconfirm>
-
                   </a-space>
                 </a-form-item>
-
               </a-form>
             </a-col>
           </a-row>
-
         </div>
-
       </a-card>
-
     </div>
   </Layout>
 </template>
 
 <script setup lang="ts">
-import { onMounted, ref } from 'vue';
+import { nextTick, onMounted, ref } from 'vue';
 import { type FormInstance, message } from 'ant-design-vue';
-import { PlusOutlined } from '@ant-design/icons-vue';
+import { MinusCircleOutlined, PlusCircleOutlined, PlusOutlined } from '@ant-design/icons-vue';
 import Layout from '../layout.vue';
 import { createFireRule, deleteFireRule, findFireRuleByQuery, updateFireRule } from './api';
-import type { FireRule, FireRuleRequest } from './types';
+import type { FireRule, FireRulePageableResponse, FireRuleRequest } from './types';
+import type { PlatformComponentPayload } from '../types';
 import { substring } from '@/utils/strings';
+import PlatformSelect from './PlatformSelect.vue';
 
-const query = ref<Partial<FireRuleRequest>>({
+const query = ref<FireRuleRequest>({
+  id: 0,
+  name: '',
+  sceneType: null,
+  conditions: '',
+  conditionsArray: [],
+  actions: '',
+  actionsArray: [],
+  priority: 0,
+  enabled: true,
   pageNum: 1,
   pageSize: 10,
 });
 
+const defaultPayload: PlatformComponentPayload = {
+  platform: null,
+  component: null,
+};
+
 const defaultFireRule: FireRule = {
   id: 0,
-  // 规则名称
-  name: null,
-  // 场景类型：0-防御，1-空降，null表示通用
+  name: '',
   sceneType: null,
-  // 触发条件（JSON格式）
-  conditions: null,
-  // 响应动作（JSON格式）
-  actions: null,
-  // 优先级（数值越小优先级越高）
+  conditions: '',
+  conditionsArray: [JSON.parse(JSON.stringify(defaultPayload))],
+  actions: '',
+  actionsArray: [JSON.parse(JSON.stringify(defaultPayload))],
   priority: 0,
-  // 是否启用（0禁用，1启用）
   enabled: true,
 };
 
 const getSceneTypeName = (item: FireRule): string => {
-  if (0 === item.sceneType) {
-    return '防御';
-  }
-  if (1 === item.sceneType) {
-    return '空降';
-  }
+  if (item.sceneType === 0) return '防御';
+  if (item.sceneType === 1) return '空降';
   return '通用';
 };
 
 const resolveItem = (item: FireRule) => {
-  let newItem = JSON.parse(JSON.stringify(item));
+  const newItem: FireRule = JSON.parse(JSON.stringify(item)) as FireRule;
+
+  try {
+    newItem.conditionsArray = item.conditions
+      ? (JSON.parse(item.conditions) as PlatformComponentPayload[])
+      : [JSON.parse(JSON.stringify(defaultPayload))];
+  } catch (e) {
+    newItem.conditionsArray = [JSON.parse(JSON.stringify(defaultPayload))];
+  }
+
+  try {
+    newItem.actionsArray = item.actions
+      ? (JSON.parse(item.actions) as PlatformComponentPayload[])
+      : [JSON.parse(JSON.stringify(defaultPayload))];
+  } catch (e) {
+    newItem.actionsArray = [JSON.parse(JSON.stringify(defaultPayload))];
+  }
+
+  // 确保数组不为空
+  if (!Array.isArray(newItem.conditionsArray) || newItem.conditionsArray.length === 0) {
+    newItem.conditionsArray = [JSON.parse(JSON.stringify(defaultPayload))];
+  }
+  if (!Array.isArray(newItem.actionsArray) || newItem.actionsArray.length === 0) {
+    newItem.actionsArray = [JSON.parse(JSON.stringify(defaultPayload))];
+  }
+
   return newItem;
 };
 
 const datasource = ref<FireRule[]>([]);
 const datasourceTotal = ref<number>(0);
-const selectedFireRule = ref<FireRule>(resolveItem(defaultFireRule));
+const selectedFireRule = ref<FireRule>(JSON.parse(JSON.stringify(defaultFireRule)));
 const formRef = ref<FormInstance | null>(null);
 
 const load = () => {
   datasource.value = [];
   datasourceTotal.value = 0;
-  formRef.value?.resetFields();
-  selectedFireRule.value = resolveItem(defaultFireRule);
+  if(selectedFireRule.value.id <= 0){
+    selectedFireRule.value = JSON.parse(JSON.stringify(defaultFireRule));
+    nextTick(() => {
+      formRef.value?.resetFields();
+    });
+  }
 
-  findFireRuleByQuery(query.value).then(r => {
+  findFireRuleByQuery(query.value).then((r: FireRulePageableResponse) => {
     datasource.value = r.rows ?? [];
     datasourceTotal.value = r.total ?? 0;
   });
 };
 
-
 const handleCreate = () => {
-  selectedFireRule.value = resolveItem(defaultFireRule);
+  formRef.value?.resetFields();
+  selectedFireRule.value = JSON.parse(JSON.stringify(defaultFireRule));
 };
 
 const handleSelect = (item: FireRule) => {
-  selectedFireRule.value = resolveItem(item);
   formRef.value?.resetFields();
+  nextTick(() => {
+    selectedFireRule.value = resolveItem(item);
+  });
 };
 
 const handleDelete = () => {
-  if (selectedFireRule.value && selectedFireRule.value.id > 0) {
+  if (selectedFireRule.value?.id > 0) {
     deleteFireRule(selectedFireRule.value.id).then(r => {
       if (r.code === 200) {
         load();
-        message.info(r.msg ?? '删除成功');
+        message.success(r.msg ?? '删除成功');
       } else {
         message.error(r.msg ?? '删除失败');
       }
@@ -219,29 +299,90 @@ const handleDelete = () => {
 };
 
 const handleSave = () => {
-  if (formRef.value) {
-    formRef.value.validate().then(() => {
-      let res = null;
-      let savedValue: FireRule = JSON.parse(JSON.stringify(selectedFireRule.value)) as any as FireRule;
-      if (savedValue.id > 0) {
-        res = updateFireRule(savedValue);
+  formRef.value?.validate().then(() => {
+    const savedValue: FireRule = JSON.parse(JSON.stringify(selectedFireRule.value));
+
+    savedValue.conditions = JSON.stringify(savedValue.conditionsArray);
+    savedValue.actions = JSON.stringify(savedValue.actionsArray);
+
+    const request = savedValue.id > 0
+      ? updateFireRule(savedValue)
+      : createFireRule(savedValue);
+
+    request.then(r => {
+      if (r.code === 200) {
+        load();
+        message.success(r.msg ?? '操作成功');
       } else {
-        res = createFireRule(savedValue);
-      }
-      if (res) {
-        res.then(r => {
-          if (r.code === 200) {
-            load();
-            message.info(r.msg ?? '操作成功');
-          } else {
-            message.error(r.msg ?? '操作失败');
-          }
-        });
+        message.error(r.msg ?? '操作失败');
       }
+    }).catch(err => {
+      message.error('请求失败：' + err.message);
     });
+  }).catch(err => {
+    message.error('表单验证失败：' + err.message);
+  });
+};
+
+const handleUpdateCondition = (payload: PlatformComponentPayload, index: number) => {
+  if (selectedFireRule.value && selectedFireRule.value.conditionsArray[index]) {
+    const newArray = [...selectedFireRule.value.conditionsArray];
+    newArray[index] = {
+      platform: payload.platform,
+      component: payload.component,
+    };
+    selectedFireRule.value.conditionsArray = newArray;
   }
 };
 
+const handleUpdateAction = (payload: PlatformComponentPayload, index: number) => {
+  if (selectedFireRule.value && selectedFireRule.value.actionsArray[index]) {
+    const newArray = [...selectedFireRule.value.actionsArray];
+    newArray[index] = {
+      platform: payload.platform,
+      component: payload.component,
+    };
+    selectedFireRule.value.actionsArray = newArray;
+  }
+};
+
+// 添加触发条件
+const handleAddCondition = () => {
+  if (selectedFireRule.value) {
+    selectedFireRule.value.conditionsArray.push(JSON.parse(JSON.stringify(defaultPayload)));
+  }
+};
+
+// 删除触发条件
+const handleMinusCondition = (index: number) => {
+  if (!selectedFireRule.value) return;
+  const list = [...selectedFireRule.value.conditionsArray];
+  if (list.length <= 1) {
+    selectedFireRule.value.conditionsArray = [JSON.parse(JSON.stringify(defaultPayload))];
+  } else {
+    list.splice(index, 1);
+    selectedFireRule.value.conditionsArray = list;
+  }
+};
+
+// 添加响应动作
+const handleAddAction = () => {
+  if (selectedFireRule.value) {
+    selectedFireRule.value.actionsArray.push(JSON.parse(JSON.stringify(defaultPayload)));
+  }
+};
+
+// 删除响应动作
+const handleMinusAction = (index: number) => {
+  if (!selectedFireRule.value) return;
+  const list = [...selectedFireRule.value.actionsArray];
+  if (list.length <= 1) {
+    selectedFireRule.value.actionsArray = [JSON.parse(JSON.stringify(defaultPayload))];
+  } else {
+    list.splice(index, 1);
+    selectedFireRule.value.actionsArray = list;
+  }
+};
 
 const handleChange = (page: number, pageSize: number) => {
   query.value.pageNum = page;
@@ -250,5 +391,4 @@ const handleChange = (page: number, pageSize: number) => {
 };
 
 onMounted(() => load());
-
 </script>

modeler/src/views/decision/rule/store.ts

@@ -0,0 +1,64 @@
+/*
+ * 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 { onMounted, ref, type Ref } from 'vue';
+import type { Platform, PlatformComponent, PlatformWithComponents, PlatformWithComponentsResponse } from '../types';
+import { findAllPlatformWithComponents } from './api';
+
+const loading: Ref<boolean> = ref<boolean>(true);
+const platforms: Ref<PlatformWithComponents[]> = ref<PlatformWithComponents[]>([]);
+const platformMap: Ref<Map<number, Platform>> = ref<Map<number, Platform>>(new Map());
+const componentMap: Ref<Map<number, PlatformComponent>> = ref<Map<number, PlatformComponent>>(new Map());
+const loaded: Ref<boolean> = ref<boolean>(false);
+
+export interface UsePlatformComponentsReturn {
+  loading: Ref<boolean>;
+  platforms: Ref<PlatformWithComponents[]>;
+  platformMap: Ref<Map<number, Platform>>;
+  componentMap: Ref<Map<number, PlatformComponent>>;
+  loaded: Ref<boolean>;
+}
+
+export const usePlatformComponents = (): UsePlatformComponentsReturn => {
+  const load = () => {
+    if (!loaded.value) {
+      loading.value = true;
+      platformMap.value.clear();
+      componentMap.value.clear();
+
+      findAllPlatformWithComponents()
+        .then((res: PlatformWithComponentsResponse) => { // 显式标注响应类型
+          platforms.value = res.data || [];
+          platforms.value.forEach(platform => {
+            platformMap.value.set(platform.id, platform);
+            platform.components?.forEach(component => {
+              componentMap.value.set(component.id, component);
+            });
+          });
+          loaded.value = true;
+        })
+        .catch((err: unknown) => {
+          console.error('加载平台组件失败:', err);
+        })
+        .finally(() => {
+          loading.value = false;
+        });
+    }
+  };
+
+  onMounted(() => load());
+
+  return {
+    loading,
+    platforms,
+    platformMap,
+    componentMap,
+    loaded,
+  };
+};

modeler/src/views/decision/rule/types.ts

@@ -8,6 +8,7 @@
  */
 
 import type { NullableString, PageableResponse } from '@/types';
+import type { PlatformComponentPayload } from '../types';
 
 export interface FireRule {
   id: number,
@@ -17,8 +18,10 @@ export interface FireRule {
   sceneType: Number | null,
   // 触发条件（JSON格式）
   conditions: NullableString,
-  // 响应动作（JSON格式）
-  actions: NullableString,
+  conditionsArray:  PlatformComponentPayload[],
+    // 响应动作（JSON格式）
+  actions:  NullableString,
+  actionsArray:  PlatformComponentPayload[],
   // 优先级（数值越小优先级越高）
   priority: number,
   // 是否启用（0禁用，1启用）

modeler/src/views/decision/types/index.ts

@@ -0,0 +1,10 @@
+/*
+ * 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.
+ */
+
+export * from './platform'

modeler/src/views/decision/types/platform.ts

@@ -0,0 +1,43 @@
+/*
+ * 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 type { ApiDataResponse, NullableString } from '@/types';
+
+export interface Platform {
+  id: number,
+  name: NullableString,
+  description: NullableString,
+  scenarioId: number,
+
+  [key: string]: unknown;
+}
+
+export interface PlatformComponent {
+  id: number,
+  name: NullableString,
+  type: NullableString,
+  description: NullableString,
+  platformId: number,
+  [key: string]: unknown;
+}
+
+export interface PlatformWithComponents extends Platform {
+  components: PlatformComponent[],
+  [key: string]: unknown;
+}
+
+export interface PlatformComponentPayload {
+  platform: Platform | null;
+  component: PlatformComponent | null;
+  [key: string]: unknown;
+}
+
+export interface PlatformWithComponentsResponse extends ApiDataResponse<PlatformWithComponents[]> {
+
+}

modeler/types/components.d.ts

@@ -15,6 +15,7 @@ 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']
@@ -44,6 +45,7 @@ declare module 'vue' {
     ASelect: typeof import('ant-design-vue/es')['Select']
     ASelectOption: typeof import('ant-design-vue/es')['SelectOption']
     ASpace: typeof import('ant-design-vue/es')['Space']
+    ASwitch: typeof import('ant-design-vue/es')['Switch']
     ATabPane: typeof import('ant-design-vue/es')['TabPane']
     ATabs: typeof import('ant-design-vue/es')['Tabs']
     ATextarea: typeof import('ant-design-vue/es')['Textarea']
@@ -58,6 +60,7 @@ 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']
@@ -87,6 +90,7 @@ declare global {
   const ASelect: typeof import('ant-design-vue/es')['Select']
   const ASelectOption: typeof import('ant-design-vue/es')['SelectOption']
   const ASpace: typeof import('ant-design-vue/es')['Space']
+  const ASwitch: typeof import('ant-design-vue/es')['Switch']
   const ATabPane: typeof import('ant-design-vue/es')['TabPane']
   const ATabs: typeof import('ant-design-vue/es')['Tabs']
   const ATextarea: typeof import('ant-design-vue/es')['Textarea']

pom.xml

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