From 3ae6a693e1f37f9d0730e5f44e2f331f821ee839 Mon Sep 17 00:00:00 2001
From: MHW <wei2309328087@163.com>
Date: Tue, 14 Apr 2026 17:00:49 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=98=A0=E5=B0=84=E4=B8=8D=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/rule/FireRuleMapper.xml  | 35 +++++++++----------
 .../resources/mapper/scene/SceneMapper.xml    | 11 +++++-
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/auto-solution-rule/src/main/resources/mapper/rule/FireRuleMapper.xml b/auto-solution-rule/src/main/resources/mapper/rule/FireRuleMapper.xml
index 4a90672..78b5264 100644
--- a/auto-solution-rule/src/main/resources/mapper/rule/FireRuleMapper.xml
+++ b/auto-solution-rule/src/main/resources/mapper/rule/FireRuleMapper.xml
@@ -106,28 +106,27 @@
     </resultMap>
     <select id="findPlatformComponents" resultMap="VPlatformMap"
             parameterType="java.lang.Integer">
-<!--        SELECT DISTINCT-->
-<!--            p.*,-->
-<!--            pc.*-->
-<!--        FROM platform p-->
-<!--        LEFT JOIN platform_component pc ON p.id = pc.platform_id-->
-<!--        WHERE pc.type = 'comm'-->
-<!--          AND p.scenario_id = #{scenarioId}-->
-<!--        ORDER BY p.name,pc.name-->
-        SELECT
-        p.id,
-        p.name,
-        p.description
+        SELECT DISTINCT
+            p.*,
+            pc.*
         FROM platform p
         LEFT JOIN platform_component pc ON p.id = pc.platform_id
         WHERE pc.type = 'comm'
         AND p.scenario_id = #{scenarioId}
         ORDER BY p.name,pc.name
-    </select>
+        <!--        SELECT
+                p.id,
+                p.name,
+                p.description
+                FROM platform p
+                LEFT JOIN platform_component pc ON p.id = pc.platform_id
+                WHERE pc.type = 'comm'
+                AND p.scenario_id = #{scenarioId}
+                ORDER BY p.name,pc.name
+            </select>
 
-    <select id="findAllPlatformComponents" resultMap="VPlatformMap">
-        SELECT *
-        FROM platform
+            <select id="findAllPlatformComponents" resultMap="VPlatformMap">
+                SELECT *
+                FROM platform-->
     </select>
-
-</mapper>
\ No newline at end of file
+        </mapper>
\ No newline at end of file
diff --git a/auto-solution-scene/src/main/resources/mapper/scene/SceneMapper.xml b/auto-solution-scene/src/main/resources/mapper/scene/SceneMapper.xml
index f782c1b..ab0b53e 100644
--- a/auto-solution-scene/src/main/resources/mapper/scene/SceneMapper.xml
+++ b/auto-solution-scene/src/main/resources/mapper/scene/SceneMapper.xml
@@ -31,7 +31,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM behaviortree
         WHERE scenario_id=#{id}
     </select>
-    <select id="selectAllRelationBySceneId" resultType="com.solution.scene.domain.PlatformCommunication"
+
+    <resultMap id="PlatformCommunicationResultMap" type="com.solution.scene.domain.PlatformCommunication">
+        <id property="id" column="id"/>
+        <result property="commandPlatform" column="command_platform"/>
+        <result property="subordinatePlatform" column="subordinate_platform"/>
+        <result property="commandComm" column="command_comm"/>
+        <result property="subordinateComm" column="subordinate_comm"/>
+        <result property="scenaryId" column="scenary_id"/>
+    </resultMap>
+    <select id="selectAllRelationBySceneId" resultMap="PlatformCommunicationResultMap"
             parameterType="java.lang.Integer">
         SELECT id,command_platform,subordinate_platform,command_comm,subordinate_comm,scenary_id
         FROM platform_communication