Mei_Sheng_Textiles/POE-sensor
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor MQTT alert topic structure in sensor_tracker.py to simplify the format by removing sensor type differentiation. Updated offline status publishing to align with the new topic structure, ensuring consistency across sensor types and enhancing clarity in data representation.

Browse Source
This commit is contained in:
Naab2k3
2025-06-24 13:23:09 +07:00
parent 6824f81290
commit 7ce3ff2d5b
1 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
sensor_tracker.py
View File

@ -96,14 +96,8 @@ class SensorTracker:
if not mqtt_client or not ALERTING_ENABLED: if not mqtt_client or not ALERTING_ENABLED:
return return
# Determine sensor type for topic structure # Create alert topic using new structure: Location/{location_name}/alerts
if sensor["type"] == "cwt_co2": alert_topic = f"Location/{sensor['location']}/alerts"
sensor_type = "CO2-gas"
else:
sensor_type = "temperature-humidity"
# Create alert topic using new structure: Location/{location_name}/{sensor_type}/alerts
alert_topic = f"Location/{sensor['location']}/{sensor_type}/alerts"
alert_message = { alert_message = {
"alert_type": "sensor_failure", "alert_type": "sensor_failure",
@ -129,14 +123,8 @@ class SensorTracker:
if not mqtt_client or not ALERTING_ENABLED: if not mqtt_client or not ALERTING_ENABLED:
return return
# Determine sensor type for topic structure # Create alert topic using new structure: Location/{location_name}/alerts
if sensor["type"] == "cwt_co2": alert_topic = f"Location/{sensor['location']}/alerts"
sensor_type = "CO2-gas"
else:
sensor_type = "temperature-humidity"
# Create alert topic using new structure: Location/{location_name}/{sensor_type}/alerts
alert_topic = f"Location/{sensor['location']}/{sensor_type}/alerts"
alert_message = { alert_message = {
"alert_type": "sensor_recovery", "alert_type": "sensor_recovery",
@ -160,22 +148,23 @@ class SensorTracker:
"""Publish offline status using new topic structure""" """Publish offline status using new topic structure"""
try: try:
location = host_info["location"] location = host_info["location"]
# Determine sensor type based on host_info type
if host_info["type"] == "cwt_co2":
sensor_type = "CO2-gas"
else:
sensor_type = "temperature-humidity"
# Create base topic path # Create base topic path - same structure as online sensors
base_topic = f"Location/{location}/{sensor_type}" base_topic = f"Location/{location}"
current_time = datetime.now(LOCAL_TIMEZONE).strftime("%Y-%m-%d %H:%M:%S") current_time = datetime.now(LOCAL_TIMEZONE).strftime("%Y-%m-%d %H:%M:%S")
# Publish offline status to individual topics # Publish offline status to match online sensor structure
topics_data = [ topics_data = [
(f"{base_topic}/Time", current_time), (f"{base_topic}/Time", current_time),
(f"{base_topic}/Status", "offline") (f"{base_topic}/Status", "offline"),
(f"{base_topic}/Temperature/temperature", "offline"),
(f"{base_topic}/Humidity/humidity", "offline")
] ]
# Add CO2 topic for CO2 sensors
if host_info["type"] == "cwt_co2":
topics_data.append((f"{base_topic}/CO2/CO2", "offline"))
# Publish offline status # Publish offline status
for topic, value in topics_data: for topic, value in topics_data:
try: try: