Merge branch 'feature/gl_api_0325'

models/base_from_mysteel_chemical.go

@@ -637,6 +637,7 @@ type MySteelChemicalApiResp struct {
 	Message   string                    `json:"message" description:"显示执行信息"`
 	Data      []*MySteelChemicalApiData `json:"data" description:"数据"`
 }
+
 type MySteelChemicalApiInfoResp struct {
 	Code      string                  `json:"code" description:"200成功，其他失败"`
 	Success   bool                    `json:"success" description:"true 成功，false 失败"`
@@ -664,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   float64 `json:"DATA_VALUE"`
+	PublishTime int64            `json:"PUBLISH_TIME"`
+	IndexCode   string           `json:"INDEX_CODE"`
+	DataDate    string           `json:"DATA_DATE"`
+	DataValue   sql2.NullFloat64 `json:"DATA_VALUE"`
 }

services/base_from_mysteel_chemical.go

@@ -230,18 +230,22 @@ func tranformData(dataResp *models.MySteelChemicalApiResp) (items [][]*models.Ba
 		tmpDateDataMap := make(map[string]*models.BaseFromMysteelChemicalData)
 		tmpDataItems := make([]*models.BaseFromMysteelChemicalData, 0)
 		for _, vv := range v.DataList {
+			// 如果数据值为null那么直接忽略
+			if !vv.DataValue.Valid {
+				continue
+			}
 			tmpData := new(models.BaseFromMysteelChemicalData)
 			tmpData.IndexCode = vv.IndexCode
 			// 如果存在多条数据，则取发布时间最新的数据
 			pub, ok := tmpNewDataMap[vv.DataDate]
 			if !ok {
 				tmpNewDataMap[vv.DataDate] = vv.PublishTime
-				tmpData.Value = strconv.FormatFloat(vv.DataValue, 'f', -1, 64)
+				tmpData.Value = strconv.FormatFloat(vv.DataValue.Float64, 'f', -1, 64)
 			} else {
 				if pub < vv.PublishTime {
 					tmpNewDataMap[vv.DataDate] = vv.PublishTime
 					tmpData = tmpDateDataMap[vv.DataDate]
-					tmpData.Value = strconv.FormatFloat(vv.DataValue, 'f', -1, 64)
+					tmpData.Value = strconv.FormatFloat(vv.DataValue.Float64, 'f', -1, 64)
 				}
 				continue
 			}