diff --git a/cfg_parse/cfg_parser.cpp b/cfg_parse/cfg_parser.cpp index ead3fb7..3e6abb8 100644 --- a/cfg_parse/cfg_parser.cpp +++ b/cfg_parse/cfg_parser.cpp @@ -12696,7 +12696,7 @@ int parse_device_cfg_web() cout << "v_wiring_type:" << line_info.v_wiring_type << endl; //lnk2024-8-14记录接线标志 - if (strcmp(line_info.v_wiring_type, "02") == 0) + if (strcmp(line_info.v_wiring_type, "0") != 0) { isdelta_flag = 1; //存在一个监测点为角型接线则这个前置就要启动第二个配置列表 cout << "monitor_id" << monitor_id << "v_wiring_type:" << line_info.v_wiring_type << "is delta wiring:" << isdelta_flag << endl; @@ -14441,7 +14441,7 @@ int update_one_terminal_ledger(terminal* update, int i,ied_t* ied,int terminal_i printf("name: %s\n", line_info.name); //lnk20250214角形 - if (strcmp(line_info.v_wiring_type, "02") == 0) + if (strcmp(line_info.v_wiring_type, "0") != 0) { isdelta_flag = 1; //存在一个监测点为角型接线则这个前置就要启动第二个配置列表 cout << "monitor_id" << line_info.mp_id << "v_wiring_type:" << line_info.v_wiring_type << "is delta wiring:" << isdelta_flag << endl; diff --git a/json/create_json.cpp b/json/create_json.cpp index 89487f1..6131555 100644 --- a/json/create_json.cpp +++ b/json/create_json.cpp @@ -1479,6 +1479,10 @@ bool ParseXMLConfig2(int xml_flag, XmlConfig *cfg, list *ctopiclist,QSt dv2->DO = e_Value.attribute("DO"); //数据对象名 dv2->DA = strDAName; //数据属性名 + std::cout << "!!!!!!!!!!!!!ppv!!!!!!!!!!!!!!!!!!!!!!!!!!ppv!!!!!!!!!!!!!!!!!!!!!!" << std::endl; + std::cout << dv2->DO.toUtf8().constData() << std::endl; //lnk 输出ppv + std::cout << "!!!!!!!!!!!!!ppv!!!!!!!!!!!!!!!!!!!!!!!!!!ppv!!!!!!!!!!!!!!!!!!!!!!" << std::endl; + //zw修改 2023 - 8 - 14 为历史数据部分 Value节点新增指标-BaseFlag LimitUp LimitDown if (e_Value.attributes().contains("BaseFlag")) { @@ -1781,7 +1785,7 @@ int transfer_json_block_data(char v_wiring_type[], json_block_data *data) //json ////lnk2024-8-15 区分星型,角型接线 - if (strcmp(v_wiring_type, "1") == 0) //lnk2024-8-15 星型接线 + if (strcmp(v_wiring_type, "0") == 0) //lnk2024-8-15 星型接线 { cout << "1 report v_wiring_type is" << v_wiring_type << endl; if (xmlinfo_list.contains(data->dev_type)) { @@ -1802,7 +1806,7 @@ int transfer_json_block_data(char v_wiring_type[], json_block_data *data) //json } else { cout << "transfer_json_block_data not contain data->dev_type:" << data->dev_type.toStdString() << " !!!!"<< endl; - ctopic_list = topicList; + ctopic_list = topicList2; } }