changes

liuhaonan

2022-10-25 dda268997ca8f8a364f7c19b45d7a43a50a98efe

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

@@ -2,6 +2,7 @@

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;
@@ -92,17 +93,16 @@
    }



    /**
     * 查询大气数据(模糊查询)
     */
    public List<AirDataNongGengBo> listAirDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
    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);
            listAirId = baseMapper.listAirId(keyword, null, type);
        } else {
            listAirId = baseMapper.listAirId(keyword, SecurityUtils.getUserId());
            listAirId = baseMapper.listAirId(keyword, SecurityUtils.getUserId(), type);
        }
        if (CollUtil.isEmpty(listAirId)) {
            return CollUtil.newArrayList();
@@ -111,4 +111,20 @@
        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;
    }
}