Merge remote-tracking branch 'origin/dm'

models/base_from_ths_hf_data.go

@@ -5,6 +5,7 @@ import (
 	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
+	"gorm.io/gorm"
 	"strings"
 	"time"
 )
@@ -207,7 +208,28 @@ func (m *BaseFromThsHfData) MultiInsertOrUpdate(inserts, updates []*BaseFromThsH
 	return
 }
 
-func (m *BaseFromThsHfData) GetIndexMinMax(indexCode string) (item *EdbInfoMaxAndMinInfo, err error) {
+// ThsHfEdbInfoMaxAndMinInfo 指标最新数据记录结构体
+type ThsHfEdbInfoMaxAndMinInfo struct {
+	MinDate     string  `description:"最小日期" bson:"min_date"`
+	MaxDate     string  `description:"最大日期" bson:"max_date"`
+	MinValue    float64 `description:"最小值" bson:"min_value"`
+	MaxValue    float64 `description:"最大值" bson:"max_value"`
+	LatestValue float64 `gorm:"-" description:"最新值" bson:"latest_value"`
+	LatestDate  string  `gorm:"-" description:"实际数据最新日期" bson:"latest_date"`
+	EndValue    float64 `description:"最新值" bson:"end_value"`
+	IndexCode   string  `description:"指标编码" bson:"index_code"`
+}
+
+// AfterFind 在该模型上设置钩子函数，把日期转成正确的string，所以查询函数只能用Find函数，First或者Scan是不会触发该函数的来获取数据
+func (m *ThsHfEdbInfoMaxAndMinInfo) AfterFind(db *gorm.DB) (err error) {
+	m.MinDate = utils.GormDateStrToDateTimeStr(m.MinDate)
+	m.MaxDate = utils.GormDateStrToDateTimeStr(m.MaxDate)
+	m.LatestDate = utils.GormDateStrToDateStr(m.LatestDate)
+
+	return
+}
+
+func (m *BaseFromThsHfData) GetIndexMinMax(indexCode string) (item *ThsHfEdbInfoMaxAndMinInfo, err error) {
 	sql := fmt.Sprintf(`SELECT MIN(%s) AS min_date, MAX(%s) AS max_date, MIN(%s) AS min_value,MAX(%s) AS max_value FROM %s WHERE %s = ?`, m.Cols().DataTime, m.Cols().DataTime, m.Cols().Value, m.Cols().Value, m.TableName(), m.Cols().IndexCode)
 	err = global.DEFAULT_DB.Raw(sql, indexCode).First(&item).Error
 	if err != nil {