test 嘉悦数据源

models/data_manage/jiayue_index.go

@@ -42,12 +42,18 @@ type DictIndex struct {
 	UpdateTime        time.Time `description:"更新时间"`
 }
 
-// BridgeJiaYueCommonResultData 桥接服务-结果响应体
-type BridgeJiaYueCommonResultData struct {
-	Code   int         `json:"code" description:"状态码"`
-	Msg    string      `json:"msg" description:"提示信息"`
-	Data   interface{} `json:"data" description:"返回数据"`
-	ErrMsg string      `json:"-" description:"错误信息，不用返回给前端，只是做日志记录"`
+// BridgeJiaYueResultFrequencyList 桥接服务-频度列表响应体
+type BridgeJiaYueResultFrequencyList struct {
+	Code int      `json:"code" description:"状态码"`
+	Msg  string   `json:"msg" description:"提示信息"`
+	Data []string `json:"data" description:"返回数据"`
+}
+
+// BridgeJiaYueResultIndexPageList 桥接服务-指标分页列表响应体
+type BridgeJiaYueResultIndexPageList struct {
+	Code int                       `json:"code" description:"状态码"`
+	Msg  string                    `json:"msg" description:"提示信息"`
+	Data BridgeJiaYuePageIndexResp `json:"data" description:"返回数据"`
 }
 
 // BridgeJiaYuePageIndexReq 桥接服务-指标分页列表请求体

services/data/jiayue_index.go

@@ -56,7 +56,7 @@ func GetJiaYueFrequencyListFromBridge() (frequencies []string, err error) {
 		b = utils.DesBase64Decrypt([]byte(str), utils.EtaBridgeDesKey)
 	}
 
-	result := new(data_manage.BridgeJiaYueCommonResultData)
+	result := new(data_manage.BridgeJiaYueResultFrequencyList)
 	if e = json.Unmarshal(b, &result); e != nil {
 		err = fmt.Errorf("result unmarshal err: %s\nresult: %s", e.Error(), string(b))
 		return
@@ -65,12 +65,7 @@ func GetJiaYueFrequencyListFromBridge() (frequencies []string, err error) {
 		err = fmt.Errorf("result: %s", string(b))
 		return
 	}
-	arr, ok := result.Data.([]string)
-	if !ok {
-		err = fmt.Errorf("result data err")
-		return
-	}
-	frequencies = arr
+	frequencies = result.Data
 	return
 }
 
@@ -118,7 +113,7 @@ func GetJiaYueIndexPageListFromBridge(param data_manage.BridgeJiaYuePageIndexReq
 		b = utils.DesBase64Decrypt([]byte(str), utils.EtaBridgeDesKey)
 	}
 
-	result := new(data_manage.BridgeJiaYueCommonResultData)
+	result := new(data_manage.BridgeJiaYueResultIndexPageList)
 	if e = json.Unmarshal(b, &result); e != nil {
 		err = fmt.Errorf("result unmarshal err: %s\nresult: %s", e.Error(), string(b))
 		return
@@ -127,12 +122,7 @@ func GetJiaYueIndexPageListFromBridge(param data_manage.BridgeJiaYuePageIndexReq
 		err = fmt.Errorf("result: %s", string(b))
 		return
 	}
-	res, ok := result.Data.(data_manage.BridgeJiaYuePageIndexResp)
-	if !ok {
-		err = fmt.Errorf("result data err")
-		return
-	}
-	total = res.Total
-	items = res.List
+	total = result.Data.Total
+	items = result.Data.List
 	return
 }