From 13be3b8bd13cfa77fa6552e9731949df5e657108 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 03 四月 2025 09:14:59 +0800
Subject: [PATCH] 调整配置文件, 修改绑定查询

---
 cnas-device/src/main/resources/mapper/DataConfigMapper.xml |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/cnas-device/src/main/resources/mapper/DataConfigMapper.xml b/cnas-device/src/main/resources/mapper/DataConfigMapper.xml
index a24e029..b5dac74 100644
--- a/cnas-device/src/main/resources/mapper/DataConfigMapper.xml
+++ b/cnas-device/src/main/resources/mapper/DataConfigMapper.xml
@@ -14,10 +14,13 @@
 
     <select id="selectDataConfigList" resultType="com.ruoyi.device.dto.DeviceConfigDtoPage">
         SELECT ddc.*,
-               d.device_name
+               d.device_name,
+               sip.sample
         FROM device_data_config ddc
                  left join device d on ddc.device_id = d.id
+                 left join structure_item_parameter sip on sip.id = ddc.structure_item_parameter_id
         where d.id = #{deviceId}
+        order by ddc.id desc
     </select>
 
     <select id="deleteDataConfig" resultType="integer">
@@ -39,5 +42,6 @@
                  left join device_data_config ddc on ddc.device_id = d.id and ddc.structure_item_parameter_id = ip.id
         where d.id = #{deviceId}
           and ddc.id is null
+        order by ip.sample
     </select>
 </mapper>

--
Gitblit v1.9.3