From f6829a5e71bb5eb4bf1d1f63faeab3fb7c7a4584 Mon Sep 17 00:00:00 2001
From: pandx <dxpan2002@163.com>
Date: Fri, 25 Oct 2024 16:41:14 +0800
Subject: [PATCH] modify log info.

---
 jsonparse/mqtt_cmd_parse.cpp | 89 +++++++++++++++++++++++++++++++-----
 1 file changed, 77 insertions(+), 12 deletions(-)

diff --git a/jsonparse/mqtt_cmd_parse.cpp b/jsonparse/mqtt_cmd_parse.cpp
index d0e6b34..3935650 100644
--- a/jsonparse/mqtt_cmd_parse.cpp
+++ b/jsonparse/mqtt_cmd_parse.cpp
@@ -30,22 +30,48 @@ const char *JSON_FIELD_CommMode = "CommMode";
 std::string JsonData::JsonCmd_20(Param_20 &param) {
     Json::Value jsonVal;
     jsonVal.clear();
+    jsonVal[JSON_FIELD_CMD] = "20";
     jsonVal["success"] = true;
     jsonVal["message"] = "";
+    int ret = 0;
     if (0 == param.mMode) {
         char localtimestamp[32] = {0};
         GetTimeNet(localtimestamp, 1);
         std::string nowTimetamp = std::string(localtimestamp);
-        WriteStr2Config(SYSTEMINFOFILE, "SystemInfo", "dataNodeGatewayName", param.mDataWatchName);
+        ret = WriteStr2Config(SYSTEMINFOFILE, "SystemInfo", "dataNodeGatewayName", param.mDataWatchName);
+        if (ret != 0) {
+            zlog_error(zct, "[cmd20] WriteStr2Config 1");
+            jsonVal["success"] = false;
+            jsonVal["message"] = "fail to write config";
+            return show_value_.write(jsonVal);
+        }
         WriteStr2Config(SYSTEMINFOFILE, "SystemInfo", "dataNodeGatewayAssetId", param.mDataWatchAssetId);
+        if (ret != 0) {
+            zlog_error(zct, "[cmd20] WriteStr2Config 2");
+            jsonVal["success"] = false;
+            jsonVal["message"] = "fail to write config";
+            return show_value_.write(jsonVal);
+        }
         WriteStr2Config(SYSTEMINFOFILE, "SystemInfo", "dataNodeGatewayAddedBy", param.mDataWatchAddedBy);
+        if (ret != 0) {
+            zlog_error(zct, "[cmd20] WriteStr2Config 3");
+            jsonVal["success"] = false;
+            jsonVal["message"] = "fail to write config";
+            return show_value_.write(jsonVal);
+        }
         WriteStr2Config(SYSTEMINFOFILE, "SystemInfo", "dataNodeGatewayAddedDate", nowTimetamp);
+        if (ret != 0) {
+            zlog_error(zct, "[cmd20] WriteStr2Config 4");
+            jsonVal["success"] = false;
+            jsonVal["message"] = "fail to write config";
+            return show_value_.write(jsonVal);
+        }
     }
 
     std::string boardtype = GetFileContent(BOARDTYPE, 1);
     std::string ip = IpAddrInit();
     std::string sn = GetFileContent(SN, 1);
-    jsonVal[JSON_FIELD_CMD] = "20";
+    
     jsonVal[JSON_FIELD_dataNodeGatewayNo] = GlobalConfig::MacAddr_G;
     jsonVal["cmdSerial"] = param.mCmdSerial;
 
@@ -86,13 +112,20 @@ std::string JsonData::JsonCmd_20(Param_20 &param) {
 std::string JsonData::JsonCmd_22(Param_22 &param) {
     Json::Value jsonVal;
     jsonVal.clear();
+    jsonVal[JSON_FIELD_CMD] = "22";
     jsonVal["success"] = true;
     jsonVal["message"] = "";
-    if (0 == param.mMode) {
-        WriteStr2Config(SYSTEMINFOFILE, "SystemInfo", "timezone", param.mTimeZone);
-    }
 
-    jsonVal[JSON_FIELD_CMD] = "22";
+    if (0 == param.mMode) {
+        int ret = WriteStr2Config(SYSTEMINFOFILE, "SystemInfo", "timezone", param.mTimeZone);
+        if (ret != 0) {
+            zlog_error(zct, "[cmd22] WriteStr2Config");
+            jsonVal["success"] = false;
+            jsonVal["message"] = "fail to write config";
+            return show_value_.write(jsonVal);
+        }
+    }
+    
     jsonVal[JSON_FIELD_dataNodeGatewayNo] = GlobalConfig::MacAddr_G;
     jsonVal["cmdSerial"] = param.mCmdSerial;
 
@@ -109,14 +142,46 @@ std::string JsonData::JsonCmd_22(Param_22 &param) {
 std::string JsonData::JsonCmd_23(Param_23 &param) {
     Json::Value jsonVal;
     jsonVal.clear();
+    jsonVal[JSON_FIELD_CMD] = "23";
     jsonVal["success"] = true;
     jsonVal["message"] = "";
     if (0 == param.mMode) {
-        WriteStr2Config(SERVERCONFIG, "Server", "localServerIpAddress", param.mServerIp);
-        WriteStr2Config(SERVERCONFIG, "Server", "localServerPort", param.mPort);
-        WriteStr2Config(SERVERCONFIG, "Server", "CommMode", param.mCommMode);
-        WriteStr2Config(SERVERCONFIG, "Server", "Password", param.mPassword);
-        WriteStr2Config(SERVERCONFIG, "Server", "UserName", param.mUserName);
+        int ret = 0;
+        ret = WriteStr2Config(SERVERCONFIG, "Server", "localServerIpAddress", param.mServerIp);
+        if (ret != 0) {
+            zlog_error(zct, "[cmd23] WriteStr2Config 1");
+            jsonVal["success"] = false;
+            jsonVal["message"] = "fail to write config";
+            return show_value_.write(jsonVal);
+        }
+        ret = WriteStr2Config(SERVERCONFIG, "Server", "localServerPort", param.mPort);
+        if (ret != 0) {
+            zlog_error(zct, "[cmd23] WriteStr2Config 2");
+            jsonVal["success"] = false;
+            jsonVal["message"] = "fail to write config";
+            return show_value_.write(jsonVal);
+        }
+        ret = WriteStr2Config(SERVERCONFIG, "Server", "CommMode", param.mCommMode);
+        if (ret != 0) {
+            zlog_error(zct, "[cmd23] WriteStr2Config 3");
+            jsonVal["success"] = false;
+            jsonVal["message"] = "fail to write config";
+            return show_value_.write(jsonVal);
+        }
+        ret = WriteStr2Config(SERVERCONFIG, "Server", "Password", param.mPassword);
+        if (ret != 0) {
+            zlog_error(zct, "[cmd23] WriteStr2Config 4");
+            jsonVal["success"] = false;
+            jsonVal["message"] = "fail to write config";
+            return show_value_.write(jsonVal);
+        }
+        ret = WriteStr2Config(SERVERCONFIG, "Server", "UserName", param.mUserName);
+        if (ret != 0) {
+            zlog_error(zct, "[cmd23] WriteStr2Config 5");
+            jsonVal["success"] = false;
+            jsonVal["message"] = "fail to write config";
+            return show_value_.write(jsonVal);
+        }
         zlog_info(zct, "param.mCommMode = %s", param.mCommMode.c_str());
         if ("1" == param.mCommMode) { //有线连接
             system("mv /etc/init.d/S91quectel-CM.sh /etc/init.d/wireless.sh");
@@ -132,7 +197,7 @@ std::string JsonData::JsonCmd_23(Param_23 &param) {
         system("reboot");
     }
 
-    jsonVal[JSON_FIELD_CMD] = "23";
+    
     jsonVal[JSON_FIELD_dataNodeGatewayNo] = GlobalConfig::MacAddr_G;
     jsonVal["cmdSerial"] = param.mCmdSerial;