changes

liuhaonan

2022-10-12 6fe040e3e2805c28442090221e9a4597381830d9

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

@@ -8,15 +8,14 @@
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.AirEquipmentBo;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.bo.AirEquipmentNongGengBo;
import com.sandu.ximon.dao.domain.AirEquipment;
import com.sandu.ximon.dao.domain.AirEquipmentNongGeng;
import com.sandu.ximon.dao.mapper.AirEquipmentMapper;
import com.sandu.ximon.dao.mapper.AirEquipmentNongGengMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

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

/**
@@ -37,7 +36,20 @@
    public void addAirEquipment(AirEquipmentNongGeng airEquipmentNongGeng) {
        AirEquipmentNongGeng one = getOne(Wrappers.lambdaQuery(AirEquipmentNongGeng.class).eq(AirEquipmentNongGeng::getMac, airEquipmentNongGeng.getMac()));
        if (one == null) {
            //TODO
            save(airEquipmentNongGeng);
            /**
             * 添加农耕大气设备 日志记录开始
             */
            List<String> listCode = new ArrayList<>(1);
            listCode.add(airEquipmentNongGeng.getMac());
            String content = "{ 设备id:" + airEquipmentNongGeng.getId() + "设备code：" + airEquipmentNongGeng.getMac() +
                    "}";

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

@@ -49,13 +61,35 @@
            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        }
        List<AirEquipmentNongGengBo> airEquipmentBos;
//        if (SecurityUtils.getClientId() == null) {
//            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, null);
//        } else {
//            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, SecurityUtils.getUserId());
//        }

        if (SecurityUtils.getClientId() == null) {
            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, null);
        } else {
            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, SecurityUtils.getUserId());
        }

        return airEquipmentBos;
        return null;
//        return airEquipmentBos;
    }

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

//        return airEquipmentBos;
        return null;
    }

    /**
@@ -69,6 +103,19 @@
        if (airEquipmentNongGeng == null) {
            throw new BusinessException("找不到大气设备数据");
        }

        /**
         * 删除农耕大气设备 日志记录开始
         */
        List<String> listCode = new ArrayList<>(1);
        listCode.add(airEquipmentNongGeng.getMac());
        String content = "{ 设备id:" + airEquipmentNongGeng.getId() + "设备code：" + airEquipmentNongGeng.getMac() +
                "}";

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

@@ -77,7 +124,7 @@
     */
    public AirEquipmentNongGeng getAirEquipment(String mac) {
        AirEquipmentNongGeng one = getOne(Wrappers.lambdaQuery(AirEquipmentNongGeng.class).eq(AirEquipmentNongGeng::getMac, mac));
        if (RedisUtils.getBean().get(AtmoFunctionCode.AIR_HEARTBEAT_NONG_GENG.getCode() + mac) != null) {
        if (RedisUtils.getBean().get(AtmoFunctionCode.AIR_HEARTBEAT_NONG_GENG_STATE.getCode() + mac) != null) {
            one.setState(1);
        } else {
            one.setState(0);