更新

aijinhui

2024-02-23 2df696b07d0ffdf7829d4d9cd3da23162dec8799

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

@@ -291,21 +291,14 @@
        Integer pageNum = ardAlarmpointsWellParam.getPageNum();
        Integer pageSize = ardAlarmpointsWellParam.getPageSize();
        PageHelper.startPage(pageNum, pageSize);
        QueryWrapper<ArdAlarmpointsWell> queryWrapper = new QueryWrapper<>();
        queryWrapper.in("dept_id", ardAlarmpointsWellParam.getDeptList())
                .like(!StringUtils.isBlank(ardAlarmpointsWellParam.getWellId()), "well_id", ardAlarmpointsWellParam.getWellId());
//        .eq(!StringUtils.isBlank(ardAlarmpointsWellParam.getWellNumber()),"well_number",ardAlarmpointsWellParam.getWellNumber())
//        .eq(!StringUtils.isBlank(ardAlarmpointsWellParam.getOilProduction()),"oil_production",ardAlarmpointsWellParam.getOilProduction())
//        .eq(!StringUtils.isBlank(ardAlarmpointsWellParam.getWellBlock()),"well_block",ardAlarmpointsWellParam.getWellBlock())
//        .eq(!StringUtils.isBlank(ardAlarmpointsWellParam.getDisplacementMode()),"displacement_mode",ardAlarmpointsWellParam.getDisplacementMode())
//        .eq(!StringUtils.isBlank(ardAlarmpointsWellParam.getSurroundingEnvironment()),"surrounding_environment",ardAlarmpointsWellParam.getSurroundingEnvironment())
//        .eq(!StringUtils.isBlank(ardAlarmpointsWellParam.getWellType()),"well_type",ardAlarmpointsWellParam.getWellType())
//        .eq(!StringUtils.isBlank(ardAlarmpointsWellParam.getInstalledLoad()),"installed_load",ardAlarmpointsWellParam.getInstalledLoad())
//        .eq(!StringUtils.isBlank(ardAlarmpointsWellParam.getMeteringStation()),"metering_station",ardAlarmpointsWellParam.getMeteringStation())
//        .eq(!StringUtils.isBlank(ardAlarmpointsWellParam.getTransferStation()),"transfer_station",ardAlarmpointsWellParam.getTransferStation())
//        .eq(!StringUtils.isBlank(ardAlarmpointsWellParam.getDehydrationStation()),"dehydration_station",ardAlarmpointsWellParam.getDehydrationStation())
//        .eq(!StringUtils.isBlank(ardAlarmpointsWellParam.getRunStatus()),"run_status",ardAlarmpointsWellParam.getRunStatus());
        List<ArdAlarmpointsWell> list = ardAlarmpointsWellMapper.selectList(queryWrapper);
//        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);
        return new PageInfo<>(list);
    }

@@ -462,36 +455,6 @@
        } else {
            result.put("updateTime", "");
        }
        //if(ardAlarmpointsWell.getGuideP1() != null){
        //    result.put("guideP1",ardAlarmpointsWell.getGuideP1());
        //}else{
        //    result.put("guideP1","");
        //}
        //if(ardAlarmpointsWell.getGuideP2() != null){
        //    result.put("guideP2",ardAlarmpointsWell.getGuideP2());
        //}else{
        //    result.put("guideP2","");
        //}
        //if(ardAlarmpointsWell.getGuideT1() != null){
        //    result.put("guideT1",ardAlarmpointsWell.getGuideT1());
        //}else{
        //    result.put("guideT1","");
        //}
        //if(ardAlarmpointsWell.getGuideT2() != null){
        //    result.put("guideT2",ardAlarmpointsWell.getGuideT2());
        //}else{
        //    result.put("guideT2","");
        //}
        //if(ardAlarmpointsWell.getGuideZ1() != null){
        //    result.put("guideZ1",ardAlarmpointsWell.getGuideZ1());
        //}else{
        //    result.put("guideZ1","");
        //}
        //if(ardAlarmpointsWell.getGuideZ2() != null){
        //    result.put("guideZ2",ardAlarmpointsWell.getGuideZ2());
        //}else{
        //    result.put("guideZ2","");
        //}
        if (config.size() != 0) {
            String oracle = config.get(0).getConfigValue();
            String[] oracleArr = oracle.split(";");