commit

aarch64/pjisuv/common/service/rosbag_upload.go

@@ -7,6 +7,7 @@ import (
 	"cicv-data-closedloop/common/domain"
 	"cicv-data-closedloop/common/entity"
 	commonUtil "cicv-data-closedloop/common/util"
+	"encoding/json"
 	"fmt"
 	"os"
 	"strings"
@@ -123,16 +124,17 @@ outLoop:
 			}
 		}
 		c_log.GlobalLogger.Info("json 中添加【triggerIds】=", triggerIds)
-		callBackJson, _ := commonUtil.MapToJsonString(map[string]interface{}{
-			"dataName":    currentTimeWindow.FaultTime,
-			"dataSize":    "", // 由合并程序补充
-			"equipmentNo": commonConfig.LocalConfig.EquipmentNo,
-			"secretKey":   commonConfig.LocalConfig.SecretKey,
-			"rosBagPath":  objectKey2,
-			"filePath":    objectKey3,
-			"taskId":      commonConfig.PlatformConfig.TaskConfigId,
-			"triggerId":   triggerIds,
+		callBackJsonBytes, _ := json.Marshal(&entity.CallBack{
+			DataName:    currentTimeWindow.FaultTime,
+			DataSize:    "", // 由合并程序补充
+			EquipmentNo: commonConfig.LocalConfig.EquipmentNo,
+			SecretKey:   commonConfig.LocalConfig.SecretKey,
+			RosBagPath:  objectKey2,
+			FilePath:    objectKey3,
+			TaskId:      commonConfig.PlatformConfig.TaskConfigId,
+			TriggerId:   triggerIds,
 		})
+		callBackJson := string(callBackJsonBytes)
 		c_log.GlobalLogger.Info("【callBackJson】=", callBackJson)
 		err := commonConfig.OssBucket.PutObject(objectKey3+"callback.json", strings.NewReader(callBackJson))
 		if err != nil {

common/entity/callback.go

@@ -0,0 +1,12 @@
+package entity
+
+type CallBack struct {
+	DataName    string   `json:"dataName"`
+	DataSize    string   `json:"dataSize"`
+	EquipmentNo string   `json:"equipmentNo"`
+	SecretKey   string   `json:"secretKey"`
+	RosBagPath  string   `json:"rosBagPath"`
+	FilePath    string   `json:"filePath"`
+	TaskId      string   `json:"taskId"`
+	TriggerId   []string `json:"triggerId"`
+}