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:
@@ -3,11 +3,10 @@ import logging
|
||||
import random
|
||||
import socket
|
||||
import time
|
||||
from datetime import datetime
|
||||
from pathlib import Path
|
||||
|
||||
from config import build_wits_sender_dependencies
|
||||
from model import WITS_CHANNEL_MAPPING, WitsData
|
||||
from model import REQUIRED_TRANSMISSION_CHANNELS, WITS_CHANNEL_MAPPING, WitsData
|
||||
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
@@ -15,6 +14,16 @@ BEGIN_MARK = "&&\r\n"
|
||||
END_MARK = "!!\r\n"
|
||||
RECORD_TERMINATOR = "*\r\n"
|
||||
RECONNECT_DELAY = 3
|
||||
FIELD_RULES = {
|
||||
"deptbitm": (0.0, 20000.0, float),
|
||||
"chkp": (0.0, 20000.0, float),
|
||||
"sppa": (0.0, 20000.0, float),
|
||||
"rpma": (0, 400, int),
|
||||
"torqa": (0.0, 100000.0, float),
|
||||
"hkla": (0.0, 2000.0, float),
|
||||
"blkpos": (0.0, 1000.0, float),
|
||||
"woba": (0.0, 2000.0, float),
|
||||
}
|
||||
|
||||
|
||||
def rand_int(a, b):
|
||||
@@ -26,46 +35,50 @@ def rand_float(a, b, digits=6):
|
||||
|
||||
|
||||
def build_random_wits_data(device_code):
|
||||
now = datetime.now()
|
||||
ts_ms = int(time.time() * 1000)
|
||||
hook_load = rand_float(17.3, 18.8)
|
||||
standpipe_pressure = rand_float(990.0, 1012.0)
|
||||
mud_density = rand_float(1069.8, 1070.1)
|
||||
casing_pressure = rand_float(180.0, 260.0)
|
||||
rotary_rpm = rand_int(95, 135)
|
||||
torque = rand_float(8.0, 16.0)
|
||||
weight_on_bit = rand_float(6.0, 12.0)
|
||||
bit_depth = rand_float(199.8, 200.3)
|
||||
block_position = rand_float(5.8, 6.3)
|
||||
return WitsData(
|
||||
ts=ts_ms,
|
||||
wellid="???1",
|
||||
wellid=device_code or "???1",
|
||||
stknum=0,
|
||||
recid=1,
|
||||
seqid=rand_int(1600, 9999),
|
||||
actual_date=now.strftime("%y%m%d"),
|
||||
actual_time=now.strftime("%H%M%S"),
|
||||
actual_date=time.strftime("%y%m%d"),
|
||||
actual_time=time.strftime("%H%M%S"),
|
||||
actual_ts=ts_ms,
|
||||
actcod=37,
|
||||
actod_label="AUTO",
|
||||
deptbitm=200.0,
|
||||
deptbitv=198.551422,
|
||||
deptmeas=200.0,
|
||||
deptvert=198.551422,
|
||||
blkpos=6.001850,
|
||||
ropa=0.0,
|
||||
deptbitm=bit_depth,
|
||||
deptbitv=bit_depth - 1.45,
|
||||
deptmeas=bit_depth,
|
||||
deptvert=bit_depth - 1.45,
|
||||
blkpos=block_position,
|
||||
ropa=rand_float(0.8, 2.5),
|
||||
hkla=hook_load,
|
||||
hklx=hook_load,
|
||||
woba=0.0,
|
||||
wobx=-hook_load,
|
||||
torqa=0.0,
|
||||
torqx=0.0,
|
||||
rpma=0,
|
||||
woba=weight_on_bit,
|
||||
wobx=-weight_on_bit,
|
||||
torqa=torque,
|
||||
torqx=torque,
|
||||
rpma=rotary_rpm,
|
||||
sppa=standpipe_pressure,
|
||||
chkp=0.0,
|
||||
spm1=0,
|
||||
chkp=casing_pressure,
|
||||
spm1=rand_int(98, 112),
|
||||
spm2=0,
|
||||
spm3=0,
|
||||
tvolact=0.0,
|
||||
tvolcact=0.0,
|
||||
tvolact=rand_float(28.0, 31.0),
|
||||
tvolcact=rand_float(28.0, 31.0),
|
||||
mfop=0,
|
||||
mfoa=0.0,
|
||||
mfia=0.0,
|
||||
mdoa=mud_density,
|
||||
mdoa=rand_float(1069.8, 1070.1),
|
||||
mdia=26.846003,
|
||||
mtoa=29.113855,
|
||||
mtia=346.874634,
|
||||
@@ -73,7 +86,7 @@ def build_random_wits_data(device_code):
|
||||
mcia=0.0,
|
||||
stkc=0,
|
||||
lagstks=0,
|
||||
deptretm=200.0,
|
||||
deptretm=bit_depth,
|
||||
gasa=0.0,
|
||||
space1=0.0,
|
||||
space2=0.0,
|
||||
@@ -93,9 +106,53 @@ def format_wits_value(value, kind):
|
||||
return str(value)
|
||||
|
||||
|
||||
def validate_transmission_values(values):
|
||||
for field_name, (minimum, maximum, caster) in FIELD_RULES.items():
|
||||
raw_value = values.get(field_name)
|
||||
if raw_value is None or raw_value == "":
|
||||
raise ValueError(f"WITS field '{field_name}' is required")
|
||||
try:
|
||||
value = caster(raw_value)
|
||||
except (TypeError, ValueError) as exc:
|
||||
raise ValueError(f"WITS field '{field_name}' must be numeric, got {raw_value!r}") from exc
|
||||
if value < minimum or value > maximum:
|
||||
raise ValueError(
|
||||
f"WITS field '{field_name}' out of range [{minimum}, {maximum}], got {value}"
|
||||
)
|
||||
|
||||
|
||||
def extract_channel_values(packet):
|
||||
lines = packet.replace("\r\n", "\n").replace("\r", "\n").split("\n")
|
||||
values = {}
|
||||
for raw_line in lines:
|
||||
line = raw_line.strip()
|
||||
if not line or line in {"&&", "!!", "*"}:
|
||||
continue
|
||||
if len(line) < 5:
|
||||
raise ValueError(f"Invalid WITS line: {line!r}")
|
||||
values[line[:4]] = line[4:]
|
||||
return values
|
||||
|
||||
|
||||
def validate_packet(packet):
|
||||
channel_values = extract_channel_values(packet)
|
||||
missing_channels = [channel for channel in REQUIRED_TRANSMISSION_CHANNELS if channel not in channel_values]
|
||||
if missing_channels:
|
||||
missing_fields = [REQUIRED_TRANSMISSION_CHANNELS[channel] for channel in missing_channels]
|
||||
raise ValueError(f"WITS packet missing required fields: {', '.join(missing_fields)}")
|
||||
|
||||
field_values = {
|
||||
field_name: channel_values[channel]
|
||||
for channel, field_name in REQUIRED_TRANSMISSION_CHANNELS.items()
|
||||
}
|
||||
validate_transmission_values(field_values)
|
||||
|
||||
|
||||
def build_wits_packet(data):
|
||||
lines = [f"{channel}{format_wits_value(getattr(data, field_name), kind)}" for channel, field_name, kind in WITS_CHANNEL_MAPPING]
|
||||
return BEGIN_MARK + "\r\n".join(lines) + "\r\n" + END_MARK + RECORD_TERMINATOR
|
||||
packet = BEGIN_MARK + "\r\n".join(lines) + "\r\n" + END_MARK + RECORD_TERMINATOR
|
||||
validate_packet(packet)
|
||||
return packet
|
||||
|
||||
|
||||
def normalize_packet(text):
|
||||
@@ -107,7 +164,9 @@ def normalize_packet(text):
|
||||
lines = lines[:-1]
|
||||
if lines and lines[-1] == "!!":
|
||||
lines = lines[:-1]
|
||||
return BEGIN_MARK + "\r\n".join(lines) + "\r\n" + END_MARK + RECORD_TERMINATOR
|
||||
packet = BEGIN_MARK + "\r\n".join(lines) + "\r\n" + END_MARK + RECORD_TERMINATOR
|
||||
validate_packet(packet)
|
||||
return packet
|
||||
|
||||
|
||||
def load_packet_from_file(path):
|
||||
|
||||
Reference in New Issue
Block a user