fix

zhanzhiqin

2021-12-28 7abc2e222ce399ffc724c485142e5c42ff3da3b2

 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;
@@ -16,7 +18,8 @@
@Service
@AllArgsConstructor
public class WaterQualityEquipmentService extends BaseServiceImpl<WaterQualityEquipmentMapper, WaterQualityEquipment> {

    private WaterQualityEquipmentMapper waterQualityEquipmentMapper;
    private final PoleBindingService poleBindingService;
    /**
     * 查询全部水质设备
     */
@@ -31,13 +34,19 @@
     * 模糊查询
     */
    public List<WaterQualityEquipment> listWaterQualityEquipmentByKeyword(String keyword) {
        if(keyword == null || keyword.trim().length() == 0){
            return listWaterQualityEquipment();

        LambdaQueryWrapper<WaterQualityEquipment> wrapper = Wrappers.lambdaQuery(WaterQualityEquipment.class);
        if(keyword != null){
            wrapper.like(WaterQualityEquipment::getBelongTo,keyword);
        }else{
            return waterQualityEquipmentMapper.listWaterQualityEquipmentByKeyword(keyword);
        }
        List<WaterQualityEquipment> airDataList = list(wrapper);
        return airDataList;

//        LambdaQueryWrapper<WaterQualityEquipment> wrapper = Wrappers.lambdaQuery(WaterQualityEquipment.class);
////        if (keyword != null) {
////            wrapper.like(WaterQualityEquipment::getBelongTo, keyword);
////        }
//        List<WaterQualityEquipment> airDataList = list(wrapper);
//        waterQualityEquipmentMapper.listWaterQualityEquipmentByKeyword(keyword);
    }

    /**
@@ -51,6 +60,30 @@
        if (waterQualityEquipment == null) {
            throw new BusinessException("找不到水质设备");
        }
        //删除摄水质设备前需要先解绑
        poleBindingService.unBindPole(waterQualityEquipment.getWaterQualityEquipmentCode());

        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);
        }
    }
}