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

fix D001

Browse Source
This commit is contained in:
lnk
2026-03-04 19:15:32 +08:00
parent 50dd5c8a3e
commit d5916f5559
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
json/create_json.cpp
View File

@@ -1120,6 +1120,7 @@ int transfer_json_block_data(char v_wiring_type[], json_block_data *data) //json
//lnk20260127 添加数据类型区分 //lnk20260127 添加数据类型区分
bool typeofdata = false; bool typeofdata = false;
bool data_have_static = data->data_have_statistic;
QString devType = data->dev_type; QString devType = data->dev_type;
QByteArray devTypeBytes = devType.toUtf8(); QByteArray devTypeBytes = devType.toUtf8();
@@ -1427,7 +1428,7 @@ int transfer_json_block_data(char v_wiring_type[], json_block_data *data) //json
} }
//lnk20260127 //lnk20260127
if (typeofdata == false) {//不合并则处理完闪变就不处理其他数据 if (typeofdata == false || data_have_static == false) {//不合并则处理完闪变就不处理其他数据,如果有统计数据或者数据类型区分了就继续处理其他数据
if (longjumpflag == true || shortjumpflag == true) { if (longjumpflag == true || shortjumpflag == true) {
return 1; return 1;
} }
@@ -2334,7 +2335,7 @@ int transfer_json_block_data(char v_wiring_type[], json_block_data *data) //json
kafka_data_list_mutex.unlock(); //解锁 kafka_data_list_mutex.unlock(); //解锁
longjumpflag = true; longjumpflag = true;
} }
if (typeofdata == false) {//不合并则处理完闪变就不处理其他数据 if (typeofdata == false || data_have_static == false) {//不合并则处理完闪变就不处理其他数据
if (longjumpflag == true || shortjumpflag == true) { if (longjumpflag == true || shortjumpflag == true) {
return 1; return 1;
} }

2
json/mms_json_inter.h
View File

@@ -38,6 +38,8 @@ public:
QString mp_id; //char型监测点 QString mp_id; //char型监测点
QString dev_type;//设备类型 QString dev_type;//设备类型
bool data_have_statistic;//是否有统计数据，0没有，1有
QMap<QString, double> mms_str_map; //数据值(61850数据属性名, 数据值) QMap<QString, double> mms_str_map; //数据值(61850数据属性名, 数据值)
}; };

5
json/save2json.cpp
View File

@@ -2361,8 +2361,11 @@ int json_block_create_data(char monid_char[], char* mms_str, double v, int flick
if (pdata != NULL) if (pdata != NULL)
{ {
pdata->mms_str_map.insert(QString::fromAscii(mms_str), v); pdata->mms_str_map.insert(QString::fromAscii(mms_str), v);
if (strstr(mms_str, "MMXU2$MX$PhV")) if (strstr(mms_str, "MMXU2$MX$PhV")){
pdata->data_have_statistic = 1;
printf("---------- json_block_create_data: mp_id= %s ,mms_str=%s value=%fkV----------\n", monid_char, mms_str, v); printf("---------- json_block_create_data: mp_id= %s ,mms_str=%s value=%fkV----------\n", monid_char, mms_str, v);
}
} }
return TRUE; return TRUE;
} }

2
mms/mmscli_rpt.c
View File

@@ -1532,7 +1532,7 @@ ST_VOID u_iec_rpt_ind_data(MVL_VAR_ASSOC** info_va,
else if (strstr(rcb_info->RptID, "RDRE")) {//CZY 2023-08-17 WW 2022-11-14 修改判断LLN0$BR$brcbRDRE else if (strstr(rcb_info->RptID, "RDRE")) {//CZY 2023-08-17 WW 2022-11-14 修改判断LLN0$BR$brcbRDRE
processRDRE_data(LD_info, FULL_FCDA_Name, v); processRDRE_data(LD_info, FULL_FCDA_Name, v);
} }
else if (strstr(FULL_FCDA_Name, "GGIO")) else if (strstr(FULL_FCDA_Name, "GGIO") || strstr(FULL_FCDA_Name, "LPHD"))
{ {
ied_t* ied = LD_info->ied; ied_t* ied = LD_info->ied;
ied_usr_t* ied_usr = GET_IEDEXT_ADDR(ied); ied_usr_t* ied_usr = GET_IEDEXT_ADDR(ied);