zhangwen/front_linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '测试2' of http://192.168.1.22:3000/zhangwen/front_linux into 测试2

Browse Source
This commit is contained in:
zhangwen
2025-10-24 08:46:29 +08:00
parent fdbefa50ac a755c6faab
commit 5ebb179c44
6 changed files with 369 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
LFtid1056/dealMsg.cpp
View File

@@ -257,7 +257,8 @@ void process_received_message(string mac, string id,const char* data, size_t len
transfer_json_qvvr_data(id,event.head.name,
record.fMagntitude,record.fPersisstime,record.triggerTimeMs,record.nType,record.phase,
"");
//事件主动上送处理完成，不需要通知状态机
}
else {
// 处理获取失败的情况
@@ -2077,6 +2078,16 @@ void process_received_message(string mac, string id,const char* data, size_t len
<< ", 特征幅值: " << record.fMagntitude << " pu"
<< ", 时间戳: " << record.triggerTimeMs << "ms" << std::endl;
//记录补招上来的暂态事件
append_qvvr_event(id,event.head.name,
record.nType,record.fPersisstime,record.fMagntitude,record.triggerTimeMs,record.phase);
//直接发走暂态事件
transfer_json_qvvr_data(id,event.head.name,
record.fMagntitude,record.fPersisstime,record.triggerTimeMs,record.nType,record.phase,"");
//通知状态机补招暂态事件成功
on_device_response_minimal(static_cast<int>(ResponseCode::OK), id, 0, static_cast<int>(DeviceState::READING_EVENTLOG));
recordlist.push_back(record);
}