From a1404bf02e28ef3d587928fef04d79742dd22662 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期六, 29 八月 2026 22:13:09 +0800
Subject: [PATCH] 修复开始接收通道查询歧义
---
ruoyi-admin/src/test/java/com/ruoyi/config/TestDeviceBindingMapperContractTest.java | 1 +
ruoyi-system/src/main/resources/mapper/system/TTestMapper.xml | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/config/TestDeviceBindingMapperContractTest.java b/ruoyi-admin/src/test/java/com/ruoyi/config/TestDeviceBindingMapperContractTest.java
index bd18edb..f0ddad8 100644
--- a/ruoyi-admin/src/test/java/com/ruoyi/config/TestDeviceBindingMapperContractTest.java
+++ b/ruoyi-admin/src/test/java/com/ruoyi/config/TestDeviceBindingMapperContractTest.java
@@ -23,6 +23,7 @@
assertTrue(mapper.contains("reception_status = 'NOT_STARTED'"));
assertTrue(mapper.contains("channel_count channelCount"));
assertTrue(mapper.contains("id=\"selectBatteryNosByTestIds\""));
+ assertTrue(mapper.contains("select channel_fact.channel_id, channel_fact.adapter_id"));
assertFalse(mapper.contains("group_concat"));
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TTestMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TTestMapper.xml
index d19302b..5e700e1 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TTestMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TTestMapper.xml
@@ -348,8 +348,10 @@
</insert>
<select id="selectReceptionChannelForUpdate" parameterType="Long" resultType="com.ruoyi.system.domain.TDetectionChannel">
- select channel_id, adapter_id, cabinet_id, devtype, devid, subdevid, chlid, display_no,
- online_status, work_status, last_seen_at_utc, status
+ select channel_fact.channel_id, channel_fact.adapter_id, channel_fact.cabinet_id,
+ channel_fact.devtype, channel_fact.devid, channel_fact.subdevid, channel_fact.chlid,
+ channel_fact.display_no, channel_fact.online_status, channel_fact.work_status,
+ channel_fact.last_seen_at_utc, channel_fact.status
from t_detection_channel channel_fact
join t_detection_cabinet cabinet on cabinet.cabinet_id = channel_fact.cabinet_id
where channel_fact.channel_id = #{channelId}
--
Gitblit v1.7.1