diff --git a/LFtid1056/cloudfront/code/cfg_parser.cpp b/LFtid1056/cloudfront/code/cfg_parser.cpp index 79c07dd..6fc7c1c 100644 --- a/LFtid1056/cloudfront/code/cfg_parser.cpp +++ b/LFtid1056/cloudfront/code/cfg_parser.cpp @@ -4925,7 +4925,7 @@ void check_recall_file() { std::vector tasks; // 本轮要发送的“每终端一条”(目录请求 或 文件下载 请求) - // ★修改开始:新增“待上传动作”容器与两个小工具(局部作用域,函数私有) + // “待上传动作”容器与两个小工具(局部作用域,函数私有) struct PendingUpload { std::string terminal_id; unsigned short logical_seq = 0; diff --git a/LFtid1056/dealMsg.cpp b/LFtid1056/dealMsg.cpp index f72fcab..064d5cd 100644 --- a/LFtid1056/dealMsg.cpp +++ b/LFtid1056/dealMsg.cpp @@ -350,11 +350,13 @@ void process_received_message(string mac, string id,const char* data, size_t len << ", 时间戳: " << record.triggerTimeMs << "ms" << std::endl; //lnk20250805 事件上送先记录,录波文件上传结束后再更新文件 - append_qvvr_event(id,event.head.name, + if(record.nType != 0){ + 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, + transfer_json_qvvr_data(id,event.head.name, 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; //记录补招上来的暂态事件 - append_qvvr_event(id,event.head.name, - record.nType,record.fPersisstime,record.fMagntitude,record.triggerTimeMs,record.phase); + if(record.nType != 0){ + 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(ResponseCode::OK), id, 0, static_cast(DeviceState::READING_EVENTLOG));