commit

kinglong/common/cfg/local-config-soc2.yaml

@@ -1,4 +1,4 @@
-node-name: master
+node-name: slave
 # 数据闭环平台参数
 equipment-no: kinglong3
 secret-key: 8EGgsLqCer8j7VR0q12emEAcrHQ3x1jh8pX9MZIa

kinglong/common/cfg/platform_cfg.go

@@ -141,9 +141,9 @@ func GetStatus(taskConfigId string) (string, error) {
 		log.GlobalLogger.Error("解析【返回结果1】", resp, "失败：", err)
 		return "", err
 	}
-	dataMap := respMap["data"].(map[string]interface{})
-	if err != nil {
-		log.GlobalLogger.Error("解析【返回结果.data】", dataMap, "失败：", err)
+	dataMap, ok := respMap["data"].(map[string]interface{})
+	if !ok {
+		log.GlobalLogger.Errorf("解析【返回结果.data】的类型不是(map[string]interface{})，【dataMap】=%v，【err】=%v", dataMap, err)
 		return "", err
 	}
 	return dataMap["status"].(string), nil

kinglong/common/svc/rosbag_upload.go

@@ -132,7 +132,7 @@ outLoop:
 		callBackJson, err := util.MapToJsonString(callBackMap)
 		log.GlobalLogger.Info("【callBackJson】=", callBackJson)
 		if err != nil {
-			log.GlobalLogger.Error("callBackMap", callBackMap, "转json失败：", err)
+			log.GlobalLogger.Error("callBackMap", callBackMap, "转 json 失败：", err)
 		}
 		err = commonConfig.OssBucket.PutObject(objectKey3+"callback.json", strings.NewReader(callBackJson))
 		if err != nil {

pji/common/cfg/platform_cfg.go

@@ -2,6 +2,7 @@ package cfg
 
 import (
 	"cicv-data-closedloop/common/config/c_log"
+	"cicv-data-closedloop/kinglong/common/log"
 	"cicv-data-closedloop/pji/common/cutil"
 	"encoding/json"
 	"time"
@@ -141,9 +142,9 @@ func GetStatus(taskConfigId string) (string, error) {
 		c_log.GlobalLogger.Error("解析【返回结果1】", resp, "失败：", err)
 		return "", err
 	}
-	dataMap := respMap["data"].(map[string]interface{})
-	if err != nil {
-		c_log.GlobalLogger.Error("解析【返回结果.data】", dataMap, "失败：", err)
+	dataMap, ok := respMap["data"].(map[string]interface{})
+	if !ok {
+		log.GlobalLogger.Errorf("解析【返回结果.data】的类型不是(map[string]interface{})，【dataMap】=%v，【err】=%v", dataMap, err)
 		return "", err
 	}
 	return dataMap["status"].(string), nil