Merge remote-tracking branch 'origin/master'

liuhaonan

2021-12-24 2de45155f323dd5371e9bb7432bd94b742d5cb77

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java

@@ -4,7 +4,9 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.WaterQualityEquipmentParam;
import com.sandu.ximon.dao.domain.AirEquipment;
import com.sandu.ximon.dao.domain.Monitor;
import com.sandu.ximon.dao.domain.WaterQualityEquipment;
import com.sandu.ximon.dao.mapper.AirEquipmentMapper;
import com.sandu.ximon.dao.mapper.WaterQualityEquipmentMapper;
@@ -33,8 +35,8 @@
    public List<WaterQualityEquipment> listWaterQualityEquipmentByKeyword(String keyword) {

        LambdaQueryWrapper<WaterQualityEquipment> wrapper = Wrappers.lambdaQuery(WaterQualityEquipment.class);
        if(keyword != null){
            wrapper.like(WaterQualityEquipment::getBelongTo,keyword);
        if (keyword != null) {
            wrapper.like(WaterQualityEquipment::getBelongTo, keyword);
        }
        List<WaterQualityEquipment> airDataList = list(wrapper);
        return airDataList;
@@ -53,4 +55,25 @@
        }
        return removeById(Id);
    }

    /**
     * 添加水质设备
     *
     * @param waterQualityEquipment
     * @return
     */

    public boolean addWaterQualityEquipment(WaterQualityEquipment waterQualityEquipment) {
        if (waterQualityEquipment.getWaterQualityEquipmentCode() == null) {
            throw new BusinessException("缺少水质设备号参数");
        }
        WaterQualityEquipment one = getOne(Wrappers.lambdaQuery(WaterQualityEquipment.class).eq(WaterQualityEquipment::getWaterQualityEquipmentCode,
                waterQualityEquipment.getWaterQualityEquipmentCode()));
        if (one == null) {
            return save(waterQualityEquipment);
        } else {
            waterQualityEquipment.setId(one.getId());
            return updateById(waterQualityEquipment);
        }
    }
}