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

finish git rebase

Browse Source
This commit is contained in:
lnk
2025-10-11 10:31:39 +08:00
parent a43afb15c5
commit 987dba34dc
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
LFtid1056/dealMsg.cpp
View File

@@ -150,7 +150,6 @@ void process_received_message(string mac, string id,const char* data, size_t len
//处理主动上送的暂态事件报文 //处理主动上送的暂态事件报文
NewTaglogbuffer event = NewTaglogbuffer::createFromData(parser.RecvData.data(), parser.RecvData.size()); NewTaglogbuffer event = NewTaglogbuffer::createFromData(parser.RecvData.data(), parser.RecvData.size());
<<<<<<< HEAD
//获取测点id //获取测点id
std::string mpid; std::string mpid;
get_monitor_id_by_dev_and_seq(id, 1, mpid); get_monitor_id_by_dev_and_seq(id, 1, mpid);
@@ -231,9 +230,6 @@ void process_received_message(string mac, string id,const char* data, size_t len
} }
} }
=======
>>>>>>> 096e590 (add rtdata idx)
// 获取测点参数 // 获取测点参数
std::string strScale;//电压等级 std::string strScale;//电压等级
int nPTType;//接线方式 int nPTType;//接线方式