摄像头fix

zhanzhiqin

2021-12-30 b2ad6e608b6a75856bff198f7acc16b359a2849a

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

@@ -18,7 +18,8 @@
@Service
@AllArgsConstructor
public class WaterQualityEquipmentService extends BaseServiceImpl<WaterQualityEquipmentMapper, WaterQualityEquipment> {

    private WaterQualityEquipmentMapper waterQualityEquipmentMapper;
    private final PoleBindingService poleBindingService;
    /**
     * 查询全部水质设备
     */
@@ -33,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);
    }

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

        return removeById(Id);
    }