diff --git a/LFtid1056/dealMsg.cpp b/LFtid1056/dealMsg.cpp index e2d85a2..7e08896 100644 --- a/LFtid1056/dealMsg.cpp +++ b/LFtid1056/dealMsg.cpp @@ -89,6 +89,7 @@ void process_received_message(string mac, string id,const char* data, size_t len std::cout << "cloud login: " << mac << " state: " << static_cast(udata[16]) << static_cast(udata[17]) << static_cast(udata[18]) << static_cast(udata[19]) << std::endl; if (udata[19] == 0x10) { std::cout << "cloud login: " << mac << " state: success!" << std::endl; + DIY_INFOLOG_CODE(id,1, static_cast(LogCode::LOG_CODE_COMM),"云前置登录成功"); //装置登录成功 ClientManager::instance().set_cloud_status(id, 1); //设置了云前置登录状态为已登录 ClientManager::instance().read_devversion_action_to_device(id);//主动触发,读取装置版本配置信息,仅在装置登录后执行一次,当前获取版本信息确认对时报文结构。 @@ -159,70 +160,70 @@ void process_received_message(string mac, string id,const char* data, size_t len switch (event.head.LogCode) { case 2: - DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "【ERROR】系统事件:突变量启动录波(NPQS-570特殊功能)"); + DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "系统事件:突变量启动录波(NPQS-570特殊功能)"); break; case 21: - DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "【ERROR】硬件告警事件:装置掉电"); + DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "硬件告警事件:装置掉电"); break; case 22: - DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "【ERROR】硬件告警事件:装置上电"); + DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "硬件告警事件:装置上电"); break; case 23: - DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "【ERROR】硬件告警事件:时钟出错"); + DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "硬件告警事件:时钟出错"); break; case 24: - DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "【ERROR】硬件告警事件:AD采集出错"); + DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "硬件告警事件:AD采集出错"); break; case 25: - DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "【ERROR】硬件告警事件:主存储器出错"); + DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "硬件告警事件:主存储器出错"); break; case 26: - DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "【ERROR】硬件告警事件:内存出错"); + DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "硬件告警事件:内存出错"); break; case 31: - DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "【ERROR】运行告警事件:程序升级成功"); + DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "运行告警事件:程序升级成功"); break; case 32: - DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "【ERROR】运行告警事件:程序升级失败"); + DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "运行告警事件:程序升级失败"); break; case 33: - DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "【ERROR】运行告警事件:程序文件出错"); + DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "运行告警事件:程序文件出错"); break; case 34: - DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "【ERROR】运行告警事件:ICD文件解析出错"); + DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "运行告警事件:ICD文件解析出错"); break; case 35: - DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "【ERROR】运行告警事件:定值出错"); + DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "运行告警事件:定值出错"); break; case 36: - DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "【ERROR】运行告警事件:Pqdif配置模板出错"); + DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "运行告警事件:Pqdif配置模板出错"); break; case 51: - DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "【ERROR】电度告警事件:失压事件"); + DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "电度告警事件:失压事件"); break; case 52: - DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "【ERROR】电度告警事件:欠压事件"); + DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "电度告警事件:欠压事件"); break; case 53: - DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "【ERROR】电度告警事件:过压事件"); + DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "电度告警事件:过压事件"); break; case 54: - DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "【ERROR】电度告警事件:断相事件"); + DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "电度告警事件:断相事件"); break; case 55: - DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "【ERROR】电度告警事件:电压不平衡事件"); + DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "电度告警事件:电压不平衡事件"); break; case 56: - DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "【ERROR】电度告警事件:电流不平衡事件"); + DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "电度告警事件:电流不平衡事件"); break; case 57: - DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "【ERROR】电度告警事件:失流事件"); + DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "电度告警事件:失流事件"); break; case 58: - DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "【ERROR】电度告警事件:过流事件"); + DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "电度告警事件:过流事件"); break; case 59: - DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "【ERROR】电度告警事件:断流事件"); + DIY_ERRORLOG_CODE(mpid, 2, static_cast(LogCode::LOG_CODE_DEV_ALARM), "电度告警事件:断流事件"); break; default: @@ -502,6 +503,7 @@ void process_received_message(string mac, string id,const char* data, size_t len data_time, mac, avg_data.name); + DIY_INFOLOG_CODE(id, 1, static_cast(LogCode::LOG_CODE_REPORT), "装置推送统计数据完毕"); } }