From b02ace7aa9a5e046d533cf80afa8ec14c40fe133 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 24 七月 2025 17:56:00 +0800
Subject: [PATCH] 直流电阻:解析mqtt订阅的数据保存到redis

---
 cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
index a9ac09f..ba01fa4 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
@@ -241,6 +241,7 @@
             Device device1 = deviceMapper.selectById(device.getId());
             dto.setDbUserName(device1.getDbUserName());
             dto.setDbPassword(device1.getDbPassword());
+            dto.setDbTable(device1.getDbTable());
             String ip = device.getIp();
 
             // 鏍规嵁妫�楠岄」鑾峰彇config
@@ -254,7 +255,7 @@
                 map.putAll(dataCollectBridge(list, device, dto.getEntrustCode()));
 
             } else {
-                map.putAll(DataAcquisition.dataAcquisitionEntrance(list, device, dto.getEntrustCode(), dto.getEntrustCode(), ip, insProducts.get(0).getCableTag(),dto.getDbUserName(),dto.getDbPassword()));
+                map.putAll(DataAcquisition.dataAcquisitionEntrance(list, device, dto.getEntrustCode(), dto.getEntrustCode(), ip, insProducts.get(0).getCableTag(),dto.getDbUserName(),dto.getDbPassword(),dto.getDbTable()));
 
             }
         }

--
Gitblit v1.9.3