feat(wits): 添加WITS数据验证和字段规则配置
- 在model.__init__.py中新增REQUIRED_SIMPLIFIED_FIELD_RULES和REQUIRED_TRANSMISSION_CHANNELS导出 - 移除app/mqtt_sender.py中的MQTT发送功能,禁用相关逻辑 - 在model/wits.py中添加WITS字段验证规则和传输通道映射配置 - 实现validate_required_wits_fields函数进行必填字段验证 - 在WitsData类中添加__post_init__方法执行字段验证 - 为wits_sender.py添加传输值验证和数据包验证功能 - 更新随机WITS数据生成逻辑,使用真实钻井参数范围 - 实现数据包解析和验证功能,确保必传字段完整性
This commit is contained in:
@@ -1,11 +1,6 @@
|
||||
import argparse
|
||||
import json
|
||||
import logging
|
||||
import random
|
||||
import time
|
||||
from urllib.parse import urlparse
|
||||
|
||||
import paho.mqtt.client as mqtt
|
||||
|
||||
from config import build_sender_dependencies
|
||||
from model import DrillingRealtimeData
|
||||
@@ -14,18 +9,6 @@ from model import DrillingRealtimeData
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def parse_broker(broker):
|
||||
if not broker:
|
||||
raise ValueError("broker is required")
|
||||
if "://" not in broker:
|
||||
broker = "tcp://" + broker
|
||||
parsed = urlparse(broker)
|
||||
host = parsed.hostname or "localhost"
|
||||
port = parsed.port or 1883
|
||||
scheme = (parsed.scheme or "tcp").lower()
|
||||
return scheme, host, port
|
||||
|
||||
|
||||
def rand_int(a, b):
|
||||
return random.randint(a, b)
|
||||
|
||||
@@ -89,43 +72,14 @@ def build_random_payload(equipment_code):
|
||||
|
||||
def run_sender(args, deps):
|
||||
mqtt_config = deps.config.mqtt
|
||||
tms_config = deps.config.tms
|
||||
scheme, host, port = parse_broker(mqtt_config.broker)
|
||||
logger.info(
|
||||
"mqtt_sender is disabled by current requirements; skipping MQTT publish logic for topic=%s client_id=%s interval=%ss count=%s",
|
||||
mqtt_config.pub_topic,
|
||||
mqtt_config.sender_client_id,
|
||||
args.interval,
|
||||
args.count or "forever",
|
||||
)
|
||||
|
||||
logger.info("MQTT sender config broker=%s://%s:%s client_id=%s pub_topic=%s interval=%ss", scheme, host, port, mqtt_config.sender_client_id, mqtt_config.pub_topic, args.interval)
|
||||
|
||||
client = mqtt.Client(client_id=mqtt_config.sender_client_id, clean_session=True)
|
||||
if mqtt_config.username is not None:
|
||||
client.username_pw_set(mqtt_config.username, mqtt_config.password)
|
||||
if scheme in ("ssl", "tls", "mqtts"):
|
||||
client.tls_set()
|
||||
|
||||
def on_disconnect(c, userdata, rc):
|
||||
logger.info("Disconnected callback rc=%s", rc)
|
||||
|
||||
client.on_disconnect = on_disconnect
|
||||
client.connect(host, port, keepalive=tms_config.keepalive)
|
||||
client.loop_start()
|
||||
|
||||
try:
|
||||
if not mqtt_config.pub_topic:
|
||||
logger.warning("pub-topic is empty; nothing to publish")
|
||||
return
|
||||
seq = 0
|
||||
while True:
|
||||
seq += 1
|
||||
payload = build_random_payload(tms_config.device_code)
|
||||
client.publish(mqtt_config.pub_topic, json.dumps(payload, ensure_ascii=True))
|
||||
logger.info("TX %s #%s", mqtt_config.pub_topic, seq)
|
||||
if args.count and seq >= args.count:
|
||||
break
|
||||
time.sleep(args.interval)
|
||||
except KeyboardInterrupt:
|
||||
logger.info("Sender interrupted")
|
||||
finally:
|
||||
client.loop_stop()
|
||||
client.disconnect()
|
||||
logger.info("Sender stopped")
|
||||
|
||||
|
||||
def add_arguments(parser):
|
||||
@@ -134,6 +88,7 @@ def add_arguments(parser):
|
||||
parser.add_argument("--count", type=int, default=0, help="Publish count (0 = forever)")
|
||||
|
||||
|
||||
|
||||
def main(argv=None):
|
||||
parser = argparse.ArgumentParser(description="MQTT random data sender")
|
||||
add_arguments(parser)
|
||||
|
||||
Reference in New Issue
Block a user