zhangsheng/WLG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modify mqtt timestamp

Browse Source
This commit is contained in:
zhangsheng 2025-09-26 20:55:21 +08:00
parent c9fa570064
commit 57a54c8de8
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/global.hpp
View File

@ -18,7 +18,7 @@ enum enumZigBeeTransmitStatus {
//#define NR5G_MODULE //#define NR5G_MODULE
#define Q4G_MODULE //#define Q4G_MODULE
//#define WIFI_MODULE //#define WIFI_MODULE
//#define NR5G_MEIGE //#define NR5G_MEIGE
//#define BLUETEETH_MODULE //#define BLUETEETH_MODULE

2
platform/platform_init.cpp
View File

@ -14,7 +14,7 @@ int GlobalConfig::LinkStatus_G = 0;
int GlobalConfig::LinkCount = 0; int GlobalConfig::LinkCount = 0;
int GlobalConfig::net0Status = 1; int GlobalConfig::net0Status = 1;
std::string GlobalConfig::Version = "5.6"; std::string GlobalConfig::Version = "5.7";
std::string GlobalConfig::MacAddr_G = ""; std::string GlobalConfig::MacAddr_G = "";
std::string GlobalConfig::MacAddr_G2 = ""; std::string GlobalConfig::MacAddr_G2 = "";
std::string GlobalConfig::IpAddr_G = ""; std::string GlobalConfig::IpAddr_G = "";

10
uart/uart_feature_parse.cpp
View File

@ -354,7 +354,7 @@ int Uart::DealDataNodeFeature(const char *pData, int flag) {
valNodeFeature["Phase2"] = dataDymX.Phase2; valNodeFeature["Phase2"] = dataDymX.Phase2;
valNodeFeature["Phase3"] = dataDymX.Phase3; valNodeFeature["Phase3"] = dataDymX.Phase3;
valNodeFeature["Phase4"] = dataDymX.Phase4; valNodeFeature["Phase4"] = dataDymX.Phase4;
valNodeFeature["timeStamp"] = nowTimetamp; valNodeFeature["timeStamp"] = localtimestamp;
if (Feature_x) if (Feature_x)
{ {
valNodeData.append(valNodeFeature); valNodeData.append(valNodeFeature);
@ -444,7 +444,7 @@ int Uart::DealDataNodeFeature(const char *pData, int flag) {
valNodeFeature["Phase2"] = dataDymY.Phase2; valNodeFeature["Phase2"] = dataDymY.Phase2;
valNodeFeature["Phase3"] = dataDymY.Phase3; valNodeFeature["Phase3"] = dataDymY.Phase3;
valNodeFeature["Phase4"] = dataDymY.Phase4; valNodeFeature["Phase4"] = dataDymY.Phase4;
valNodeFeature["timeStamp"] = nowTimetamp; valNodeFeature["timeStamp"] = localtimestamp;
if (Feature_y) if (Feature_y)
{ {
valNodeData.append(valNodeFeature); valNodeData.append(valNodeFeature);
@ -544,7 +544,7 @@ int Uart::DealDataNodeFeature(const char *pData, int flag) {
valNodeFeature["Phase2"] = dataDymZ.Phase2; valNodeFeature["Phase2"] = dataDymZ.Phase2;
valNodeFeature["Phase3"] = dataDymZ.Phase3; valNodeFeature["Phase3"] = dataDymZ.Phase3;
valNodeFeature["Phase4"] = dataDymZ.Phase4; valNodeFeature["Phase4"] = dataDymZ.Phase4;
valNodeFeature["timeStamp"] = nowTimetamp; valNodeFeature["timeStamp"] = localtimestamp;
if (Feature_z) if (Feature_z)
{ {
valNodeData.append(valNodeFeature); valNodeData.append(valNodeFeature);
@ -572,14 +572,14 @@ int Uart::DealDataNodeFeature(const char *pData, int flag) {
valdatastatic["Voltage"] = dataStatic.Voltage; valdatastatic["Voltage"] = dataStatic.Voltage;
valdatastatic["ChannelType"] = "STATUS"; valdatastatic["ChannelType"] = "STATUS";
valdatastatic["ChannelId"] = strMeasurementID + "-S"; valdatastatic["ChannelId"] = strMeasurementID + "-S";
valdatastatic["TimeStamp"] = nowTimetamp; valdatastatic["TimeStamp"] = localtimestamp;
valdatastatic["bateryProportion"] = atof(vBattery[1].c_str()) / atof(vBattery[0].c_str()); valdatastatic["bateryProportion"] = atof(vBattery[1].c_str()) / atof(vBattery[0].c_str());
valdatastatic["batteryRemainDay"] = atof(vBattery[1].c_str()); valdatastatic["batteryRemainDay"] = atof(vBattery[1].c_str());
valdatastatic["dataNodeNo"] = strMeasurementID; valdatastatic["dataNodeNo"] = strMeasurementID;
valNodeData.append(valdatastatic); valNodeData.append(valdatastatic);
root["data"] = valNodeData; root["data"] = valNodeData;
root["TimeStamp"] = nowTimetamp; root["TimeStamp"] = localtimestamp;
root["dataNodeNo"] = strMeasurementID; root["dataNodeNo"] = strMeasurementID;
root["dataNodeGatewayNo"] = GlobalConfig::MacAddr_G; root["dataNodeGatewayNo"] = GlobalConfig::MacAddr_G;
Json::FastWriter featureValue; Json::FastWriter featureValue;