changes

liuhaonan

2022-11-04 e55c8b0a92eb9715edd90c31dfd4de51a47b588b

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

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

import cn.hutool.core.collection.CollUtil;
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.manager.iot.frame.inner.report.A5AtmosphereNewHeartbeatReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.AtmoFunctionCode;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.dao.bo.AirDataNongGengBo;
import com.sandu.ximon.dao.domain.AirDataNongGeng;
import com.sandu.ximon.dao.domain.AirEquipmentNongGeng;
import com.sandu.ximon.dao.mapper.AirDataNongGengMapper;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * 大气数据，农耕硬件
@@ -86,23 +93,38 @@
    }


//
//    /**
//     * 查询大气数据(模糊查询)
//     */
//    public List<AirDataNongGengBo> listAirDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
//        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
//        List<Long> listAirId;
//        if (SecurityUtils.getClientId() == null) {
//            listAirId = baseMapper.listAirId(keyword, null);
//        } else {
//            listAirId = baseMapper.listAirId(keyword, SecurityUtils.getUserId());
//        }
//        if (CollUtil.isEmpty(listAirId)) {
//            return CollUtil.newArrayList();
//        }
//        List<AirDataNongGengBo> airDataBos = baseMapper.listAirDataByIds(listAirId);
//        return airDataBos;
//
//    }
    /**
     * 查询大气数据(模糊查询)
     */
    public List<AirDataNongGengBo> listAirDataByKeyword(BaseConditionVO baseConditionVO, String keyword, String type) {
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        List<Long> listAirId;
        if (SecurityUtils.getClientId() == null) {
            listAirId = baseMapper.listAirId(keyword, null, type);
        } else {
            listAirId = baseMapper.listAirId(keyword, SecurityUtils.getUserId(), type);
        }
        if (CollUtil.isEmpty(listAirId)) {
            return CollUtil.newArrayList();
        }
        List<AirDataNongGengBo> airDataBos = baseMapper.listAirDataByIds(listAirId);
        return airDataBos;

    }

    /**
     * 设备历史数据
     *
     * @param baseConditionVO
     * @param mac
     * @return
     */
    public List<AirDataNongGengBo> historyData(BaseConditionVO baseConditionVO, String mac) {
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        if (mac == null || mac.isEmpty()) {
            throw new BusinessException("mac不能为空");
        }
        List<AirDataNongGengBo> bos = baseMapper.historyData(mac);
        return bos;
    }
}