fix rtdata log error

This commit is contained in:
lnk
2026-01-09 14:59:35 +08:00
parent c538161074
commit 709fdfc284
2 changed files with 94 additions and 19 deletions

View File

@@ -1051,8 +1051,25 @@ rocketmq::ConsumeStatus myMessageCallbackrtdata(const rocketmq::MQMessageExt& ms
return rocketmq::RECONSUME_LATER;
}
//20260109添加装置判断流程
{
std::lock_guard<std::mutex> lock(ledgermtx);
const terminal_dev* targetDev = NULL;
for (std::vector<terminal_dev>::const_iterator it = terminal_devlist.begin(); it != terminal_devlist.end(); ++it) {
if (it->terminal_id == devid) { targetDev = &(*it); break; }
}
if (!targetDev) {
std::cout << "terminalId未匹配当前进程内装置: " << devid << std::endl;
return rocketmq::CONSUME_SUCCESS;
}
}
get_terminal_name_by_terminal_id(devid, devname);
const char* showName = devname.empty() ? devid.c_str() : devname.c_str();
std::cout << "[DBG] showName used in log = '" << showName << "'" << std::endl;
// 加锁访问台账
if( !devid.empty() && line > 0){
//不再使用文件触发方式,直接调用接口向终端发起请求
@@ -1063,7 +1080,7 @@ rocketmq::ConsumeStatus myMessageCallbackrtdata(const rocketmq::MQMessageExt& ms
if (ClientManager::instance().get_dev_status(devid) != 1) {
std::cout << "devid对应装置不在线: " << devid << std::endl;
// 记录日志不响应 web 端
DIY_ERRORLOG_CODE("process",0,LOG_CODE_COMM,"主题:%s - tag:%s的实时数据触发消息失败,装置%s不在线", G_MQCONSUMER_TOPIC_RT.c_str(),FRONT_INST.c_str(),devname.c_str());
DIY_ERRORLOG_CODE("process",0,LOG_CODE_COMM,"主题:%s - tag:%s的实时数据触发消息失败,装置:%s 不在线", G_MQCONSUMER_TOPIC_RT.c_str(),FRONT_INST.c_str(),showName);
return rocketmq::CONSUME_SUCCESS;
}