From 4d5a0213352c1e5fd9410241668cbd06ea47e4c6 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 18 四月 2025 14:56:30 +0800
Subject: [PATCH] 拉力机数采
---
cnas-device/src/main/java/com/ruoyi/device/service/impl/DataConfigServiceImpl.java | 17 +++++++++++++++--
1 files changed, 15 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 1bbac34..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
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.device.dto.DataConfigDto;
+import com.ruoyi.device.dto.DeviceConfigDtoPage;
import com.ruoyi.device.mapper.DataConfigMapper;
import com.ruoyi.device.mapper.DeviceMapper;
import com.ruoyi.device.pojo.DataConfig;
@@ -19,7 +20,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -46,6 +47,11 @@
if (dataConfigList.getIsDevice()) {
Device device = new Device();
BeanUtils.copyProperties(dataConfigList, device);
+ List<String> channelList = dataConfigList.getChannel();
+ if (channelList != null && !channelList.isEmpty()) {
+ String channelString = String.join(",", channelList);
+ device.setChannel(channelString);
+ }
device.setId(deviceId);
deviceMapper.updateById(device);
} else {
@@ -69,7 +75,14 @@
List<DataConfig> list = baseMapper.selectList(wrapper);
return Result.success(list);
} else {
- return Result.success(dataConfigMapper.selectDataConfigList(dataConfig.getDeviceId()));
+ List<DeviceConfigDtoPage> deviceConfigDtoPages = dataConfigMapper.selectDataConfigList(dataConfig.getDeviceId());
+ 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