From eb1c97b60e56e0592e2b721caa4d9216e80c2f7c Mon Sep 17 00:00:00 2001 From: zhangsheng Date: Sat, 29 Nov 2025 13:33:20 +0800 Subject: [PATCH] add code --- jsonparse/web_cmd_parse.cpp | 4 ++-- uart/uart_parameter_config.cpp | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/jsonparse/web_cmd_parse.cpp b/jsonparse/web_cmd_parse.cpp index 60f055e..a3bf9ca 100644 --- a/jsonparse/web_cmd_parse.cpp +++ b/jsonparse/web_cmd_parse.cpp @@ -244,11 +244,11 @@ std::string JsonData::JsonCmd_Cgi_09(Param_09 ¶m) { jsStaticData["ChannelType"] = "STATUS"; jsStaticData["ChannelId"] = vecRes[1]; jsStaticData["TimeStamp"] = vecRes[8]; - jsStaticData["battery"] = vecRes[13]; + jsStaticData["battery"] = vecRes[14]; jsStaticData["MeasurementID"] = strMeasurementID; jsStaticData["dataNodeNo"] = arrResAll[i][0]; jsStaticData["ShortAddr"] = strShortAddr; - jsStaticData["status"] = vecRes[11]; + jsStaticData["status"] = vecRes[12]; jsStaticData["loose"] = "0"; } else { diff --git a/uart/uart_parameter_config.cpp b/uart/uart_parameter_config.cpp index 545466e..2212f52 100644 --- a/uart/uart_parameter_config.cpp +++ b/uart/uart_parameter_config.cpp @@ -559,6 +559,11 @@ int Uart::TaskResp(ScheduleTask scheduleTask){ char localtimestamp[32] = {0x00}; int millisecond = 0; std::string rtcTime = GetRTC(localtimestamp, millisecond); + if (rtcTime == "") + { + GetTimeNet(localtimestamp, 1); + } + scheduleTask.timeStamp = atoi(localtimestamp); zlog_info(zct,"next taskID = %d\n",scheduleTask.next_taskID);