From 19073460b1ce525ba40b02f18a960cffa388cfa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Thu, 9 Apr 2026 17:25:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=81=94=E8=AE=BE=E5=A4=87=E6=8B=89?=
 =?UTF-8?q?=E5=8F=96=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/manager/mapper/DeviceManagerMapper.java     |  1 +
 .../device/manager/mapper/xml/DeviceManagerMapper.xml  |  6 +++++-
 .../manager/service/impl/DeviceManagerServiceImpl.java | 10 +++++++++-
 .../nu/modules/syncbiz/mapper/xml/SyncBizMapper.xml    |  7 ++++++-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/DeviceManagerMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/DeviceManagerMapper.java
index be442d4..ba95826 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/DeviceManagerMapper.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/DeviceManagerMapper.java
@@ -38,6 +38,7 @@ public interface DeviceManagerMapper extends BaseMapper<DeviceManager> {
     //    DevicePreview getPreview(DevicePreview devicePreview);
 
     void syncPreview(String id);
+    void editPreviewStatusBySn(DeviceIntegration deviceIntegration);
     void deletePreviewById(String id);
     void editPreviewSn(DevicePreview devicePreview);
     void bindPreview(DevicePreview devicePreview);
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/xml/DeviceManagerMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/xml/DeviceManagerMapper.xml
index c1608d4..7f1a1ed 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/xml/DeviceManagerMapper.xml
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/xml/DeviceManagerMapper.xml
@@ -371,7 +371,11 @@
         where id = #{id}
     </update>
 
-
+    <update id="editPreviewStatusBySn">
+        update nu_iot_device_preview
+        set device_status = #{deviceStatus}
+        where sn = #{sn}
+    </update>
 
     <delete id="deletePreviewById">
         delete from nu_iot_device_preview where id = #{id}
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/service/impl/DeviceManagerServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/service/impl/DeviceManagerServiceImpl.java
index b556d2d..ab1e99a 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/service/impl/DeviceManagerServiceImpl.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/service/impl/DeviceManagerServiceImpl.java
@@ -256,7 +256,9 @@ public class DeviceManagerServiceImpl extends ServiceImpl<DeviceManagerMapper, D
         if(!res.isSuccess()){
             return res;
         }
-        return Result.OK("拉取监控设备成功!");
+        deviceIntegration.setDeviceStatus("正常");
+        baseMapper.editPreviewStatusBySn(deviceIntegration);
+        return Result.OK("拉取设备成功!");
     }
 
     @Override
@@ -285,6 +287,8 @@ public class DeviceManagerServiceImpl extends ServiceImpl<DeviceManagerMapper, D
         if(!res.isSuccess()){
             return res;
         }
+        deviceIntegration.setDeviceStatus("正常");
+        baseMapper.editPreviewStatusBySn(deviceIntegration);
         return Result.OK("拉取电表成功!");
     }
 
@@ -315,6 +319,8 @@ public class DeviceManagerServiceImpl extends ServiceImpl<DeviceManagerMapper, D
         tqDeviceInfoService.getAllMeter(true);
         tqDeviceInfoService.getAllCollector(true);
         syncBizService.syncDevice(deviceIntegration.getOrgCode(),deviceIntegration.getSn());
+        deviceIntegration.setDeviceStatus("正常");
+        baseMapper.editPreviewStatusBySn(deviceIntegration);
         return Result.OK("拉取水表成功!");
     }
 
@@ -341,6 +347,8 @@ public class DeviceManagerServiceImpl extends ServiceImpl<DeviceManagerMapper, D
         if(!res.isSuccess()){
             return res;
         }
+        deviceIntegration.setDeviceStatus("正常");
+        baseMapper.editPreviewStatusBySn(deviceIntegration);
         return Result.OK("拉取温湿度计成功!");
     }
 
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncbiz/mapper/xml/SyncBizMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncbiz/mapper/xml/SyncBizMapper.xml
index a6cbae1..0f91555 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncbiz/mapper/xml/SyncBizMapper.xml
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncbiz/mapper/xml/SyncBizMapper.xml
@@ -408,7 +408,12 @@
                      location_name as locationName,
                      system_type as systemType,
                      protocol as protocol,
-                     channel as channel
+                     channel as channel,
+                     ftp_ip as ftpIp,
+                     ftp_port as ftpPort,
+                     ftp_username as ftpUsername,
+                     ftp_password as ftpPassword,
+                     ftp_uploadpath as ftpUploadpath
               from nu_iot_tplink_camera
               where mac = #{sn}
               order by id asc