From 6d0813730522eb9b389e5fcc86dd7e4be5d31d13 Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Wed, 2 Apr 2025 15:40:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=96=87=E4=BB=B6=20?=
 =?UTF-8?q?=E5=89=8D=E7=BC=80=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/device/app/AppController.java |  1 +
 .../main/resources/mapper/device/AsDeviceMapper.xml   | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/AutoSprout-watering/src/main/java/com/ruoyi/device/app/AppController.java b/AutoSprout-watering/src/main/java/com/ruoyi/device/app/AppController.java
index af649ff..032b1c2 100644
--- a/AutoSprout-watering/src/main/java/com/ruoyi/device/app/AppController.java
+++ b/AutoSprout-watering/src/main/java/com/ruoyi/device/app/AppController.java
@@ -209,6 +209,7 @@ public class AppController extends BaseController
     @PostMapping(value = "/bandDevice")
     public AjaxResult bandDevice(@RequestBody AsDevice asDevice)
     {
+        logger.info("接收到绑定设备请求：【{}】",JSON.toJSON(asDevice));
         return success(asDeviceService.bandDevice(asDevice));
     }
 //
diff --git a/AutoSprout-watering/src/main/resources/mapper/device/AsDeviceMapper.xml b/AutoSprout-watering/src/main/resources/mapper/device/AsDeviceMapper.xml
index 497e276..e34ddf6 100644
--- a/AutoSprout-watering/src/main/resources/mapper/device/AsDeviceMapper.xml
+++ b/AutoSprout-watering/src/main/resources/mapper/device/AsDeviceMapper.xml
@@ -40,12 +40,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="modeStr"    column="mode_str"    />
         <result property="bluetoothId"    column="bluetooth_id"    />
         <result property="bluetoothName"    column="bluetooth_name"    />
+        <result property="pre"    column="pre"    />
     </resultMap>
 
     <sql id="selectAsDeviceVo">
         select device_id, picture, device_name, classify_id, classify_name, model_id, model, mac, activation_time, online_status,
                user_id, user_name, nick_name, regular_watering, soil_moisture_open, soil_moisture_close, water_intensity, pulse_mode,
-               pulse_mode_param, screen_rest_time, version, version_id, create_by, create_time, update_by, update_time, remark, regular_watering_json, soil_moisture, water_intensity_switch,is_network,is_default,mode_str,bluetooth_id,bluetooth_name from as_device
+               pulse_mode_param, screen_rest_time, version, version_id, create_by, create_time, update_by, update_time, remark,
+               regular_watering_json, soil_moisture, water_intensity_switch,is_network,is_default,mode_str,bluetooth_id,bluetooth_name, pre
+        from as_device
     </sql>
 
     <select id="selectAsDeviceList" parameterType="AsDevice" resultMap="AsDeviceResult">
@@ -120,6 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="regularWateringJson != null">regular_watering_json,</if>
             <if test="soilMoisture != null">soil_moisture,</if>
             <if test="waterIntensitySwitch != null">water_intensity_switch</if>
+            <if test="pre != null">pre,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="picture != null">#{picture},</if>
@@ -151,6 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="regularWateringJson != null">#{regularWateringJson},</if>
             <if test="soilMoisture != null">#{soilMoisture},</if>
             <if test="waterIntensitySwitch != null">#{waterIntensitySwitch}</if>
+            <if test="pre != null">#{pre},</if>
          </trim>
     </insert>
 
@@ -192,6 +197,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="modeStr != null">mode_str = #{modeStr},</if>
             <if test="bluetoothId != null">bluetooth_id = #{bluetoothId},</if>
             <if test="bluetoothName != null">bluetooth_name = #{bluetoothName}</if>
+            <if test="pre != null">pre = #{pre}</if>
         </trim>
         where device_id = #{deviceId}
     </update>
@@ -231,6 +237,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isNetwork != null">is_network = #{isNetwork},</if>
             <if test="isDefault != null">is_default = #{isDefault},</if>
             <if test="modeStr != null">mode_str = #{modeStr}</if>
+            <if test="bluetoothId != null">bluetooth_id = #{bluetoothId}</if>
+            <if test="bluetoothName != null">bluetooth_name = #{bluetoothName}</if>
+            <if test="pre != null">pre = #{pre}</if>
         </trim>
         where mac = #{mac}
     </update>