..

controller/index_data/jiayue_index.go

@@ -4,7 +4,6 @@ import (
 	"eta/eta_bridge/controller/resp"
 	"eta/eta_bridge/global"
 	"eta/eta_bridge/models/request/index_data"
-	"eta/eta_bridge/models/response"
 	index_data_service "eta/eta_bridge/services/index_data"
 	"github.com/gin-gonic/gin"
 	"github.com/go-playground/validator/v10"
@@ -36,14 +35,11 @@ func (j *JiaYueIndexController) GetData(c *gin.Context) {
 		resp.FailMsg("请输入指标来源", "请输入指标来源", c)
 		return
 	}
-	list, err, errMsg := index_data_service.GetIndexFromJiaYue(req.IndexCode, req.Source)
+	data, err, errMsg := index_data_service.GetIndexFromJiaYue(req.IndexCode, req.Source)
 	if err != nil {
 		resp.FailMsg("查询失败", errMsg, c)
 		return
 	}
-	data := new(response.IndexResp)
-	data.IndexData = list
-	data.IndexCode = req.IndexCode
 	resp.OkData("操作成功", data, c)
 	return
 }

models/jiayue/dict.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"eta/eta_bridge/global"
 	"fmt"
+	"time"
 )
 
 /*func main() {
@@ -63,9 +64,9 @@ type DictIndex struct {
 	UserId            int         `description:"所属用户" json:"USER_ID"`
 	RowsCount         int         `description:"指标数据数量" json:"ROWS_COUNT"`
 	DateFirst         string      `description:"指标开始时间" json:"DATE_FIRST"`
-	DateLast          string      `description:"指标最新时间" json:"DATE_LAST"`
-	TimeLastUpdate    string      `description:"最新更新时间" json:"TIME_LAST_UPDATE"`
-	TimeLastRequest   string      `description:"下次更新时间" json:"TIME_LAST_REQUEST"`
+	DateLast          time.Time   `description:"指标最新时间" json:"DATE_LAST"`
+	TimeLastUpdate    time.Time   `description:"最新更新时间" json:"TIME_LAST_UPDATE"`
+	TimeLastRequest   time.Time   `description:"下次更新时间" json:"TIME_LAST_REQUEST"`
 	Priority          int         `description:"更新优先级" json:"PRIORITY"`
 	Status            int         `description:"指标状态" json:"STATUS"`
 	ShortName         string      `description:"指标简称" json:"SHORT_NAME"`
@@ -81,11 +82,11 @@ type DictIndex struct {
 }
 
 type DictData struct {
-	Id         int     `description:"主键" json:"ID"`
-	IndexId    int     `description:"指标id" json:"INDEX_ID"`
-	IndexValue float32 `description:"指标数值" json:"INDEX_VALUE"`
-	IndexDate  string  `description:"指标日期" json:"INDEX_DATE"`
-	UpdateTime string  `description:"更新时间" json:"UPDATE_TIME"`
+	Id         int       `description:"主键" json:"ID"`
+	IndexId    int       `description:"指标id" json:"INDEX_ID"`
+	IndexValue float64   `description:"指标数值" json:"INDEX_VALUE"`
+	IndexDate  time.Time `description:"指标日期" json:"INDEX_DATE"`
+	UpdateTime time.Time `description:"更新时间" json:"UPDATE_TIME"`
 }
 
 func getDictIndex(sqlStatement string, pars []interface{}) (dictIndexs []DictIndex, err error) {
@@ -179,8 +180,3 @@ func getDictData(sqlStatement string, pars []interface{}) (dictData []DictData,
 	fmt.Printf("序列化后 = %v\n", string(data))*/
 	return
 }
-
-type IndexData struct {
-	Val      float32 `json:"val"`
-	DataTime string  `json:"data_time"`
-}

models/response/index_data.go

@@ -1,8 +1,15 @@
 package response
 
-import "eta/eta_bridge/models/jiayue"
-
 type IndexResp struct {
-	IndexCode string             `json:"index_code"`
-	IndexData []jiayue.IndexData `json:"index_data"`
+	IndexCode      string      `json:"index_code"`
+	LastDate       string      `description:"指标最新时间" json:"last_date"`
+	LastUpdateTime string      `description:"最新更新时间" json:"last_update_time"`
+	Status         int         `description:"指标状态" json:"status"`
+	IndexData      []IndexData `json:"index_data"`
+}
+
+type IndexData struct {
+	Val        float64 `json:"val"`
+	DataTime   string  `json:"data_time"`
+	UpdateTime string  `json:"update_time"`
 }

services/index_data/jiayue_platform.go

@@ -4,10 +4,12 @@ import (
 	"errors"
 	"eta/eta_bridge/global"
 	"eta/eta_bridge/models/jiayue"
+	"eta/eta_bridge/models/response"
+	"eta/eta_bridge/utils"
 	"fmt"
 )
 
-func GetIndexFromJiaYue(indexCode, source string) (list []jiayue.IndexData, err error, errMsg string) {
+func GetIndexFromJiaYue(indexCode, source string) (data *response.IndexResp, err error, errMsg string) {
 	defer func() {
 		if err != nil {
 			global.LOG.Info("GetIndexFromJiaYue: " + errMsg)
@@ -38,12 +40,20 @@ func GetIndexFromJiaYue(indexCode, source string) (list []jiayue.IndexData, err
 		errMsg = fmt.Sprintf("嘉悦物产指标数据信息查询失败，Err: %s", err)
 		return
 	}
+	var list []response.IndexData
 	for _, v := range indexData {
-		tmp := jiayue.IndexData{
-			Val:      v.IndexValue,
-			DataTime: v.IndexDate,
+		tmp := response.IndexData{
+			Val:        v.IndexValue,
+			DataTime:   v.IndexDate.Format(utils.FormatDate),
+			UpdateTime: v.UpdateTime.Format(utils.FormatDateTime),
 		}
 		list = append(list, tmp)
 	}
+	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.Status = index.Status
 	return
 }