diff --git a/cfg_parse/SimpleProducer.cpp b/cfg_parse/SimpleProducer.cpp index 9382f45..b9d89ba 100644 --- a/cfg_parse/SimpleProducer.cpp +++ b/cfg_parse/SimpleProducer.cpp @@ -435,7 +435,7 @@ public: ); if (sendResult == 0) { // 假设返回 0 表示成功 - std::cout << "Message sent successfully." << std::endl; + std::cout << "Message sent successfully.topic:" << topic <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]; // ڴŶ˿ںŵַ + sprintf(portStr, "%u", ied->channel[0].port); // ˿ںתΪַ + outputDevice->write("|-- dev_port: " + QByteArray(portStr) + "\n"); + + char statusStr[20]; // ڴ״ַ̬ + sprintf(statusStr, "%u", ied->channel[0].status); // ״̬תΪַ + 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); // ʹ QIODevice - 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; //ն - 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; } diff --git a/json/create_json.cpp b/json/create_json.cpp index e5e24df..13bdbda 100644 --- a/json/create_json.cpp +++ b/json/create_json.cpp @@ -1211,9 +1211,18 @@ bool ParseXMLConfig2(int xml_flag, XmlConfig *cfg, list *ctopiclist,QSt { QString strDVName = e_Value.attribute("name"); // QString strDAName = e_Value.attribute("DA"); // - if (strDAName.indexOf("phs*") >= 0) //DA"phs*" - strDAName = strDAName.replace("*", sq->strSeq); //DA*滻Ϊ(ABC) phsA$cVal$mag$f - //-гݶȡ(ABC)------------------------------------- + + + if (strDAName.indexOf("l_phs*") >= 0){ //DA"l_phs*"//lnk20250221νҲԽPPV + strDAName = strDAName.replace("l_phs", "phs"); + strDAName = strDAName.replace("*", strLine[n]); + qDebug() << "strDAName:" << strDAName << endl;// + } //DA*滻Ϊ(ABBCCA) phsAB$cVal$mag$f + + else if (strDAName.indexOf("phs*") >= 0) {//DA"phs*" + strDAName = strDAName.replace("*", sq->strSeq);} //DA*滻Ϊ(ABC) phsA$cVal$mag$f + + //-гݶȡ(ABC)------------------------------------- if (strDVName.indexOf("%") >= 0 && strDAName.indexOf("%-") >= 0) //% DA%- 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")); //ƴ if (pDataValue->BaseFlag == "1") { - errorlog_datamatch(pDataValue->strFullName, &data_match_map_1); + //errorlog_datamatch(pDataValue->strFullName, &data_match_map_1);//lnkɾ } else { - errorlog_datamatch(pDataValue->strFullName, &data_match_map_2); + //errorlog_datamatch(pDataValue->strFullName, &data_match_map_2);//lnkɾ } 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))); //ƴ jsonֵ(Ƕֵ) //zw޸ 2023 - 8 - 23 ֵжϺ ڵ ʵֵ ѹȼ - 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))); //ƴ jsonֵ(ǽǶֵ) //zw޸ 2023 - 8 - 23 ֵжϺ ڵ ʵֵ ѹȼ - 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")); //ƴ if (pDataValue->BaseFlag == "1") { - errorlog_datamatch(pDataValue->strFullName, &data_match_map_1); + //errorlog_datamatch(pDataValue->strFullName, &data_match_map_1);//lnkɾ } else { - errorlog_datamatch(pDataValue->strFullName, &data_match_map_2); + //errorlog_datamatch(pDataValue->strFullName, &data_match_map_2);//lnkɾ } 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))); //ƴ jsonֵ(Ƕֵ) //zw޸ 2023 - 8 - 23 ֵжϺ ڵ ʵֵ ѹȼ - 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))); //ƴ jsonֵ(ǽǶֵ) //zw޸ 2023 - 8 - 23 ֵжϺ ڵ ʵֵ ѹȼ - 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) diff --git a/mms/mms_process.c b/mms/mms_process.c index e56df68..048eee7 100644 --- a/mms/mms_process.c +++ b/mms/mms_process.c @@ -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 ; cpunocpucount; cpuno++) //for(cpuno = ied->cpucount - 1; cpuno >= 0; cpuno--)