fix

zhanzhiqin

2022-04-15 c9586d61be8ae3411c6428a2cc2588c11f97db2c

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

@@ -1,11 +1,15 @@
package com.sandu.ximon.admin.service;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.dto.WaterQualityDataDto;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.bo.WaterQualityDataBo;
import com.sandu.ximon.dao.domain.WaterQualityData;
import com.sandu.ximon.dao.mapper.WaterQualityDataMapper;
import lombok.AllArgsConstructor;
@@ -19,27 +23,24 @@
    //水质参数获取网址，例如："http://iot.ainongye.cn/json/设备编号.json"
    private final String WATER_QUALITY_DATA_URL = "http://iot.ainongye.cn/json/";

    /**
     * 查询全部水质设备数据
     */
    public List<WaterQualityData> listWaterQualityData() {
        LambdaQueryWrapper<WaterQualityData> wrapper = Wrappers.lambdaQuery(WaterQualityData.class);
        List<WaterQualityData> list = list(wrapper);

        return list;
    }
    private WaterQualityDataMapper waterQualityDataMapper;

    /**
     * 模糊查询
     */
    public List<WaterQualityData> listWaterQualityDataByKeyword(String keyword) {

        LambdaQueryWrapper<WaterQualityData> wrapper = Wrappers.lambdaQuery(WaterQualityData.class);
        if (keyword != null) {
            wrapper.like(WaterQualityData::getBelongTo, keyword);
    public List<WaterQualityDataBo> listWaterQualityDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        List<Long> waterQualityDataId;
        if(SecurityUtils.getClientId() == null){
            waterQualityDataId = waterQualityDataMapper.listWaterQualityDataId(keyword, null);
        }else{
            waterQualityDataId = waterQualityDataMapper.listWaterQualityDataId(keyword, SecurityUtils.getUserId());
        }
        List<WaterQualityData> waterQualityDataList = list(wrapper);
        return waterQualityDataList;
        if (CollUtil.isEmpty(waterQualityDataId)) {
            return CollUtil.newArrayList();
        }
        List<WaterQualityDataBo> airEquipmentBos = waterQualityDataMapper.listWaterQualityDataByIds(waterQualityDataId);
        return airEquipmentBos;
    }

    /**
@@ -73,9 +74,16 @@
                }
            }
            waterQualityData.setWaterQualityEquipmentCode(waterQualityDataDto.getDid());
            //设置水质设备状态
            if (waterQualityDataDto != null) {
                waterQualityDataDto.setState(1);
            } else {
                waterQualityDataDto.setState(0);
            }
            save(waterQualityData);
        } catch (Exception e) {
            e.printStackTrace();
            throw new BusinessException("水质设备号不正确");
        }

        return waterQualityDataDto;