大气设备

zhanzhiqin

2022-08-01 d5dab0a85de9573ff61e20794af04129dd4b2f87

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

@@ -2,19 +2,26 @@


import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.CommonPage;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.ResUtils;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereHeartbeatReportInnerFrame;
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.admin.utils.StringUtil;
import com.sandu.ximon.dao.bo.AirDataBo;
import com.sandu.ximon.dao.domain.AirData;
import com.sandu.ximon.dao.domain.AirEquipment;
import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.mapper.AirDataMapper;
import lombok.AllArgsConstructor;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

@@ -44,8 +51,10 @@
        airEquipment.setCreateTime(airData.getCreateTime());
        airEquipmentService.addAirEquipment(airEquipment);

        //存缓存
        RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT.getCode() + deviceName, heartBeatDataPackage, 300L);
        //存缓存心跳包
        RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT.getCode() + deviceName, heartBeatDataPackage);
        //存缓存状态
        RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT_STATE.getCode() + deviceName, heartBeatDataPackage, 300L);

        return save(airData);
    }
@@ -53,7 +62,7 @@
    /**
     * 查询大气数据(模糊查询)
     */
    public List<AirDataBo> listAirDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
    public CommonPage listAirDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        List<Long> listAirId;
        if (SecurityUtils.getClientId() == null) {
@@ -61,21 +70,31 @@
        } else {
            listAirId = baseMapper.listAirId(keyword, SecurityUtils.getUserId());
        }
        CommonPage commonPage = CommonPage.restPage(listAirId);
        if (CollUtil.isEmpty(listAirId)) {
            return CollUtil.newArrayList();
            return commonPage;
        }
        List<AirDataBo> airDataBos = baseMapper.listAirDataByIds(listAirId);
        return airDataBos;
        commonPage.setList(airDataBos);
        return commonPage;

    }

    /**
     * 查询大气设备MAC地址
     * 查询大气设备历史数据
     */
    public List<String> listAirEquipmentMAC() {
        return airDataMapper.listAirEquipmentMAC();
    public List<AirDataBo> listAirDataOfDeviceCode(BaseConditionVO baseConditionVO, String deviceMac) {
        if (StringUtils.isEmpty(deviceMac)) {
            throw new BusinessException("设备号不能为空！");
        }
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        List<AirDataBo> list = baseMapper.listAirDataHistory(deviceMac);

        return list;

    }


    /**
     * +
     * 根据灯杆id查询大气数据