refactor(config): 重构配置模块并优化应用依赖注入
- 将配置相关类移动到model模块 - 实现依赖注入容器管理各组件依赖关系 - 重构配置加载逻辑支持多层级键值查找 - 更新主应用入口支持命令行参数解析 - 统一日志输出格式替换原有打印语句 - 引入钻井实时数据模型简化数据处理 - 移除硬编码字段映射改用动态配置方式 - 优化数据库写入逻辑基于新的数据模型
This commit is contained in:
@@ -1,63 +1,17 @@
|
||||
import argparse
|
||||
import json
|
||||
import logging
|
||||
import random
|
||||
import time
|
||||
from datetime import datetime
|
||||
from urllib.parse import urlparse
|
||||
|
||||
import paho.mqtt.client as mqtt
|
||||
|
||||
from config.config import build_sender_dependencies
|
||||
from config import build_sender_dependencies
|
||||
from model import DrillingRealtimeData
|
||||
|
||||
|
||||
DATA_KEYS = [
|
||||
"ts",
|
||||
"wellid",
|
||||
"stknum",
|
||||
"recid",
|
||||
"seqid",
|
||||
"actual_date",
|
||||
"actual_time",
|
||||
"actcod",
|
||||
"deptbitm",
|
||||
"deptbitv",
|
||||
"deptmeas",
|
||||
"deptvert",
|
||||
"blkpos",
|
||||
"ropa",
|
||||
"hkla",
|
||||
"hklx",
|
||||
"woba",
|
||||
"wobx",
|
||||
"torqa",
|
||||
"torqx",
|
||||
"rpma",
|
||||
"sppa",
|
||||
"chkp",
|
||||
"spm1",
|
||||
"spm2",
|
||||
"spm3",
|
||||
"tvolact",
|
||||
"tvolcact",
|
||||
"mfop",
|
||||
"mfoa",
|
||||
"mfia",
|
||||
"mdoa",
|
||||
"mdia",
|
||||
"mtoa",
|
||||
"mtia",
|
||||
"mcoa",
|
||||
"mcia",
|
||||
"stkc",
|
||||
"lagstks",
|
||||
"deptretm",
|
||||
"gasa",
|
||||
"space1",
|
||||
"space2",
|
||||
"space3",
|
||||
"space4",
|
||||
"space5",
|
||||
]
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def parse_broker(broker):
|
||||
@@ -76,61 +30,61 @@ def rand_int(a, b):
|
||||
return random.randint(a, b)
|
||||
|
||||
|
||||
def rand_float(a, b, digits=2):
|
||||
return round(random.uniform(a, b), digits)
|
||||
|
||||
|
||||
def build_random_payload(equipment_code):
|
||||
data = {key: 0 for key in DATA_KEYS}
|
||||
data["ts"] = int(time.time() * 1000)
|
||||
data["wellid"] = random.choice(["", f"WELL-{rand_int(1, 9999):04d}"])
|
||||
data["stknum"] = rand_int(0, 500)
|
||||
data["recid"] = rand_int(0, 100000)
|
||||
data["seqid"] = rand_int(0, 100000)
|
||||
data["actual_date"] = int(datetime.utcnow().strftime("%Y%m%d"))
|
||||
data["actual_time"] = int(datetime.utcnow().strftime("%H%M%S"))
|
||||
data["actcod"] = rand_int(0, 9)
|
||||
data["deptbitm"] = rand_int(0, 5000)
|
||||
data["deptbitv"] = rand_int(0, 5000)
|
||||
data["deptmeas"] = rand_int(0, 5000)
|
||||
data["deptvert"] = rand_int(0, 5000)
|
||||
data["blkpos"] = rand_int(0, 100)
|
||||
data["ropa"] = rand_int(0, 200)
|
||||
data["hkla"] = rand_int(0, 500)
|
||||
data["hklx"] = rand_int(0, 500)
|
||||
data["woba"] = rand_int(0, 200)
|
||||
data["wobx"] = rand_int(0, 200)
|
||||
data["torqa"] = rand_int(0, 200)
|
||||
data["torqx"] = rand_int(0, 200)
|
||||
data["rpma"] = rand_int(0, 300)
|
||||
data["sppa"] = rand_int(0, 5000)
|
||||
data["chkp"] = rand_int(0, 5000)
|
||||
data["spm1"] = rand_int(0, 200)
|
||||
data["spm2"] = rand_int(0, 200)
|
||||
data["spm3"] = rand_int(0, 200)
|
||||
data["tvolact"] = rand_int(0, 20000)
|
||||
data["tvolcact"] = rand_int(0, 20000)
|
||||
data["mfop"] = rand_int(0, 1000)
|
||||
data["mfoa"] = rand_int(0, 1000)
|
||||
data["mfia"] = rand_int(0, 1000)
|
||||
data["mdoa"] = rand_int(0, 1000)
|
||||
data["mdia"] = rand_int(0, 1000)
|
||||
data["mtoa"] = rand_int(0, 1000)
|
||||
data["mtia"] = rand_int(0, 1000)
|
||||
data["mcoa"] = rand_int(0, 1000)
|
||||
data["mcia"] = rand_int(0, 1000)
|
||||
data["stkc"] = rand_int(0, 200)
|
||||
data["lagstks"] = rand_int(0, 200)
|
||||
data["deptretm"] = rand_int(0, 5000)
|
||||
data["gasa"] = rand_int(0, 100)
|
||||
data["space1"] = rand_int(0, 10)
|
||||
data["space2"] = rand_int(0, 10)
|
||||
data["space3"] = rand_int(0, 10)
|
||||
data["space4"] = rand_int(0, 10)
|
||||
data["space5"] = rand_int(0, 10)
|
||||
return {
|
||||
"meta": {
|
||||
"equipment_code": equipment_code,
|
||||
"equipment_sn": equipment_code,
|
||||
},
|
||||
"data": data,
|
||||
}
|
||||
entity = DrillingRealtimeData.empty(wellid=equipment_code)
|
||||
entity = DrillingRealtimeData(
|
||||
ts=entity.ts,
|
||||
wellid=entity.wellid,
|
||||
stknum=rand_int(0, 500),
|
||||
recid=rand_int(0, 100000),
|
||||
seqid=rand_int(0, 100000),
|
||||
actual_date=entity.actual_date,
|
||||
actual_time=entity.actual_time,
|
||||
actcod=rand_int(0, 9),
|
||||
deptbitm=rand_float(0, 5000),
|
||||
deptbitv=rand_float(0, 5000),
|
||||
deptmeas=rand_float(0, 5000),
|
||||
deptvert=rand_float(0, 5000),
|
||||
blkpos=rand_float(0, 100),
|
||||
ropa=rand_float(0, 200),
|
||||
hkla=rand_float(0, 500),
|
||||
hklx=rand_float(0, 500),
|
||||
woba=rand_float(0, 200),
|
||||
wobx=rand_float(0, 200),
|
||||
torqa=rand_float(0, 200),
|
||||
torqx=rand_float(0, 200),
|
||||
rpma=rand_int(0, 300),
|
||||
sppa=rand_float(0, 5000),
|
||||
chkp=rand_float(0, 5000),
|
||||
spm1=rand_int(0, 200),
|
||||
spm2=rand_int(0, 200),
|
||||
spm3=rand_int(0, 200),
|
||||
tvolact=rand_float(0, 20000),
|
||||
tvolcact=rand_float(0, 20000),
|
||||
mfop=rand_int(0, 1000),
|
||||
mfoa=rand_float(0, 1000),
|
||||
mfia=rand_float(0, 1000),
|
||||
mdoa=rand_float(0, 1000),
|
||||
mdia=rand_float(0, 1000),
|
||||
mtoa=rand_float(0, 1000),
|
||||
mtia=rand_float(0, 1000),
|
||||
mcoa=rand_float(0, 1000),
|
||||
mcia=rand_float(0, 1000),
|
||||
stkc=rand_int(0, 200),
|
||||
lagstks=rand_int(0, 200),
|
||||
deptretm=rand_float(0, 5000),
|
||||
gasa=rand_float(0, 100),
|
||||
space1=rand_float(0, 10),
|
||||
space2=rand_float(0, 10),
|
||||
space3=rand_float(0, 10),
|
||||
space4=rand_float(0, 10),
|
||||
space5=rand_float(0, 10),
|
||||
)
|
||||
return entity.to_payload(equipment_code)
|
||||
|
||||
|
||||
def run_sender(args, deps):
|
||||
@@ -138,21 +92,16 @@ def run_sender(args, deps):
|
||||
tms_config = deps.config.tms
|
||||
scheme, host, port = parse_broker(mqtt_config.broker)
|
||||
|
||||
print("MQTT sender config:")
|
||||
print(f" broker: {scheme}://{host}:{port}")
|
||||
print(f" client-id: {mqtt_config.sender_client_id}")
|
||||
print(f" pub-topic: {mqtt_config.pub_topic}")
|
||||
print(f" interval: {args.interval}s")
|
||||
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):
|
||||
print(f"Disconnected callback rc={rc}")
|
||||
logger.info("Disconnected callback rc=%s", rc)
|
||||
|
||||
client.on_disconnect = on_disconnect
|
||||
client.connect(host, port, keepalive=tms_config.keepalive)
|
||||
@@ -160,31 +109,35 @@ def run_sender(args, deps):
|
||||
|
||||
try:
|
||||
if not mqtt_config.pub_topic:
|
||||
print("pub-topic is empty; nothing to publish")
|
||||
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))
|
||||
print(f"TX {mqtt_config.pub_topic}: {payload}")
|
||||
logger.info("TX %s #%s", mqtt_config.pub_topic, seq)
|
||||
if args.count and seq >= args.count:
|
||||
break
|
||||
time.sleep(args.interval)
|
||||
except KeyboardInterrupt:
|
||||
pass
|
||||
logger.info("Sender interrupted")
|
||||
finally:
|
||||
client.loop_stop()
|
||||
client.disconnect()
|
||||
print("Disconnected")
|
||||
logger.info("Sender stopped")
|
||||
|
||||
|
||||
def main():
|
||||
ap = argparse.ArgumentParser(description="MQTT random data sender")
|
||||
ap.add_argument("--config", default="config.yaml", help="Path to config yaml")
|
||||
ap.add_argument("--interval", type=float, default=3.0, help="Publish interval (seconds)")
|
||||
ap.add_argument("--count", type=int, default=0, help="Publish count (0 = forever)")
|
||||
args = ap.parse_args()
|
||||
def add_arguments(parser):
|
||||
parser.add_argument("--config", default="config.yaml", help="Path to config yaml")
|
||||
parser.add_argument("--interval", type=float, default=3.0, help="Publish interval (seconds)")
|
||||
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)
|
||||
args = parser.parse_args(argv)
|
||||
deps = build_sender_dependencies(args.config)
|
||||
run_sender(args, deps)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user