| | |
| | | public List<WaterQualityDataBo> listWaterQualityDataByKeyword(BaseConditionVO baseConditionVO, String keyword) { |
| | | PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize()); |
| | | List<Long> waterQualityDataId; |
| | | if(SecurityUtils.getClientId() == null){ |
| | | if (SecurityUtils.getClientId() == null) { |
| | | waterQualityDataId = waterQualityDataMapper.listWaterQualityDataId(keyword, null); |
| | | }else{ |
| | | } else { |
| | | waterQualityDataId = waterQualityDataMapper.listWaterQualityDataId(keyword, SecurityUtils.getUserId()); |
| | | } |
| | | if (CollUtil.isEmpty(waterQualityDataId)) { |
| | |
| | | save(waterQualityData); |
| | | } catch (Exception e) { |
| | | e.printStackTrace(); |
| | | throw new BusinessException("水质设备号不正确"); |
| | | log.error("水质设备号不正确"); |
| | | // throw new BusinessException("水质设备号不正确"); |
| | | } |
| | | |
| | | return waterQualityDataDto; |