|
@@ -7,6 +7,7 @@ import (
|
|
|
"eta/eta_bridge/models/response"
|
|
|
"eta/eta_bridge/utils"
|
|
|
"fmt"
|
|
|
+ "time"
|
|
|
)
|
|
|
|
|
|
func GetIndexFromJiaYue(indexCode, source, startDate, endDate string) (data *response.IndexResp, err error, errMsg string) {
|
|
@@ -56,18 +57,59 @@ func GetIndexFromJiaYue(indexCode, source, startDate, endDate string) (data *res
|
|
|
}
|
|
|
var list []response.IndexData
|
|
|
for _, v := range indexData {
|
|
|
+ var dataTimeStr string
|
|
|
+ if v.IndexDate != "" {
|
|
|
+ dataTime, e := time.ParseInLocation(utils.FormatDateDefault, v.IndexDate, time.Local)
|
|
|
+ if e != nil {
|
|
|
+ err = e
|
|
|
+ fmt.Println("解析时间失败:", err)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ dataTimeStr = dataTime.Format(utils.FormatDate)
|
|
|
+ }
|
|
|
+ var updateTimeStr string
|
|
|
+ if v.UpdateTime != "" {
|
|
|
+ updateTime, e := time.ParseInLocation(utils.FormatDateDefault, v.UpdateTime, time.Local)
|
|
|
+ if e != nil {
|
|
|
+ err = e
|
|
|
+ fmt.Println("解析时间失败:", err)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ updateTimeStr = updateTime.Format(utils.FormatDateTime)
|
|
|
+ }
|
|
|
+
|
|
|
tmp := response.IndexData{
|
|
|
Val: v.IndexValue,
|
|
|
- DataTime: v.IndexDate.Format(utils.FormatDate),
|
|
|
- UpdateTime: v.UpdateTime.Format(utils.FormatDateTime),
|
|
|
+ DataTime: dataTimeStr,
|
|
|
+ UpdateTime: updateTimeStr,
|
|
|
}
|
|
|
list = append(list, tmp)
|
|
|
}
|
|
|
+ var dateLastStr, timeLastUpdateStr string
|
|
|
+ if index.DateLast != "" {
|
|
|
+ dateLast, e := time.ParseInLocation(utils.FormatDateDefault, index.DateLast, time.Local)
|
|
|
+ if e != nil {
|
|
|
+ err = e
|
|
|
+ fmt.Println("解析时间失败:", err)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ dateLastStr = dateLast.Format(utils.FormatDate)
|
|
|
+ }
|
|
|
+ if index.TimeLastUpdate != "" {
|
|
|
+ timeLastUpdate, e := time.ParseInLocation(utils.FormatDateDefault, index.TimeLastUpdate, time.Local)
|
|
|
+ if e != nil {
|
|
|
+ err = e
|
|
|
+ fmt.Println("解析时间失败:", err)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ timeLastUpdateStr = timeLastUpdate.Format(utils.FormatDateTime)
|
|
|
+ }
|
|
|
+
|
|
|
data = new(response.IndexResp)
|
|
|
data.IndexData = list
|
|
|
data.IndexCode = indexCode
|
|
|
- data.LastDate = index.DateLast.Format(utils.FormatDate)
|
|
|
- data.LastUpdateTime = index.TimeLastUpdate.Format(utils.FormatDateTime)
|
|
|
+ data.LastDate = dateLastStr
|
|
|
+ data.LastUpdateTime = timeLastUpdateStr
|
|
|
data.Status = index.Status
|
|
|
return
|
|
|
}
|