fix

zhanzhiqin

2022-04-27 1b95272a6950565507b110b1ed6895adba5964f7

fix

 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/AtmoFunctionCode.java

@@ -15,10 +15,14 @@
    Reboot("10"),
    //  设置心跳包间隔
    SettingHeartBeatTime("11"),
    //  大气设备心跳包存储(设备状态))
    //  大气设备心跳包存储
    AIR_HEARTBEAT("air_heartbeat:air_heartbeat"),
    //  大气设备心跳包存储(设备状态))
    AIR_HEARTBEAT_STATE("air_heartbeat:air_heartbeat_state"),
    //  大气设备心跳包存储  农耕
    AIR_HEARTBEAT_NONG_GENG("air_heartbeat_nong_geng:air_heartbeat_nong_geng"),
    //  大气设备心跳包存储(设备状态))农耕
    AIR_HEARTBEAT_NONG_GENG("air_heartbeat_nong_geng:air_heartbeat_nong_geng");
    AIR_HEARTBEAT_NONG_GENG_STATE("air_heartbeat_nong_geng:air_heartbeat_nong_geng_state");
    /**
     * 大气结束（希梦自研）
     */

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

@@ -52,7 +52,8 @@
        airEquipmentNongGengService.addAirEquipment(airEquipmentNongGeng);

        //存缓存
        RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT_NONG_GENG.getCode() + deviceName, heartBeatDataPackage, 300L);
        RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT_NONG_GENG.getCode() + deviceName, heartBeatDataPackage);
        RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT_NONG_GENG_STATE.getCode() + deviceName, heartBeatDataPackage, 300L);

        return save(airDataNongGeng);
    }

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

@@ -44,8 +44,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);
    }

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

@@ -77,7 +77,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);

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

@@ -75,7 +75,7 @@
     */
    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) {
        if (RedisUtils.getBean().get(AtmoFunctionCode.AIR_HEARTBEAT_STATE.getCode() + mac) != null) {
            one.setState(1);
        } else {
            one.setState(0);