fix admin LIST

zhanzhiqin

2022-04-20 c00a73b74e67dbeb508865c3da4ed8d57c8631db

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

@@ -1,7 +1,13 @@
package com.sandu.ximon.admin.service;


import cn.hutool.core.collection.CollUtil;
import com.github.pagehelper.PageHelper;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
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.AirDataBo;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereHeartbeatReportInnerFrame;
import com.sandu.ximon.dao.domain.AirData;
@@ -37,25 +43,29 @@
        airEquipment.setCreateTime(airData.getCreateTime());
        airEquipmentService.addAirEquipment(airEquipment);

        return save(airData);
    }
        //存缓存
        RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT.getCode() + deviceName, heartBeatDataPackage, 300L);

    /**
     * 查询全部大气数据
     */
    public List<AirDataBo> listAirData() {
        return airDataMapper.listAirData();
        return save(airData);
    }

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

    }

    /**