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

修改暂态逻辑

Browse Source
This commit is contained in:
lnk
2026-06-05 16:41:54 +08:00
parent a91672a994
commit 3191422869
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LFtid1056/cloudfront/code/cfg_parser.cpp
View File

@@ -4925,7 +4925,7 @@ void check_recall_file() {
std::vector<RecallTask> tasks; // 本轮要发送的“每终端一条”（目录请求 或 文件下载 请求） std::vector<RecallTask> tasks; // 本轮要发送的“每终端一条”（目录请求 或 文件下载 请求）
// ★修改开始：新增“待上传动作”容器与两个小工具（局部作用域，函数私有） // “待上传动作”容器与两个小工具（局部作用域，函数私有）
struct PendingUpload { struct PendingUpload {
std::string terminal_id; std::string terminal_id;
unsigned short logical_seq = 0; unsigned short logical_seq = 0;

6
LFtid1056/dealMsg.cpp
View File

@@ -350,11 +350,13 @@ void process_received_message(string mac, string id,const char* data, size_t len
<< ", 时间戳: " << record.triggerTimeMs << "ms" << std::endl; << ", 时间戳: " << record.triggerTimeMs << "ms" << std::endl;
//lnk20250805 事件上送先记录，录波文件上传结束后再更新文件 //lnk20250805 事件上送先记录，录波文件上传结束后再更新文件
if(record.nType != 0){
append_qvvr_event(id,event.head.name, append_qvvr_event(id,event.head.name,
record.nType,record.fPersisstime,record.fMagntitude,record.triggerTimeMs,record.phase); record.nType,record.fPersisstime,record.fMagntitude,record.triggerTimeMs,record.phase);
transfer_json_qvvr_data(id,event.head.name, transfer_json_qvvr_data(id,event.head.name,
record.fMagntitude,record.fPersisstime,record.triggerTimeMs,record.nType,record.phase, record.fMagntitude,record.fPersisstime,record.triggerTimeMs,record.nType,record.phase,
""); "");
}
//事件主动上送处理完成，不需要通知状态机 //事件主动上送处理完成，不需要通知状态机
} }
@@ -2449,12 +2451,14 @@ void process_received_message(string mac, string id,const char* data, size_t len
<< ", 时间戳: " << record.triggerTimeMs << "ms" << std::endl; << ", 时间戳: " << record.triggerTimeMs << "ms" << std::endl;
//记录补招上来的暂态事件 //记录补招上来的暂态事件
if(record.nType != 0){
append_qvvr_event(id,event.head.name, append_qvvr_event(id,event.head.name,
record.nType,record.fPersisstime,record.fMagntitude,record.triggerTimeMs,record.phase); record.nType,record.fPersisstime,record.fMagntitude,record.triggerTimeMs,record.phase);
//直接发走暂态事件 //直接发走暂态事件
transfer_json_qvvr_data(id,event.head.name, transfer_json_qvvr_data(id,event.head.name,
record.fMagntitude,record.fPersisstime,record.triggerTimeMs,record.nType,record.phase,""); 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)); on_device_response_minimal(static_cast<int>(ResponseCode::OK), id, 0, static_cast<int>(DeviceState::READING_EVENTLOG));