功能完善

liuhaonan

2022-01-04 6fdb42abb942d258448e009bede60b2d341f5fa4

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

@@ -5,6 +5,7 @@
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.bo.WaterQualityEquipmentBo;
import com.sandu.ximon.dao.domain.AirEquipment;
import com.sandu.ximon.dao.domain.Monitor;
import com.sandu.ximon.dao.domain.WaterQualityEquipment;
@@ -18,28 +19,33 @@
@Service
@AllArgsConstructor
public class WaterQualityEquipmentService extends BaseServiceImpl<WaterQualityEquipmentMapper, WaterQualityEquipment> {
    private WaterQualityEquipmentMapper waterQualityEquipmentMapper;
    private final PoleBindingService poleBindingService;

    /**
     * 查询全部水质设备
     */
    public List<WaterQualityEquipment> listWaterQualityEquipment() {
        LambdaQueryWrapper<WaterQualityEquipment> wrapper = Wrappers.lambdaQuery(WaterQualityEquipment.class);
        List<WaterQualityEquipment> list = list(wrapper);

        return list;
    public List<WaterQualityEquipmentBo> listWaterQualityEquipment() {
        return waterQualityEquipmentMapper.listWaterQualityEquipment();
    }

    /**
     * 模糊查询
     */
    public List<WaterQualityEquipment> listWaterQualityEquipmentByKeyword(String keyword) {
    public List<WaterQualityEquipmentBo> 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);
    }

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

        return removeById(Id);
    }