From bc1b3ee367f7e9aef88fc59647a9631f39eca6b5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 23 四月 2025 09:19:55 +0800
Subject: [PATCH] 1.数采 2.国产网分仪
---
cnas-device/src/main/java/com/ruoyi/device/service/impl/DataConfigServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DataConfigServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DataConfigServiceImpl.java
index b20778c..b287220 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DataConfigServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DataConfigServiceImpl.java
@@ -20,7 +20,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -48,7 +48,7 @@
Device device = new Device();
BeanUtils.copyProperties(dataConfigList, device);
List<String> channelList = dataConfigList.getChannel();
- if (channelList != null &&!channelList.isEmpty()) {
+ if (channelList != null && !channelList.isEmpty()) {
String channelString = String.join(",", channelList);
device.setChannel(channelString);
}
@@ -79,4 +79,10 @@
return Result.success(deviceConfigDtoPages);
}
}
+
+ @Override
+ public Result<?> queryDataAcquisitionConfigurationTwo(DataConfig dataConfig) {
+ List<DeviceConfigDtoPage> deviceConfigDtoPages = dataConfigMapper.selectDataConfigListTwo(dataConfig.getDeviceName(), dataConfig.getManagementNumber());
+ return Result.success(deviceConfigDtoPages);
+ }
}
--
Gitblit v1.9.3