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

2
cfg_parse/SimpleProducer.cpp
View File

@@ -435,7 +435,7 @@ public:
);
if (sendResult == 0) { // 假设返回 0 表示成功
std::cout << "Message sent successfully." << std::endl;
std::cout << "Message sent successfully.topic:" << topic <<std::endl;
} else {
std::cout << "Failed to send message." << std::endl;
}

22
cfg_parse/cfg_parser.cpp
View File

@@ -11644,10 +11644,25 @@ void printLedger(const ied_usr_t& ied_usr) {
std::cout << "------------------------------------" << std::endl;
}
void printLedgerinshell(const ied_usr_t& ied_usr, QIODevice* outputDevice) {
ied_t* ied;
ied = find_ied_from_dev_idx(ied_usr.dev_idx);
outputDevice->write("------------------------------------\n");
outputDevice->write("|-- terminal_id: " + QByteArray(ied_usr.terminal_id) + "\n");
outputDevice->write("|-- dev_index: " + QByteArray::number(ied_usr.dev_idx) + "\n");
outputDevice->write("|-- dev_cpucount: " + QByteArray::number(ied->cpucount) + "\n");
outputDevice->write("|-- dev_ip: " + QByteArray(ied->channel[0].addr_str) + "\n");
char portStr[20]; // <20><><EFBFBD>ڴ<EFBFBD><DAB4>Ŷ˿ںŵ<DABA><C5B5>ַ<EFBFBD><D6B7><EFBFBD>
sprintf(portStr, "%u", ied->channel[0].port); // <20><><EFBFBD>˿ں<CBBF>תΪ<D7AA>ַ<EFBFBD><D6B7><EFBFBD>
outputDevice->write("|-- dev_port: " + QByteArray(portStr) + "\n");
char statusStr[20]; // <20><><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD>״̬<D7B4><CCAC><EFBFBD>ַ<EFBFBD><D6B7><EFBFBD>
sprintf(statusStr, "%u", ied->channel[0].status); // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬תΪ<D7AA>ַ<EFBFBD><D6B7><EFBFBD>
outputDevice->write("|-- dev_connect_status: " + QByteArray(statusStr) + "\n");
outputDevice->write("|-- dev_type: " + QByteArray(ied_usr.dev_type) + "\n");
outputDevice->write("|-- dev_key: " + QByteArray(ied_usr.dev_key) + "\n");
outputDevice->write("|-- dev_series: " + QByteArray(ied_usr.dev_series) + "\n");
outputDevice->write("|-- dev_processNo: " + QByteArray(ied_usr.processNo) + "\n");
@@ -11747,8 +11762,8 @@ void ledger(const char* terminal_id, QIODevice* outputDevice) {
ied_usr = (ied_usr_t*)ied->usr_ext;
if (ied_usr != NULL && (terminal_id == NULL || strcmp(ied_usr->terminal_id, terminal_id) == 0)) {
printLedgerinshell(*ied_usr, outputDevice); // ʹ<><CAB9> QIODevice <20><><EFBFBD><EFBFBD>
std::cout << "!!! print to log !!!"<< std::endl;
printLedger(*ied_usr);
//std::cout << "!!! print to log !!!"<< std::endl;
//printLedger(*ied_usr);
found = true;
}
}
@@ -15067,7 +15082,8 @@ void rocketmq_test_300(int mpnum,int front_index) {
ied_usr = (ied_usr_t*)ied->usr_ext;
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ն<EFBFBD>
if(strcmp(ied_usr->terminal_id, "123456") == 0){
if(strcmp(ied_usr->terminal_id, "5a7243ae5e0224e9ed18229d6697c3e2") == 0){
std::cout << "5a7243ae5e0224e9ed18229d6697c3e2 use true message " << std::endl;
continue;
}

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)

3
mms/mms_process.c
View File

@@ -367,6 +367,9 @@ void ChannelCheckIECReports(chnl_usr_t *chnl_usr)
ied = chnl_usr->chnl->ied;
ied_usr = GET_IEDEXT_ADDR(ied);
channel = chnl_usr->chnl;
printf("check error %s !!!!!!!!!!!!!!cpucount:%d\n",((ied_usr_t*)chnl_usr->chnl->ied->usr_ext)->terminal_id,(int)ied->cpucount);
//printf("1 chnl_usr->ip_str = %s \n",chnl_usr->ip_str);
for(cpuno=0 ; cpuno<ied->cpucount; cpuno++)
//for(cpuno = ied->cpucount - 1; cpuno >= 0; cpuno--)