From e9ab447fd70e0a84190bc1031a8330b893c21b87 Mon Sep 17 00:00:00 2001 From: yaowanxin <3588231647@qq.com> Date: 星期一, 07 七月 2025 18:00:04 +0800 Subject: [PATCH] 改解 --- cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java | 10 +++++++++- 1 files changed, 9 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 c743869..d07704c 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,11 +241,19 @@ .eq(DataConfig::getDeviceId, device.getId())); // 鑾峰彇璁惧閰嶇疆绫� - // 鍒ゆ柇璁惧鏄惁鏄暟瀛楃洿妗� + // 鍒ゆ柇璁惧鏄惁鏄暟瀛楃洿妗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 鍒楄〃鐨勭涓�涓厓绱犱腑鑾峰彇鐨勭數缂嗘爣绛� } } -- Gitblit v1.9.3