Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-04-28 bfce748e37a753c729e15dd233600379f504d019

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

@@ -29,9 +29,13 @@
     * 模糊查询
     */
    public List<WaterQualityDataBo> listWaterQualityDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
        Long clientId = SecurityUtils.getClientId();
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        List<Long> waterQualityDataId = waterQualityDataMapper.listWaterQualityDataId(keyword, clientId);
        List<Long> waterQualityDataId;
        if (SecurityUtils.getClientId() == null) {
            waterQualityDataId = waterQualityDataMapper.listWaterQualityDataId(keyword, null);
        } else {
            waterQualityDataId = waterQualityDataMapper.listWaterQualityDataId(keyword, SecurityUtils.getUserId());
        }
        if (CollUtil.isEmpty(waterQualityDataId)) {
            return CollUtil.newArrayList();
        }
@@ -70,10 +74,17 @@
                }
            }
            waterQualityData.setWaterQualityEquipmentCode(waterQualityDataDto.getDid());
            //设置水质设备状态
            if (waterQualityDataDto != null) {
                waterQualityDataDto.setState(1);
            } else {
                waterQualityDataDto.setState(0);
            }
            save(waterQualityData);
        } catch (Exception e) {
            e.printStackTrace();
            throw new BusinessException("水质设备号不正确");
            log.error("水质设备号不正确");
//            throw new BusinessException("水质设备号不正确");
        }

        return waterQualityDataDto;