Merge branch 'hotfix/bg_gl_api_0529'

models/base_from_mysteel_chemical.go

@@ -665,8 +665,8 @@ type MySteelChemicalApiData struct {
 }
 
 type MySteelChemicalApiDataList struct {
-	PublishTime int64            `json:"PUBLISH_TIME"`
-	IndexCode   string           `json:"INDEX_CODE"`
-	DataDate    string           `json:"DATA_DATE"`
-	DataValue   sql2.NullFloat64 `json:"DATA_VALUE"`
+	PublishTime int64    `json:"PUBLISH_TIME"`
+	IndexCode   string   `json:"INDEX_CODE"`
+	DataDate    string   `json:"DATA_DATE"`
+	DataValue   *float64 `json:"DATA_VALUE"`
 }

services/base_from_mysteel_chemical.go

@@ -231,7 +231,7 @@ func tranformData(dataResp *models.MySteelChemicalApiResp) (items [][]*models.Ba
 		tmpDataItems := make([]*models.BaseFromMysteelChemicalData, 0)
 		for _, vv := range v.DataList {
 			// 如果数据值为null那么直接忽略
-			if !vv.DataValue.Valid {
+			if vv.DataValue == nil {
 				continue
 			}
 			tmpData := new(models.BaseFromMysteelChemicalData)
@@ -240,12 +240,12 @@ func tranformData(dataResp *models.MySteelChemicalApiResp) (items [][]*models.Ba
 			pub, ok := tmpNewDataMap[vv.DataDate]
 			if !ok {
 				tmpNewDataMap[vv.DataDate] = vv.PublishTime
-				tmpData.Value = strconv.FormatFloat(vv.DataValue.Float64, 'f', -1, 64)
+				tmpData.Value = strconv.FormatFloat(*vv.DataValue, 'f', -1, 64)
 			} else {
 				if pub < vv.PublishTime {
 					tmpNewDataMap[vv.DataDate] = vv.PublishTime
 					tmpData = tmpDateDataMap[vv.DataDate]
-					tmpData.Value = strconv.FormatFloat(vv.DataValue.Float64, 'f', -1, 64)
+					tmpData.Value = strconv.FormatFloat(*vv.DataValue, 'f', -1, 64)
 				}
 				continue
 			}
@@ -565,10 +565,12 @@ func GetEdbDataFromMySteelChemical(indexCodes []string, startTime, endTime, orde
 	}
 	body, err := MySteelChemicalPost(postUrl, "data", postData)
 	if err != nil {
+		utils.FileLog.Info(fmt.Sprintf("MySteelChemicalPost Data Body: %s", string(body)))
 		return
 	}
 	err = json.Unmarshal(body, &item)
 	if err != nil {
+		utils.FileLog.Info(fmt.Sprintf("MySteelChemicalPost Data Body: %s", string(body)))
 		return
 	}
 	return
@@ -623,10 +625,12 @@ func getPageIndexInfoMap(pageNum, pageSize int, includeInfo bool) (item *models.
 	body, er := MySteelChemicalPost(postUrl, "info", postData)
 	if er != nil {
 		err = er
+		utils.FileLog.Info(fmt.Sprintf("MySteelChemicalPost Info Body: %s", string(body)))
 		return
 	}
 	err = json.Unmarshal(body, &item)
 	if err != nil {
+		utils.FileLog.Info(fmt.Sprintf("MySteelChemicalPost Info Body: %s", string(body)))
 		return
 	}
 	if !item.Success {
@@ -698,9 +702,9 @@ func RefreshDataFromMysteelChemical(edbCode, startDate, endDate string) (err err
 				}
 				EdbDataUpdateRecord(v.EdbInfoId, hasUpdate, updateResult, err.Error(), apiErrMsg)
 			}
-			
+
 		}()
-	
+
 		resp, er := GetEdbDataFromMySteelChemical([]string{edbCode}, startDate, endDate, "desc")
 		if er != nil {
 			err = er
@@ -729,7 +733,7 @@ func RefreshDataFromMysteelChemical(edbCode, startDate, endDate string) (err err
 			err = er
 			return
 		}
-		
+
 		addItems := make([]*models.BaseFromMysteelChemicalData, 0)
 		indexObj := &models.BaseFromMysteelChemicalIndex{}
 		existIndex, er := indexObj.GetIndexItem(edbCode)