Merge remote-tracking branch 'origin/master'

liuhaonan

2022-06-30 ae2e17d478f444a5c9c054dc13b83a0dbdd750bd

 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);
    }