完成截止12.24测试出来的问题

zss

2024-12-24 dd664cf0ffa2eeef35c3e6955297b7fa2c903cc3

 cnas-server/src/main/java/com/yuanchu/mom/service/impl/DataConfigServiceImpl.java

@@ -1,11 +1,15 @@
package com.yuanchu.mom.service.impl;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.dto.DeviceConfigDtoPage;
import com.yuanchu.mom.dto.DataConfigDto;
import com.yuanchu.mom.mapper.DataConfigMapper;
import com.yuanchu.mom.mapper.DeviceMapper;
import com.yuanchu.mom.pojo.DataConfig;
import com.yuanchu.mom.pojo.Device;
import com.yuanchu.mom.service.DataConfigService;
import com.yuanchu.mom.vo.Result;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

@@ -25,11 +29,9 @@

    private GetLook getLook;

    private DeviceMapper deviceMapper;

    private DataConfigMapper dataConfigMapper;
    @Override
    public List<DeviceConfigDtoPage> selectDataConfigList(Integer deviceId) {
        return dataConfigMapper.selectDataConfigList(deviceId);
    }

    @Override
    public void deleteDataConfig() {
@@ -38,4 +40,35 @@
            dataConfigMapper.deleteBatchIds(integers);
        }
    }

    @Override
    public void saveDataAcquisitionConfiguration(Integer deviceId, DataConfigDto dataConfigList) {
        if (dataConfigList.getIsDevice()) {
            Device device = new Device();
            device.setId(deviceId);
            device.setCollectUrl(dataConfigList.getCollectUrl());
            device.setStorageUrl(dataConfigList.getStorageUrl());
            device.setIp(dataConfigList.getIp());
            device.setFileType(dataConfigList.getFileType());
            device.setEntrustCode(dataConfigList.getEntrustCode());
            device.setSampleCode(dataConfigList.getSampleCode());
            device.setDbFileName(dataConfigList.getDbFileName());
            deviceMapper.updateById(device);
        } else {
            this.saveOrUpdateBatch(dataConfigList.getDataConfigList());
        }
    }

    @Override
    public Result<?> queryDataAcquisitionConfiguration(Integer deviceId, Boolean isDevice, String inspectionItem, String inspectionItemSubclass) {
        if (isDevice) {
            List<DataConfig> list = baseMapper.selectList(Wrappers.<DataConfig>lambdaQuery()
                    .eq(DataConfig::getDeviceId, deviceId)
                    .eq(DataConfig::getInspectionItem, inspectionItem)
                    .eq(DataConfig::getInspectionItemSubclass, inspectionItemSubclass));
            return Result.success(list);
        } else {
            return Result.success(dataConfigMapper.selectDataConfigList(deviceId));
        }
    }
}