数采调整

zouyu

10 小时以前 c17a0d27b6a2e9e0ebda4ee584b6b2fdf4e323ca

 cnas-device/src/main/java/com/ruoyi/device/service/impl/DataConfigServiceImpl.java

@@ -2,7 +2,6 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -14,6 +13,7 @@
import com.ruoyi.device.pojo.Device;
import com.ruoyi.device.service.DataConfigService;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

@@ -88,7 +88,12 @@
        if (dataConfig.getStructureItemParameterId() == null) {
            throw new RuntimeException("缺少检测项id");
        }
        List<DataConfig> list = baseMapper.selectList(Wrappers.<DataConfig>lambdaQuery().eq(DataConfig::getStructureItemParameterId, dataConfig.getStructureItemParameterId()));
        List<DataConfig> list = baseMapper.selectList(Wrappers.<DataConfig>lambdaQuery()
                        .eq(DataConfig::getDeviceId,dataConfig.getDeviceId())
                        .eq(DataConfig::getInspectionItem,dataConfig.getInspectionItem())
                        .eq(StringUtils.isNotBlank(dataConfig.getInspectionItemClass()),DataConfig::getInspectionItemClass,dataConfig.getInspectionItemClass())
                        .eq(StringUtils.isNotBlank(dataConfig.getInspectionItemSubclass()),DataConfig::getInspectionItemSubclass,dataConfig.getInspectionItemSubclass())
                        .eq(DataConfig::getStructureItemParameterId, dataConfig.getStructureItemParameterId()));
        return Result.success(list);
    }