1。检验项目导入新增字段 2.数采新增字段

liding

2025-04-16 56341ed5e8671f7002c295a371d6d4dcf0c55012

 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;
@@ -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,8 @@
            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);
        }
    }
}