lnk/microser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

数据追踪增加接线方式和来源

Browse Source
This commit is contained in:
lnk
2026-07-03 14:43:13 +08:00
parent 16a2c41627
commit 6ad37904f7
6 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
json/create_json.cpp
View File

@@ -316,15 +316,19 @@ static QString build_mms_json_object(const json_block_data* data)
return json;
}
static QString build_trace_json(const json_block_data* data)
static QString build_trace_json(const json_block_data* data, const char *v_wiring_type, const char *source_name)
{
if (!data) return "{}";
QString mms_json = build_mms_json_object(data);
QString wiring_type = v_wiring_type ? QString::fromLocal8Bit(v_wiring_type) : "";
QString source = source_name ? QString::fromLocal8Bit(source_name) : "";
QString json;
json += "{";
json += QString("\"mp_id\":\"%1\",").arg(escape_json_string(data->mp_id));
json += QString("\"v_wiring_type\":\"%1\",").arg(escape_json_string(wiring_type));
json += QString("\"source_name\":\"%1\",").arg(escape_json_string(source));
json += QString("\"func_type\":%1,").arg(data->func_type);
json += QString("\"data_time\":%1,").arg(QString::number((qlonglong)data->time));
json += QString("\"voltage_level\":\"%1\",").arg(QString::number(data->voltage_level, 'f', 6));
@@ -335,13 +339,13 @@ static QString build_trace_json(const json_block_data* data)
return json;
}
static void send_trace_if_needed(json_block_data* pdata)
static void send_trace_if_needed(json_block_data* pdata, const char *v_wiring_type, const char *source_name)
{
const QString mp_id_q = pdata->mp_id;
if (trace_is_enabled(mp_id_q)) {
// 1) 组 json
QString jsonText = build_trace_json(pdata);
QString jsonText = build_trace_json(pdata, v_wiring_type, source_name);
// 2) 组 KafkaData
Ckafka_data_t KafkaData;
@@ -1210,7 +1214,7 @@ static void print_mms_str_map(const json_block_data* data)
}
//20250214添加角型接线处理
int transfer_json_block_data(char v_wiring_type[], json_block_data *data) //json生成函数 zw修改 2023-8-11 调整传送json结构 目前仅限历史稳态数据
int transfer_json_block_data(char v_wiring_type[], json_block_data *data, const char *source_name) //json生成函数 zw修改 2023-8-11 调整传送json结构 目前仅限历史稳态数据
{
// 刚进函数就打印 mms_str_map
if (DEBUGOPEN) {
@@ -1218,7 +1222,7 @@ int transfer_json_block_data(char v_wiring_type[], json_block_data *data) //json
}
//数据追踪上送
send_trace_if_needed(data);
send_trace_if_needed(data, v_wiring_type, source_name);
list<CTopic*> ctopic_list;
@@ -3763,4 +3767,3 @@ void Set_xml_nodeinfo_one(char* dev_type)
}
}