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

add ppv in statistic data

Browse Source
This commit is contained in:
lnk
2025-02-21 16:24:41 +08:00
parent 183685b017
commit 7009b1c7d6
4 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
json/create_json.cpp
View File

@@ -1211,9 +1211,18 @@ bool ParseXMLConfig2(int xml_flag, XmlConfig *cfg, list<CTopic*> *ctopiclist,QSt
{
QString strDVName = e_Value.attribute("name"); //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
QString strDAName = e_Value.attribute("DA"); //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
if (strDAName.indexOf("phs*") >= 0) //DA<44><41><EFBFBD><EFBFBD>"phs*"
strDAName = strDAName.replace("*", sq->strSeq); //<2F><>DA<44><41><EFBFBD><EFBFBD>*<2A>滻Ϊ<E6BBBB><CEAA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(A<><41>B<EFBFBD><42>C) <20><><EFBFBD><EFBFBD>phsA$cVal$mag$f
//<2F><>-<EFBFBD><EFBFBD>г<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݶ<EFBFBD>ȡ(ABC<42><43><EFBFBD><EFBFBD>)-------------------------------------
if (strDAName.indexOf("l_phs*") >= 0){ //DA<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"l_phs*"//lnk20250221<EFBFBD><EFBFBD><EFBFBD>ν<EFBFBD><EFBFBD><EFBFBD>Ҳ<EFBFBD><EFBFBD><EFBFBD>Խ<EFBFBD><EFBFBD><EFBFBD>PPV
strDAName = strDAName.replace("l_phs", "phs");
strDAName = strDAName.replace("*", strLine[n]);
qDebug() << "strDAName:" << strDAName << endl;//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
} //<2F><>DA<44><41><EFBFBD><EFBFBD>*<2A>滻Ϊ<E6BBBB><CEAA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(AB<41><42>BC<42><43>CA) <20><><EFBFBD><EFBFBD>phsAB$cVal$mag$f
else if (strDAName.indexOf("phs*") >= 0) {//DA<44><41><EFBFBD><EFBFBD>"phs*"
strDAName = strDAName.replace("*", sq->strSeq);} //<2F><>DA<44><41><EFBFBD><EFBFBD>*<2A>滻Ϊ<E6BBBB><CEAA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(A<><41>B<EFBFBD><42>C) <20><><EFBFBD><EFBFBD>phsA$cVal$mag$f
//<2F><>-<2D><>г<EFBFBD><D0B3><EFBFBD><EFBFBD><EFBFBD>ݶ<EFBFBD>ȡ(ABC<42><43><EFBFBD><EFBFBD>)-------------------------------------
if (strDVName.indexOf("%") >= 0 && strDAName.indexOf("%-") >= 0) //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>% <20><> DA<44><41><EFBFBD><EFBFBD>%- <20><><EFBFBD><EFBFBD>V_%0,49%_MAX
{
QStringList strHarm1 = strDVName.split('%');
@@ -2142,10 +2151,10 @@ int transfer_json_block_data(char v_wiring_type[], json_block_data *data) //json
KafkaData.strText.append(QString("\"%1\":%2 ").arg(pDataValue->strName).arg("null")); //ƴ<><C6B4>
if (pDataValue->BaseFlag == "1") {
errorlog_datamatch(pDataValue->strFullName, &data_match_map_1);
//errorlog_datamatch(pDataValue->strFullName, &data_match_map_1);//lnkɾ<6B><C9BE>
}
else {
errorlog_datamatch(pDataValue->strFullName, &data_match_map_2);
//errorlog_datamatch(pDataValue->strFullName, &data_match_map_2);//lnkɾ<6B><C9BE>
}
continue;
}
@@ -2161,7 +2170,7 @@ int transfer_json_block_data(char v_wiring_type[], json_block_data *data) //json
else
KafkaData.strText.append(QString("\"%1\":\"%2\" ").arg(pDataValue->strName).arg(QString::number(dAngleTemp, 10, 6))); //ƴ<><C6B4> json<6F><6E><EFBFBD><EFBFBD>ֵ(<28>Ƕ<EFBFBD>ֵ)
//zw<7A>޸<EFBFBD> 2023 - 8 - 23 <20><>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>жϺ<D0B6><CFBA><EFBFBD> <20>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD><EFBFBD> ʵ<><CAB5>ֵ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ѹ<EFBFBD>ȼ<EFBFBD>
errorlog_num(pDataValue, dAngleTemp, data->voltage_level, &data_reason_map, data->time);
//errorlog_num(pDataValue, dAngleTemp, data->voltage_level, &data_reason_map, data->time);
}
else
{
@@ -2171,7 +2180,7 @@ int transfer_json_block_data(char v_wiring_type[], json_block_data *data) //json
else
KafkaData.strText.append(QString("\"%1\":\"%2\" ").arg(pDataValue->strName).arg(QString::number(dTemp, 10, 6))); //ƴ<><C6B4> json<6F><6E><EFBFBD><EFBFBD>ֵ(<28>ǽǶ<C7BD>ֵ)
//zw<7A>޸<EFBFBD> 2023 - 8 - 23 <20><>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>жϺ<D0B6><CFBA><EFBFBD> <20>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD><EFBFBD> ʵ<><CAB5>ֵ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ѹ<EFBFBD>ȼ<EFBFBD>
errorlog_num(pDataValue, dTemp, data->voltage_level, &data_reason_map, data->time);
//(pDataValue, dTemp, data->voltage_level, &data_reason_map, data->time);
}
}
catch (exception& e)
@@ -3084,10 +3093,10 @@ int transfer_json_block_data(char v_wiring_type[], json_block_data *data) //json
KafkaData.strText.append(QString("\"%1\":%2 ").arg(pDataValue->strName).arg("null")); //ƴ<><C6B4>
if (pDataValue->BaseFlag == "1") {
errorlog_datamatch(pDataValue->strFullName, &data_match_map_1);
//errorlog_datamatch(pDataValue->strFullName, &data_match_map_1);//lnkɾ<6B><C9BE>
}
else {
errorlog_datamatch(pDataValue->strFullName, &data_match_map_2);
//errorlog_datamatch(pDataValue->strFullName, &data_match_map_2);//lnkɾ<6B><C9BE>
}
continue;
}
@@ -3103,7 +3112,7 @@ int transfer_json_block_data(char v_wiring_type[], json_block_data *data) //json
else
KafkaData.strText.append(QString("\"%1\":\"%2\" ").arg(pDataValue->strName).arg(QString::number(dAngleTemp, 10, 6))); //ƴ<><C6B4> json<6F><6E><EFBFBD><EFBFBD>ֵ(<28>Ƕ<EFBFBD>ֵ)
//zw<7A>޸<EFBFBD> 2023 - 8 - 23 <20><>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>жϺ<D0B6><CFBA><EFBFBD> <20>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD><EFBFBD> ʵ<><CAB5>ֵ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ѹ<EFBFBD>ȼ<EFBFBD>
errorlog_num(pDataValue, dAngleTemp, data->voltage_level, &data_reason_map, data->time);
//errorlog_num(pDataValue, dAngleTemp, data->voltage_level, &data_reason_map, data->time);
}
else
{
@@ -3113,7 +3122,7 @@ int transfer_json_block_data(char v_wiring_type[], json_block_data *data) //json
else
KafkaData.strText.append(QString("\"%1\":\"%2\" ").arg(pDataValue->strName).arg(QString::number(dTemp, 10, 6))); //ƴ<><C6B4> json<6F><6E><EFBFBD><EFBFBD>ֵ(<28>ǽǶ<C7BD>ֵ)
//zw<7A>޸<EFBFBD> 2023 - 8 - 23 <20><>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>жϺ<D0B6><CFBA><EFBFBD> <20>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD><EFBFBD> ʵ<><CAB5>ֵ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ѹ<EFBFBD>ȼ<EFBFBD>
errorlog_num(pDataValue, dTemp, data->voltage_level, &data_reason_map, data->time);
//errorlog_num(pDataValue, dTemp, data->voltage_level, &data_reason_map, data->time);
}
}
catch (exception& e)