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:
lnk
2025-10-24 08:51:01 +08:00
parent fdd6a30fe2 5ebb179c44
commit 07ac84d612
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
LFtid1056/dealMsg.cpp
View File

@@ -123,13 +123,13 @@ void process_received_message(string mac, string id,const char* data, size_t len
//end_time.tm_min = 1; //end_time.tm_min = 1;
//end_time.tm_sec = 1; //end_time.tm_sec = 1;
//ClientManager::instance().read_eventlog_action_to_device(id, start_time, end_time,2,1); //ClientManager::instance().read_eventlog_action_to_device(id, start_time, end_time,2,1);
DIY_ERRORLOG_CODE("111", 0, static_cast<int>(LogCode::LOG_CODE_OTHER), "【ERROR】测试告警发送 前置"); /*DIY_ERRORLOG_CODE("111", 0, static_cast<int>(LogCode::LOG_CODE_OTHER), "【ERROR】测试告警发送 前置");
DIY_ERRORLOG_CODE(id, 1, static_cast<int>(LogCode::LOG_CODE_OTHER), "【ERROR】测试告警发送 设备"); DIY_ERRORLOG_CODE(id, 1, static_cast<int>(LogCode::LOG_CODE_OTHER), "【ERROR】测试告警发送 设备");
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);
if (!mpid.empty()) { if (!mpid.empty()) {
DIY_ERRORLOG_CODE(mpid, 2, static_cast<int>(LogCode::LOG_CODE_OTHER), "【ERROR】测试告警发送 测点"); DIY_ERRORLOG_CODE(mpid, 2, static_cast<int>(LogCode::LOG_CODE_OTHER), "【ERROR】测试告警发送 测点");
} }*/
} }
if (udata[19] == 0x00) { if (udata[19] == 0x00) {
std::cout << "cloud login: " << mac << " state: fail!" << std::endl; std::cout << "cloud login: " << mac << " state: fail!" << std::endl;