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

fix rtdata error

Browse Source
This commit is contained in:
lnk
2025-07-30 16:30:10 +08:00
parent 7ee93deefa
commit 7d7a89223c
4 changed files with 57 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
json/create_json.cpp
View File

@@ -33,6 +33,8 @@ extern std::string WEB_EVENT;
extern std::string WEB_FILEDOWNLOAD;
extern std::string G_CONNECT_TOPIC;
bool DEBUGOPEN = 0;
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
using namespace std;
@@ -1052,7 +1054,7 @@ int transfer_json_block_data(char v_wiring_type[], json_block_data *data) //json
cout << "transfer_json_block_data contain data->dev_type" << endl;
ctopic_list = xmlinfo_list2[data->dev_type]->topicList;
//printCTopicList(ctopic_list);
if(DEBUGOPEN)printCTopicList(ctopic_list);
}
else {
cout << "transfer_json_block_data not contain data->dev_type:" << data->dev_type.toStdString() << " !!!!"<< endl;
@@ -1505,7 +1507,7 @@ int transfer_json_block_data(char v_wiring_type[], json_block_data *data) //json
KafkaData.strText.append("}"); //拼接 json稳态数据结尾
//调试用
//cout << KafkaData.strText.toAscii().data() << endl;
if(DEBUGOPEN)cout << KafkaData.strText.toAscii().data() << endl;
kafka_data_list_mutex.lock(); //加锁
kafka_data_list.append(KafkaData); //添加 kafka发送链表
@@ -1786,9 +1788,14 @@ int transfer_json_block_data(char v_wiring_type[], json_block_data *data) //json
if (isJump) continue; //跳出本数据类型循环
KafkaData.strText.append("}"); //拼接 json稳态数据结尾
//调试用
if(DEBUGOPEN)cout << KafkaData.strText.toAscii().data() << endl;
kafka_data_list_mutex.lock(); //加锁
kafka_data_list.append(KafkaData); //添加 kafka发送链表
kafka_data_list_mutex.unlock(); //解锁
return 1; //结束该函数，停止后续代码执行
} //②-②实时闪变数据解析结束！--------------------------------
@@ -1855,7 +1862,7 @@ int transfer_json_block_data(char v_wiring_type[], json_block_data *data) //json
return 1; //结束该函数，停止后续代码执行
} //②-①SOE稳态事件解析结束！---------------------------------
if (1 == pDataType->iDataType) //②-②SOE暂态事件------------------------------------------------------------
if (2 == pDataType->iDataType) //②-②SOE暂态事件------------------------------------------------------------
{
Ckafka_data_t KafkaData; //kafka发送数据结构类对象
KafkaData.monitor_id = data->monitorId; //监测点ID
@@ -1908,7 +1915,7 @@ int transfer_json_block_data(char v_wiring_type[], json_block_data *data) //json
return 1; //结束该函数，停止后续代码执行
} //②-②SOE暂态事件解析结束！---------------------------------
if (1 == pDataType->iDataType) //②-③SOE状态事件------------------------------------------------------------
if (3 == pDataType->iDataType) //②-③SOE状态事件------------------------------------------------------------
{
Ckafka_data_t KafkaData; //kafka发送数据结构类对象
KafkaData.monitor_id = data->monitorId; //监测点ID
@@ -2348,6 +2355,9 @@ int transfer_json_block_data(char v_wiring_type[], json_block_data *data) //json
if (isJump) continue; //跳出本数据类型循环
KafkaData.strText.append("}"); //拼接 json稳态数据结尾
//调试用
if(DEBUGOPEN)cout << KafkaData.strText.toAscii().data() << endl;
kafka_data_list_mutex.lock(); //加锁
kafka_data_list.append(KafkaData); //添加 kafka发送链表
kafka_data_list_mutex.unlock(); //解锁