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