From e8eb756760d2a1fe65f70545482364a07fa1060a Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期六, 19 七月 2025 10:21:32 +0800
Subject: [PATCH] 修改方法2
---
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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 d07704c..a9ac09f 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
@@ -35,6 +35,7 @@
import lombok.AllArgsConstructor;
import org.apache.logging.log4j.util.Strings;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -194,6 +195,8 @@
@Override
public Result<?> dataAcquisition(HttpServletRequest request, DeviceCollectionDto dto) {
+
+
// 鏌ヨ妫�楠岄」
List<Integer> itemIds = dto.getItemIds();
if (CollectionUtils.isEmpty(itemIds)) {
@@ -234,7 +237,12 @@
// 鏁伴噰杩斿洖淇℃伅
Map<String, Object> map = new HashMap<>();
for (Device device : deviceList) {
+
+ Device device1 = deviceMapper.selectById(device.getId());
+ dto.setDbUserName(device1.getDbUserName());
+ dto.setDbPassword(device1.getDbPassword());
String ip = device.getIp();
+
// 鏍规嵁妫�楠岄」鑾峰彇config
List<DataConfig> list = dataConfigService.list(Wrappers.<DataConfig>lambdaQuery()
.in(DataConfig::getStructureItemParameterId, itemParameterIds)
@@ -244,16 +252,10 @@
// 鍒ゆ柇璁惧鏄惁鏄暟瀛楃洿妗CZX-ZB-ER02022
if (device.getManagementNumber().equals("JCZX-ZB-ER02022")) {
map.putAll(dataCollectBridge(list, device, dto.getEntrustCode()));
-// list锛氬寘鍚澶囬厤缃俊鎭殑 DataConfig 鍒楄〃銆�
-// device锛氬綋鍓嶇殑璁惧瀵硅薄銆�
-// dto.getEntrustCode()锛氫粠 DeviceCollectionDto 瀵硅薄涓幏鍙栫殑濮旀墭缂栫爜
+
} else {
- map.putAll(DataAcquisition.dataAcquisitionEntrance(list, device, dto.getEntrustCode(), dto.getEntrustCode(), ip, insProducts.get(0).getCableTag()));
-// list锛氬寘鍚澶囬厤缃俊鎭殑 DataConfig 鍒楄〃銆�
-// device锛氬綋鍓嶇殑璁惧瀵硅薄銆�
-// dto.getEntrustCode()锛氬鎵樼紪鐮侊紝姝ゅ浼犲叆涓ゆ銆�
-// ip锛氬綋鍓嶈澶囩殑 IP 鍦板潃銆�
-// insProducts.get(0).getCableTag()锛氫粠 insProducts 鍒楄〃鐨勭涓�涓厓绱犱腑鑾峰彇鐨勭數缂嗘爣绛�
+ map.putAll(DataAcquisition.dataAcquisitionEntrance(list, device, dto.getEntrustCode(), dto.getEntrustCode(), ip, insProducts.get(0).getCableTag(),dto.getDbUserName(),dto.getDbPassword()));
+
}
}
--
Gitblit v1.9.3