fix

zhanzhiqin

2022-04-20 f78a9e03ae3f455a85dfd4d8a258dc0fbbb9e694

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

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

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.execption.BusinessException;

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;
import com.sandu.ximon.dao.domain.AirEquipment;
import com.sandu.ximon.dao.mapper.AirDataMapper;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
@@ -17,6 +23,7 @@
@AllArgsConstructor
public class AirDataService extends BaseServiceImpl<AirDataMapper, AirData> {
    private final AirDataMapper airDataMapper;
    private final AirEquipmentService airEquipmentService;

    /**
     * 保存上报大气心跳数据
@@ -29,17 +36,36 @@
        BeanUtils.copyProperties(heartBeatDataPackage, airData);
        airData.setDeviceMac(deviceName);

        //将设备信息添加到大气设备表
        AirEquipment airEquipment = new AirEquipment();
        airEquipment.setId(airData.getId());
        airEquipment.setMac(airData.getDeviceMac());
        airEquipment.setCreateTime(airData.getCreateTime());
        airEquipmentService.addAirEquipment(airEquipment);

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

        return save(airData);
    }

    /**
     * 查询全部大气设备
     * 查询大气数据(模糊查询)
     */
    public List<AirData> listAirData() {
        LambdaQueryWrapper<AirData> wrapper = Wrappers.lambdaQuery(AirData.class);
        List<AirData> list = list(wrapper);
    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 {
            listAirId = baseMapper.listAirId(keyword, SecurityUtils.getUserId());
        }
        if (CollUtil.isEmpty(listAirId)) {
            return CollUtil.newArrayList();
        }
        List<AirDataBo> airDataBos = baseMapper.listAirDataByIds(listAirId);
        return airDataBos;

        return list;
    }

    /**