changes

liuhaonan

2022-08-03 f9539232edd1b23b29a2fb3d44732877400602f2

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

@@ -4,6 +4,7 @@
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;
@@ -47,7 +48,7 @@
        AirEquipment airEquipment = new AirEquipment();
        airEquipment.setId(airData.getId());
        airEquipment.setMac(airData.getDeviceMac());
        airEquipment.setCreateTime(airData.getCreateTime());
//        airEquipment.setCreateTime(airData.getCreateTime());
        airEquipmentService.addAirEquipment(airEquipment);

        //存缓存心跳包
@@ -61,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) {
@@ -69,11 +70,13 @@
        } 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;

    }

@@ -91,6 +94,7 @@

    }


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