水质设备查询

zhanzhiqin

2022-01-04 1fb4bbb7dd864cbe0da0d12826a9561783712e42

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

@@ -1,10 +1,15 @@
package com.sandu.ximon.admin.service;

import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.WaterQualityEquipmentParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.bo.AirEquipmentBo;
import com.sandu.ximon.dao.bo.WaterQualityEquipmentBo;
import com.sandu.ximon.dao.domain.AirEquipment;
import com.sandu.ximon.dao.domain.Monitor;
@@ -32,20 +37,15 @@
    /**
     * 模糊查询
     */
    public List<WaterQualityEquipmentBo> listWaterQualityEquipmentByKeyword(String keyword) {
        if (keyword == null || keyword.trim().length() == 0) {
            return listWaterQualityEquipment();

        } else {
            return waterQualityEquipmentMapper.listWaterQualityEquipmentByKeyword(keyword);
    public List<WaterQualityEquipmentBo> listWaterQualityEquipmentByKeyword(BaseConditionVO baseConditionVO, String keyword) {
        Long clientId = SecurityUtils.getClientId();
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        List<Long> listAirEquipmentId = waterQualityEquipmentMapper.WaterQualityEquipmentId(keyword, clientId);
        if (CollUtil.isEmpty(listAirEquipmentId)) {
            return CollUtil.newArrayList();
        }

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

    /**