fix

zhanzhiqin

2022-05-10 120fdb31f376deaf55001286bdeef26d268eeab2

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

@@ -9,6 +9,7 @@
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.vo.EquipmentInfomation;
import com.sandu.ximon.dao.bo.AirEquipmentBo;
import com.sandu.ximon.dao.domain.AirEquipment;
import com.sandu.ximon.dao.mapper.AirEquipmentMapper;
@@ -73,13 +74,24 @@
    /**
     * 根据Mac大气设备数据详情
     */
    public AirEquipment getAirEquipment(String mac) {
        AirEquipment one = getOne(Wrappers.lambdaQuery(AirEquipment.class).eq(AirEquipment::getMac, mac));
        if (RedisUtils.getBean().get(AtmoFunctionCode.AIR_HEARTBEAT.getCode() + mac) != null) {
            one.setState(1);
        } else {
            one.setState(0);
    public EquipmentInfomation getAirEquipmentInfo(String mac) {
        EquipmentInfomation equipmentInfo = new EquipmentInfomation();
        equipmentInfo.setEquipmentType("大气设备");
        if (mac == null || mac.trim().length() == 0) {
            return equipmentInfo;
        }
        return one;

        if (RedisUtils.getBean().get(AtmoFunctionCode.AIR_HEARTBEAT_STATE.getCode() + mac) != null) {
            equipmentInfo.setEquipmentState("在线");
        } else {
            equipmentInfo.setEquipmentState("离线");
        }

        AirEquipment one = getOne(Wrappers.lambdaQuery(AirEquipment.class).eq(AirEquipment::getMac, mac));
        if (one != null) {
            equipmentInfo.setEquipmentMac(mac);
            equipmentInfo.setEquipmentCreateTime(one.getCreateTime());
        }
        return equipmentInfo;
    }
}