test mqtt

.vscode/settings.json

@@ -8,78 +8,7 @@
         "**/Release": true
     },    
     "files.associations": {
-        "*.tcc": "cpp",
+        "string": "cpp"
-        "array": "cpp",
-        "atomic": "cpp",
-        "bit": "cpp",
-        "cctype": "cpp",
-        "chrono": "cpp",
-        "clocale": "cpp",
-        "cmath": "cpp",
-        "compare": "cpp",
-        "concepts": "cpp",
-        "condition_variable": "cpp",
-        "cstdarg": "cpp",
-        "cstddef": "cpp",
-        "cstdint": "cpp",
-        "cstdio": "cpp",
-        "cstdlib": "cpp",
-        "cstring": "cpp",
-        "ctime": "cpp",
-        "cwchar": "cpp",
-        "cwctype": "cpp",
-        "deque": "cpp",
-        "list": "cpp",
-        "map": "cpp",
-        "set": "cpp",
-        "string": "cpp",
-        "unordered_map": "cpp",
-        "unordered_set": "cpp",
-        "vector": "cpp",
-        "exception": "cpp",
-        "algorithm": "cpp",
-        "functional": "cpp",
-        "iterator": "cpp",
-        "memory": "cpp",
-        "memory_resource": "cpp",
-        "numeric": "cpp",
-        "optional": "cpp",
-        "random": "cpp",
-        "ratio": "cpp",
-        "string_view": "cpp",
-        "system_error": "cpp",
-        "tuple": "cpp",
-        "type_traits": "cpp",
-        "utility": "cpp",
-        "fstream": "cpp",
-        "initializer_list": "cpp",
-        "iomanip": "cpp",
-        "iosfwd": "cpp",
-        "iostream": "cpp",
-        "istream": "cpp",
-        "limits": "cpp",
-        "mutex": "cpp",
-        "new": "cpp",
-        "numbers": "cpp",
-        "ostream": "cpp",
-        "semaphore": "cpp",
-        "sstream": "cpp",
-        "stdexcept": "cpp",
-        "stop_token": "cpp",
-        "streambuf": "cpp",
-        "thread": "cpp",
-        "cinttypes": "cpp",
-        "typeinfo": "cpp",
-        "csignal": "cpp",
-        "strstream": "cpp",
-        "bitset": "cpp",
-        "cfenv": "cpp",
-        "codecvt": "cpp",
-        "complex": "cpp",
-        "any": "cpp",
-        "future": "cpp",
-        "typeindex": "cpp",
-        "variant": "cpp"
     },
     "C_Cpp.errorSquiggles": "disabled"
 }

jsonparse/communication_cmd.hpp

@@ -11,7 +11,7 @@ public:
 
     void DataNodeStatusCheck();
     // mqtt command
-    std::string JsonCmd_07(); //获取系统内存温度硬盘等信息
+    int JsonCmd_07(); //获取系统内存温度硬盘等信息
     std::string JsonCmd_20(Param_20 &param);
     std::string JsonCmd_22(Param_22 &param); //时区配置
     std::string JsonCmd_23(Param_23 &param); //服务器配置

jsonparse/mqtt_cmd_parse.cpp

@@ -492,9 +492,9 @@ int JsonData::JsonCmd_29() {
     jsonVal.clear();
     jsonVal["cmd"] = "29";
     jsonVal["dataNodeGatewayNo"] = GlobalConfig::MacAddr_G;
-    jsSystemSetting["WebVersion"] = ReadStrByOpt(SYSTEMINFOFILE, "Version", "WebVersion");
+    jsBody["WebVersion"] = ReadStrByOpt(SYSTEMINFOFILE, "Version", "WebVersion");
-    jsSystemSetting["SystemVersion"] = ReadStrByOpt(SYSTEMINFOFILE, "Version", "SystemVersion");
+    jsBody["SystemVersion"] = ReadStrByOpt(SYSTEMINFOFILE, "Version", "SystemVersion");
-    jsSystemSetting["GateWayVersion"] = ReadStrByOpt(SYSTEMINFOFILE, "Version", "GateWayVersion");
+    jsBody["GateWayVersion"] = ReadStrByOpt(SYSTEMINFOFILE, "Version", "GateWayVersion");
     jsBody["localIP"] = GlobalConfig::IpAddr_G;
     jsBody["dataNodeGatewayType"] = ReadStrByOpt(SYSTEMINFOFILE, "Version", "GateWayProduct");
     jsBody["CommMode"] = "有线";
@@ -591,7 +591,7 @@ int JsonData::JsonCmd_30(){
             std::vector<std::string> vParambattery;
             boost::split(vParambattery, arrRes[j][43], boost::is_any_of(","), boost::token_compress_on);
             if (vParambattery.size() > 1) {
-                jsSensorData["battery"] = atoi(vParambattery[1].c_str())/atoi(vParambattery[0].c_str());
+                jsSensorData["battery"] = float(atof(vParambattery[1].c_str())/atof(vParambattery[0].c_str()));
             } else {
                 jsSensorData["battery"] = 0.99;
             }
@@ -727,7 +727,7 @@ void JsonData::DataNodeStatusCheck() {
     }
 }
 
-std::string JsonData::JsonCmd_07() {
+int JsonData::JsonCmd_07() {
     Json::Value jsonVal;
     jsonVal.clear();
     Json::Value jsData;
@@ -749,5 +749,6 @@ std::string JsonData::JsonCmd_07() {
         jsonVal["success"] = false;
         jsonVal["message"] = "状态获取失败";
     }
-    return show_value_.write(jsonVal);
+    data_publish(show_value_.write(jsonVal).c_str(), GlobalConfig::Topic_G.mPubStatus.c_str());
+    return 0;
 }

localserver/mqtt_cmd.cpp

@@ -45,11 +45,11 @@ void LocalServer::HandleFromServer(const char *pData_r, int pLen, const char *to
         }
 
         switch (cmdType) {
-            case kHWStatus: {
+            // case kHWStatus: {
-                JsonData jd;
+            //     JsonData jd;
-                std::string data = jd.JsonCmd_07();
+            //     std::string data = jd.JsonCmd_07();
-                data_publish(data.c_str(), GlobalConfig::Topic_G.mPubCmd.c_str());
+            //     data_publish(data.c_str(), GlobalConfig::Topic_G.mPubCmd.c_str());
-            } break;
+            // } break;
             case kRebootSystem: {
                 recvValue["dataNodeGatewayNo"] = GlobalConfig::MacAddr_G;
                 recvValue["status"] = "ACK";

threadfunc/check_thread.cpp

@@ -97,8 +97,7 @@ void CheckThread() {
          }
         if (HardStatus == 3600) { // one hour 3600
             JsonData jd;
-            std::string data = jd.JsonCmd_07();
+            jd.JsonCmd_07();
-            data_publish(data.c_str(), GlobalConfig::Topic_G.mPubStatus.c_str());
             HardStatus = 0;
         }
         if (mqttresend == 7200) {
@@ -116,7 +115,7 @@ void CheckThread() {
             }
         }
 
-        if (600 == online_check) {
+        if (120 == online_check) {
             online_check = 0;
             int Count = sqlite_db_ctrl::instance().GetTableRows(T_SENSOR_INFO(TNAME), NULL);
             JsonData jd;