yeg
2026-08-29 a1404bf02e28ef3d587928fef04d79742dd22662
修复开始接收通道查询歧义

为检测柜通道查询字段补充表别名,避免连接检测柜后 adapter_id 等字段歧义,并增加 Mapper 契约断言。
2个文件已修改
7 ■■■■■ 已修改文件
ruoyi-admin/src/test/java/com/ruoyi/config/TestDeviceBindingMapperContractTest.java 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/TTestMapper.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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"));
    }
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}