fix

zhanzhiqin

2022-07-22 77edfb324184d304ae7763aae3ab609f2b495da4

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

@@ -5,16 +5,18 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5AtmosphereReportEnum;
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.StoreOperationRecordsUtils;
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;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;

@Service
@@ -25,7 +27,7 @@


    /**
     * 模糊查询
     * 大气设备列表模糊查询
     */
    public List<AirEquipmentBo> listAirEquipmentByKeyword(BaseConditionVO baseConditionVO, String keyword) {
        if (baseConditionVO != null) {
@@ -36,6 +38,20 @@
            airEquipmentBos = airEquipmentMapper.listAirEquipmentByIds(keyword, null);
        } else {
            airEquipmentBos = airEquipmentMapper.listAirEquipmentByIds(keyword, SecurityUtils.getUserId());
        }

        return airEquipmentBos;
    }

    /**
     * 大气设备劣列表（用于首页数据统计）
     */
    public List<AirEquipmentBo> listAirEquipmentOnHome() {
        List<AirEquipmentBo> airEquipmentBos;
        if (SecurityUtils.getClientId() == null) {
            airEquipmentBos = airEquipmentMapper.listAirEquipmentByIds(null, null);
        } else {
            airEquipmentBos = airEquipmentMapper.listAirEquipmentByIds(null, SecurityUtils.getUserId());
        }

        return airEquipmentBos;
@@ -53,6 +69,18 @@
//                , 1, 300L);
        if (one == null) {
            save(airEquipment);
            /**
             * 添加大气设备 日志记录开始
             */
            List<String> listCode = new ArrayList<>(1);
            listCode.add(airEquipment.getMac());
            String content = "{ 设备id:" + airEquipment.getId() + "设备code：" + airEquipment.getMac() +
                    "}";

            StoreOperationRecordsUtils.storeOperationData(listCode, null, "添加大气设备", content);
            /**
             * 添加大气设备 日志记录结束
             */
        }
    }

@@ -67,19 +95,41 @@
        if (airEquipment == null) {
            throw new BusinessException("找不到大气设备数据");
        }
        /**
         * 删除大气设备 日志记录开始
         */
        List<String> listCode=new ArrayList<>(1);
        listCode.add(airEquipment.getMac());
        String content = "{设备code：" + airEquipment.getMac() + "}";

        StoreOperationRecordsUtils.storeOperationData(listCode, null, "删除大气设备", content);
        /**
         * 删除大气设备 日志记录结束
         */
        return removeById(Id);
    }

    /**
     * 根据Mac大气设备数据详情
     */
    public AirEquipment getAirEquipment(String mac) {
        AirEquipment one = getOne(Wrappers.lambdaQuery(AirEquipment.class).eq(AirEquipment::getMac, mac));
        if (RedisUtils.getBean().get(AtmoFunctionCode.AIR_HEARTBEAT_STATE.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;
    }
}