LingxinMeng 10 meses atrás
pai
commit
1cb8b4f098

+ 1 - 1
aarch64/pjisuv/common/config/c_resource.go

@@ -30,7 +30,7 @@ func SendResourceUsage() {
 			"deviceNumber":     LocalConfig.EquipmentNo,
 			"socIp":            LocalConfig.Node.Ip,
 		}
-		c_log.GlobalLogger.Infof("监控信息为:%v", requestMap)
+		c_log.GlobalLogger.Infof("监控信息为:%v", util.MapToReadableJsonString(requestMap))
 		//responseString, err := util.HttpPostJsonWithHeaders(
 		//	CloudConfig.Monitor.Url,
 		//	map[string]string{"Authorization": "U9yKpD6kZZDDe4LFKK6myAxBUT1XRrDM"},

+ 1 - 1
aarch64/pjisuv/control/main.go

@@ -14,7 +14,7 @@ import (
 func init() {
 	runtime.GOMAXPROCS(1)
 	// 初始化日志配置
-	c_log.InitLog(commonConfig.LogDir, commonConfig.SlaveLogPrefix)
+	c_log.InitLog(commonConfig.LogDir, commonConfig.ControlLogPrefix)
 	//c_log.InitLog("/userdata/cicv-data-closedloop/log/", "pjisuv-control")
 	// 初始化本地配置文件(第1处配置,在本地文件)
 	commonConfig.InitLocalConfig()

+ 14 - 1
common/util/u_json.go

@@ -2,7 +2,7 @@ package util
 
 import "encoding/json"
 
-// MapToJsonString 将map转为JSON字符串的函数
+// 将map转为JSON字符串的函数
 func MapToJsonString(inputMap map[string]interface{}) (string, error) {
 	// 使用json.Marshal将map转为JSON格式的字节切片
 	jsonBytes, err := json.Marshal(inputMap)
@@ -15,6 +15,19 @@ func MapToJsonString(inputMap map[string]interface{}) (string, error) {
 	return jsonString, nil
 }
 
+// 将map转为JSON字符串的函数
+func MapToReadableJsonString(inputMap map[string]string) string {
+	// 使用json.Marshal将map转为JSON格式的字节切片
+	jsonBytes, err := json.Marshal(inputMap)
+	if err != nil {
+		return ""
+	}
+
+	// 将字节切片转为字符串
+	jsonString := string(jsonBytes)
+	return jsonString
+}
+
 func JsonStringToMap(source string) (map[string]interface{}, error) {
 	var dataMap map[string]interface{}
 	err := json.Unmarshal([]byte(source), &dataMap)