增加雷达报警和视频巡检引导类型上报

‘liusuyi’

2024-04-19 39004678a36c17fcea0674b54675a76c2d3b0528

 ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java

@@ -292,14 +292,14 @@
        Integer pageNum = ardAlarmpointsWellParam.getPageNum();
        Integer pageSize = ardAlarmpointsWellParam.getPageSize();
        PageHelper.startPage(pageNum, pageSize);
//        QueryWrapper<ArdAlarmpointsWell> queryWrapper = new QueryWrapper<>();
//        queryWrapper.select("id","altitude","metering_station","displacement_mode","latitude","dehydration_station",
//                "well_type","production_date","well_id","transfer_station","oil_production","run_status","longitude",
//                "installed_load","dept_id","user_id","surrounding_environment","well_number","well_block")
//                .eq(!StringUtils.isBlank(ardAlarmpointsWellParam.getWellId()), "well_id", ardAlarmpointsWellParam.getWellId())
//                .in("dept_id", ardAlarmpointsWellParam.getDeptList());
//        List<ArdAlarmpointsWell> list = ardAlarmpointsWellMapper.selectList(queryWrapper);
        List<ArdAlarmpointsWell> list = ardAlarmpointsWellMapper.conditionList(ardAlarmpointsWellParam);
        QueryWrapper<ArdAlarmpointsWell> queryWrapper = new QueryWrapper<>();
        queryWrapper.select("id","altitude","metering_station","displacement_mode","latitude","dehydration_station",
                "well_type","production_date","well_id","transfer_station","oil_production","run_status","longitude",
                "installed_load","dept_id","user_id","surrounding_environment","well_number","well_block")
                .like(!StringUtils.isBlank(ardAlarmpointsWellParam.getWellId()), "well_id", ardAlarmpointsWellParam.getWellId())
                .in("dept_id", ardAlarmpointsWellParam.getDeptList());
        List<ArdAlarmpointsWell> list = ardAlarmpointsWellMapper.selectList(queryWrapper);
//        List<ArdAlarmpointsWell> list = ardAlarmpointsWellMapper.conditionList(ardAlarmpointsWellParam.getWellId(),ardAlarmpointsWellParam.getDeptList());
        return new PageInfo<>(list);
    }