From fbde0b947b4641081b558302ea77d88c902c4cd1 Mon Sep 17 00:00:00 2001 From: liding <756868258@qq.com> Date: 星期三, 30 四月 2025 10:03:24 +0800 Subject: [PATCH] 可靠性计划优化检验项 --- 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