From 5c135179dde642eb60dab46f4ab964f2d0f6dead Mon Sep 17 00:00:00 2001
From: guoapeng <GuoAnPeng@163.com>
Date: Tue, 18 Feb 2025 14:24:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=BA=E5=99=A8=E4=BB=A3=E5=8F=B7=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/qyft/gd/model/vo/SysSettingVO.java               | 3 +++
 src/main/java/com/qyft/gd/service/impl/SysSettingsServiceImpl.java | 1 +
 src/main/resources/mapper/SysSettingsMapper.xml                    | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/qyft/gd/model/vo/SysSettingVO.java b/src/main/java/com/qyft/gd/model/vo/SysSettingVO.java
index 10000f1..4e43ae0 100644
--- a/src/main/java/com/qyft/gd/model/vo/SysSettingVO.java
+++ b/src/main/java/com/qyft/gd/model/vo/SysSettingVO.java
@@ -26,4 +26,7 @@ public class SysSettingVO {
     @Schema(description = "配置值")
     private String value;
 
+    @Schema(description = "设备id")
+    private String hardwareId;
+
 }
diff --git a/src/main/java/com/qyft/gd/service/impl/SysSettingsServiceImpl.java b/src/main/java/com/qyft/gd/service/impl/SysSettingsServiceImpl.java
index 32cada0..b31f51e 100644
--- a/src/main/java/com/qyft/gd/service/impl/SysSettingsServiceImpl.java
+++ b/src/main/java/com/qyft/gd/service/impl/SysSettingsServiceImpl.java
@@ -37,6 +37,7 @@ public class SysSettingsServiceImpl extends ServiceImpl<SysSettingsMapper, SysSe
             map.setCode(sysSettings.getCode());
             map.setId(sysSettings.getId());
             map.setValue(sysSettings.getValue());
+            map.setHardwareId(sysSettings.getHardwareId());
             map.setChildren(childrenList);
             result.add(map);
         }
diff --git a/src/main/resources/mapper/SysSettingsMapper.xml b/src/main/resources/mapper/SysSettingsMapper.xml
index 83e39b6..160e0f9 100644
--- a/src/main/resources/mapper/SysSettingsMapper.xml
+++ b/src/main/resources/mapper/SysSettingsMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qyft.gd.mapper.SysSettingsMapper">
     <select id="getConfig" resultType="com.qyft.gd.model.vo.SysSettingVO">
-        select id, parent_id, code, name, value1 as value from sys_settings where parent_id = #{parentId}
+        select id, parent_id, code, name, value1 as value, value2 as hardwareId from sys_settings where parent_id = #{parentId}
     </select>
     <select id="getIdByCode" resultType="java.lang.Integer">
         select id from sys_settings where code = #{type}