From dfacb4e315a49f2c0399574ef094c87b96e7e248 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 24 七月 2025 09:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ywx_ztns' into dev_ywx_ztns
---
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