Browse Source

change gorm AfterFind

Roc 1 month ago
parent
commit
2b69c7d768

+ 14 - 0
models/base_from_baiinfo.go

@@ -4,6 +4,7 @@ import (
 	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
+	"gorm.io/gorm"
 	"strconv"
 	"strings"
 	"time"
@@ -21,6 +22,12 @@ type BaseFromBaiinfoData struct {
 	DataTimestamp          int64
 }
 
+func (e *BaseFromBaiinfoData) AfterFind(db *gorm.DB) (err error) {
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
+
+	return
+}
+
 func GetBaseFromBaiinfoDataByCondition(condition string, pars []interface{}) (list []*BaseFromBaiinfoData, err error) {
 	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_baiinfo_data WHERE 1=1 `
@@ -214,6 +221,13 @@ type BaseFromBaiinfoIndex struct {
 	ModifyTime     time.Time
 }
 
+func (e *BaseFromBaiinfoIndex) AfterFind(db *gorm.DB) (err error) {
+	e.StartDate = utils.GormDateStrToDateStr(e.StartDate)
+	e.EndDate = utils.GormDateStrToDateStr(e.EndDate)
+
+	return
+}
+
 func (d *BaseFromBaiinfoIndex) AddBaseFromBaiinfoIndex() (lastId int64, err error) {
 	//o := orm.NewOrm()
 	//lastId, err = o.Insert(d)

+ 14 - 0
models/base_from_ccf.go

@@ -4,6 +4,7 @@ import (
 	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
+	"gorm.io/gorm"
 	"strconv"
 	"strings"
 	"time"
@@ -28,6 +29,12 @@ func (m *BaseFromCCFData) TableName() string {
 	return "base_from_ccf_data"
 }
 
+func (e *BaseFromCCFData) AfterFind(db *gorm.DB) (err error) {
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
+
+	return
+}
+
 func GetBaseFromCCFDataByCondition(condition string, pars []interface{}) (list []*BaseFromCCFData, err error) {
 	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_ccf_data WHERE 1=1 `
@@ -219,6 +226,13 @@ type BaseFromCCFIndex struct {
 	ModifyTime   time.Time
 }
 
+func (e *BaseFromCCFIndex) AfterFind(db *gorm.DB) (err error) {
+	e.StartDate = utils.GormDateStrToDateStr(e.StartDate)
+	e.EndDate = utils.GormDateStrToDateStr(e.EndDate)
+
+	return
+}
+
 func (m *BaseFromCCFIndex) TableName() string {
 	return "base_from_ccf_index"
 }

+ 7 - 0
models/base_from_clarksons.go

@@ -4,6 +4,7 @@ import (
 	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
+	"gorm.io/gorm"
 	"strconv"
 	"strings"
 	"time"
@@ -32,6 +33,12 @@ type BaseFromClarksonsData struct {
 	ModifyTime               time.Time `description:"修改时间"`
 }
 
+func (e *BaseFromClarksonsData) AfterFind(db *gorm.DB) (err error) {
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
+
+	return
+}
+
 // 查询指标
 func GetBaseFromClarksonsIndex() (items []*BaseFromClarksonsIndex, err error) {
 	//o := orm.NewOrm()

+ 8 - 0
models/base_from_coal_coastal.go

@@ -2,6 +2,8 @@ package models
 
 import (
 	"eta/eta_index_lib/global"
+	"eta/eta_index_lib/utils"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -21,6 +23,12 @@ type BaseFromCoalmineCoastalIndex struct {
 	ModifyTime                     time.Time `description:"修改时间"`
 }
 
+func (e *BaseFromCoalmineCoastalIndex) AfterFind(db *gorm.DB) (err error) {
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
+
+	return
+}
+
 // 查询指标
 func GetBaseFromCoalmineCoastalIndex() (items []*BaseFromCoalmineCoastalIndex, err error) {
 	//o := orm.NewOrm()

+ 8 - 0
models/base_from_coal_firm.go

@@ -2,6 +2,8 @@ package models
 
 import (
 	"eta/eta_index_lib/global"
+	"eta/eta_index_lib/utils"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -21,6 +23,12 @@ type BaseFromCoalmineFirmIndex struct {
 	ModifyTime time.Time `description:"修改时间"`
 }
 
+func (e *BaseFromCoalmineFirmIndex) AfterFind(db *gorm.DB) (err error) {
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
+
+	return
+}
+
 // 查询指标
 func GetBaseFromCoalmineFirmIndex() (items []*BaseFromCoalmineFirmIndex, err error) {
 	//o := orm.NewOrm()

+ 8 - 0
models/base_from_coal_inland.go

@@ -2,6 +2,8 @@ package models
 
 import (
 	"eta/eta_index_lib/global"
+	"eta/eta_index_lib/utils"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -21,6 +23,12 @@ type BaseFromCoalmineInlandIndex struct {
 	ModifyTime time.Time `description:"修改时间"`
 }
 
+func (e *BaseFromCoalmineInlandIndex) AfterFind(db *gorm.DB) (err error) {
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
+
+	return
+}
+
 // 查询指标
 func GetBaseFromCoalmineInlandIndex() (items []*BaseFromCoalmineInlandIndex, err error) {
 	//o := orm.NewOrm()

+ 14 - 0
models/base_from_coalmine.go

@@ -2,6 +2,8 @@ package models
 
 import (
 	"eta/eta_index_lib/global"
+	"eta/eta_index_lib/utils"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -30,6 +32,12 @@ type BaseFromCoalmineJsmIndex struct {
 	ModifyTime  time.Time `description:"修改时间"`
 }
 
+func (e *BaseFromCoalmineJsmIndex) AfterFind(db *gorm.DB) (err error) {
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
+
+	return
+}
+
 type BaseFromCoalmineCompanyIndex struct {
 	BaseFromCoalmineCompanyIndexId int `gorm:"column:base_from_coalmine_company_index_id;primaryKey"`
 	//BaseFromCoalmineCompanyIndexId int       `orm:"column(base_from_coalmine_company_index_id);pk"`
@@ -47,6 +55,12 @@ type BaseFromCoalmineCompanyIndex struct {
 	ModifyTime time.Time `description:"修改时间"`
 }
 
+func (e *BaseFromCoalmineCompanyIndex) AfterFind(db *gorm.DB) (err error) {
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
+
+	return
+}
+
 // 添加指标
 func AddBaseFromCoalmineMapping(item *BaseFromCoalmineMapping) (lastId int64, err error) {
 	//o := orm.NewOrm()

+ 14 - 0
models/base_from_fenwei.go

@@ -4,6 +4,7 @@ import (
 	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
+	"gorm.io/gorm"
 	"strconv"
 	"strings"
 	"time"
@@ -28,6 +29,12 @@ func (m *BaseFromFenweiData) TableName() string {
 	return "base_from_fenwei_data"
 }
 
+func (e *BaseFromFenweiData) AfterFind(db *gorm.DB) (err error) {
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
+
+	return
+}
+
 func GetBaseFromFenweiDataByCondition(condition string, pars []interface{}) (list []*BaseFromFenweiData, err error) {
 	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_fenwei_data WHERE 1=1 `
@@ -219,6 +226,13 @@ type BaseFromFenweiIndex struct {
 	ModifyTime   time.Time
 }
 
+func (e *BaseFromFenweiIndex) AfterFind(db *gorm.DB) (err error) {
+	e.StartDate = utils.GormDateStrToDateStr(e.StartDate)
+	e.EndDate = utils.GormDateStrToDateStr(e.EndDate)
+
+	return
+}
+
 func (m *BaseFromFenweiIndex) TableName() string {
 	return "base_from_fenwei_index"
 }

+ 14 - 0
models/base_from_gpr_risk.go

@@ -5,6 +5,7 @@ import (
 	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
+	"gorm.io/gorm"
 	"strconv"
 	"strings"
 	"time"
@@ -25,6 +26,12 @@ type BaseFromGprRiskData struct {
 	DataTimestamp          int64
 }
 
+func (e *BaseFromGprRiskData) AfterFind(db *gorm.DB) (err error) {
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
+
+	return
+}
+
 func GetBaseFromGprRiskDataByCondition(condition string, pars []interface{}) (list []*BaseFromGprRiskData, err error) {
 	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_gpr_risk_data WHERE 1=1 `
@@ -227,6 +234,13 @@ type BaseFromGprRiskIndex struct {
 	ModifyTime             time.Time
 }
 
+func (e *BaseFromGprRiskIndex) AfterFind(db *gorm.DB) (err error) {
+	e.StartDate = utils.GormDateStrToDateStr(e.StartDate)
+	e.EndDate = utils.GormDateStrToDateStr(e.EndDate)
+
+	return
+}
+
 type BaseFromGprRiskIndexList struct {
 	//BaseFromGprRiskIndexId int64 `orm:"column(base_from_gpr_risk_index_id);pk"`
 	BaseFromGprRiskIndexId int64 `gorm:"column:base_from_gpr_risk_index_id;primaryKey"`

+ 7 - 0
models/base_from_hisugar.go

@@ -4,6 +4,7 @@ import (
 	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
+	"gorm.io/gorm"
 	"strconv"
 	"strings"
 	"time"
@@ -32,6 +33,12 @@ type BaseFromHisugarData struct {
 	ModifyTime             time.Time // 修改时间
 }
 
+func (e *BaseFromHisugarData) AfterFind(db *gorm.DB) (err error) {
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
+
+	return
+}
+
 // 添加数据
 func AddBaseFromHisugarIndexMuti(items []*BaseFromHisugarIndex) (err error) {
 	//o := orm.NewOrm()

+ 7 - 0
models/base_from_mtjh.go

@@ -5,6 +5,7 @@ import (
 	"eta/eta_index_lib/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
+	"gorm.io/gorm"
 	"strconv"
 	"strings"
 	"time"
@@ -39,6 +40,12 @@ type BaseFromMtjhIndex struct {
 	ModifyTime time.Time `description:"修改时间"`
 }
 
+func (e *BaseFromMtjhIndex) AfterFind(db *gorm.DB) (err error) {
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
+
+	return
+}
+
 // 查询指标
 func GetBaseFromMtjhMapping() (items []*BaseFromMtjhMapping, err error) {
 	//o := orm.NewOrm()

+ 8 - 0
models/base_from_mysteel_chemical.go

@@ -4,6 +4,7 @@ import (
 	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
+	"gorm.io/gorm"
 	"strconv"
 	"strings"
 	"time"
@@ -232,6 +233,13 @@ type BaseFromMysteelChemicalIndex struct {
 	IsSupplierStop                    int       `description:"是否供应商停更:1:停更,0:未停更"`
 }
 
+func (e *BaseFromMysteelChemicalIndex) AfterFind(db *gorm.DB) (err error) {
+	e.UpdateTime = utils.GormDateStrToDateStr(e.UpdateTime)
+	e.UpdateTime2 = utils.GormDateStrToDateStr(e.UpdateTime2)
+
+	return
+}
+
 type MysteelChemicalAPiCheck struct {
 	IsEnable bool
 	ErrMsg   string

+ 7 - 0
models/base_from_oilchem.go

@@ -4,6 +4,7 @@ import (
 	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
+	"gorm.io/gorm"
 	"strconv"
 	"strings"
 	"time"
@@ -32,6 +33,12 @@ type BaseFromOilchemData struct {
 	ModifyTime             time.Time // 修改时间
 }
 
+func (e *BaseFromOilchemData) AfterFind(db *gorm.DB) (err error) {
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
+
+	return
+}
+
 // 添加数据
 func AddBaseFromOilchemIndexMuti(items []*BaseFromOilchemIndex) (err error) {
 	//o := orm.NewOrm()

+ 7 - 0
models/base_from_python.go

@@ -7,6 +7,7 @@ import (
 	"eta/eta_index_lib/utils"
 	"fmt"
 	"github.com/shopspring/decimal"
+	"gorm.io/gorm"
 	"strings"
 	"time"
 )
@@ -24,6 +25,12 @@ type EdbDataPython struct {
 	DataTimestamp int64
 }
 
+func (e *EdbDataPython) AfterFind(db *gorm.DB) (err error) {
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
+
+	return
+}
+
 // EdbDataFromPython 通过python代码获取到的指标数据
 type EdbDataFromPython struct {
 	Date  map[int]string  `json:"date"`

+ 7 - 0
models/base_from_sci.go

@@ -4,6 +4,7 @@ import (
 	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
+	"gorm.io/gorm"
 	"strconv"
 	"strings"
 	"time"
@@ -21,6 +22,12 @@ type BaseFromSciData struct {
 	DataTimestamp      int64
 }
 
+func (e *BaseFromSciData) AfterFind(db *gorm.DB) (err error) {
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
+
+	return
+}
+
 // Update 修改
 func (r *BaseFromSciData) Update(updateCols []string) (err error) {
 	//o := orm.NewOrm()

+ 7 - 0
models/base_from_sci99.go

@@ -4,6 +4,7 @@ import (
 	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
+	"gorm.io/gorm"
 	"strconv"
 	"strings"
 	"time"
@@ -50,6 +51,12 @@ type BaseFromSci99Data struct {
 	ModifyTime         time.Time // 修改时间
 }
 
+func (e *BaseFromSci99Data) AfterFind(db *gorm.DB) (err error) {
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
+
+	return
+}
+
 // BaseFromSci99Classify 代表卓创资讯-原始指标分类表的结构
 type BaseFromSci99Classify struct {
 	BaseFromSciClassifyId int `gorm:"column:base_from_sci_classify_id;primaryKey"` // 主键,自动递增

+ 14 - 0
models/base_from_sci_hq.go

@@ -4,6 +4,7 @@ import (
 	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
+	"gorm.io/gorm"
 	"strconv"
 	"strings"
 	"time"
@@ -208,6 +209,13 @@ type BaseFromSciHqIndex struct {
 	ModifyTime           time.Time `description:"更新时间"`
 }
 
+func (e *BaseFromSciHqIndex) AfterFind(db *gorm.DB) (err error) {
+	e.StartDate = utils.GormDateStrToDateStr(e.StartDate)
+	e.EndDate = utils.GormDateStrToDateStr(e.EndDate)
+
+	return
+}
+
 func GetAllBaseFromSciHqIndex() (items []*BaseFromSciHqIndex, err error) {
 	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_sci_hq_index`
@@ -234,6 +242,12 @@ type BaseFromSciHqData struct {
 	DataTimestamp        int64     `description:"数据时间戳"`
 }
 
+func (e *BaseFromSciHqData) AfterFind(db *gorm.DB) (err error) {
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
+
+	return
+}
+
 func (r *BaseFromSciHqData) Update(cols []string) (err error) {
 	//o := orm.NewOrm()
 	//_, err = o.Update(r, cols...)

+ 7 - 0
models/base_from_sh.go

@@ -4,6 +4,7 @@ import (
 	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
+	"gorm.io/gorm"
 	"strconv"
 	"strings"
 	"time"
@@ -333,6 +334,12 @@ type BaseFromTradeShanghaiIndex struct {
 	DataTime                     string
 }
 
+func (e *BaseFromTradeShanghaiIndex) AfterFind(db *gorm.DB) (err error) {
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
+
+	return
+}
+
 func AddBaseFromTradeShangHaiIndex(item *BaseFromTradeShanghaiIndex) (lastId int64, err error) {
 	//o := orm.NewOrm()
 	//lastId, err = o.Insert(item)

+ 7 - 0
models/base_from_shfe.go

@@ -4,6 +4,7 @@ import (
 	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
+	"gorm.io/gorm"
 	"strconv"
 	"strings"
 	"time"
@@ -296,6 +297,12 @@ type BaseFromTradeIneIndex struct {
 	DataTime      string
 }
 
+func (e *BaseFromTradeIneIndex) AfterFind(db *gorm.DB) (err error) {
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
+
+	return
+}
+
 type BaseFromTradeMapping struct {
 	BaseFromTradeMappingId int `gorm:"column:base_from_trade_mapping_id;primaryKey"`
 	//BaseFromTradeMappingId int `orm:"column(base_from_trade_mapping_id);pk"`

+ 16 - 0
models/base_from_smm.go

@@ -4,6 +4,7 @@ import (
 	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
+	"gorm.io/gorm"
 	"strconv"
 	"strings"
 	"time"
@@ -21,6 +22,12 @@ type BaseFromSmmData struct {
 	DataTimestamp      int64
 }
 
+func (e *BaseFromSmmData) AfterFind(db *gorm.DB) (err error) {
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
+
+	return
+}
+
 func (s *BaseFromSmmData) Update(cols []string) (err error) {
 	//o := orm.NewOrm()
 	//_, err = o.Update(s, cols...)
@@ -273,6 +280,15 @@ type BaseFromSmmIndex struct {
 	ReleaseTime    string
 }
 
+func (e *BaseFromSmmIndex) AfterFind(db *gorm.DB) (err error) {
+	e.ApiStartTime = utils.GormDateStrToDateTimeStr(e.ApiStartTime)
+	e.ApiUpdateTime = utils.GormDateStrToDateTimeStr(e.ApiUpdateTime)
+	e.StartTime = utils.GormDateStrToDateTimeStr(e.StartTime)
+	e.FinishTime = utils.GormDateStrToDateTimeStr(e.FinishTime)
+
+	return
+}
+
 func (d *BaseFromSmmIndex) AddBaseFromSmmIndex() (lastId int64, err error) {
 	//o := orm.NewOrm()
 	//lastId, err = o.Insert(d)

+ 14 - 0
models/base_from_usda_fas.go

@@ -4,6 +4,7 @@ import (
 	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
+	"gorm.io/gorm"
 	"strconv"
 	"strings"
 	"time"
@@ -24,6 +25,12 @@ type BaseFromUsdaFasData struct {
 	DataTimestamp          int64
 }
 
+func (e *BaseFromUsdaFasData) AfterFind(db *gorm.DB) (err error) {
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
+
+	return
+}
+
 func GetBaseFromUsdaFasDataByCondition(condition string, pars []interface{}) (list []*BaseFromUsdaFasData, err error) {
 	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_usda_fas_data WHERE 1=1 `
@@ -219,6 +226,13 @@ type BaseFromUsdaFasIndex struct {
 	ModifyTime     time.Time
 }
 
+func (e *BaseFromUsdaFasIndex) AfterFind(db *gorm.DB) (err error) {
+	e.StartDate = utils.GormDateStrToDateStr(e.StartDate)
+	e.EndDate = utils.GormDateStrToDateStr(e.EndDate)
+
+	return
+}
+
 type BaseFromUsdaFasIndexList struct {
 	BaseFromUsdaFasIndexId int64 `gorm:"column:base_from_usda_fas_index_id;primaryKey"`
 	//BaseFromUsdaFasIndexId int64 `orm:"column(base_from_usda_fas_index_id);pk"`

+ 14 - 0
models/base_from_yongyi.go

@@ -4,6 +4,7 @@ import (
 	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
+	"gorm.io/gorm"
 	"strconv"
 	"strings"
 	"time"
@@ -24,6 +25,12 @@ type BaseFromYongyiData struct {
 	DataTimestamp int64
 }
 
+func (e *BaseFromYongyiData) AfterFind(db *gorm.DB) (err error) {
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
+
+	return
+}
+
 func GetBaseFromYongyiDataByCondition(condition string, pars []interface{}) (list []*BaseFromYongyiData, err error) {
 	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_yongyi_data WHERE 1=1 `
@@ -215,6 +222,13 @@ type BaseFromYongyiIndex struct {
 	ModifyTime   time.Time
 }
 
+func (e *BaseFromYongyiIndex) AfterFind(db *gorm.DB) (err error) {
+	e.StartDate = utils.GormDateStrToDateStr(e.StartDate)
+	e.StartDate = utils.GormDateStrToDateStr(e.StartDate)
+
+	return
+}
+
 type BaseFromYongyiIndexList struct {
 	//YongyiIndexId int64 `orm:"column(yongyi_index_id);pk"`
 	YongyiIndexId int64 `gorm:"column:yongyi_index_id;primaryKey"`

+ 10 - 0
models/data_stat/edb_info_update_log.go

@@ -2,6 +2,8 @@ package data_stat
 
 import (
 	"eta/eta_index_lib/global"
+	"eta/eta_index_lib/utils"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -39,6 +41,14 @@ type EdbInfoUpdateLog struct {
 	UpdateType             int       `gorm:"column:update_type"                                     description:"变更类型,0:数据明细变更,1:基础信息变更, 2:新增指标"`
 }
 
+func (e *EdbInfoUpdateLog) AfterFind(db *gorm.DB) (err error) {
+	e.LatestDate = utils.GormDateStrToDateStr(e.LatestDate)
+	e.ErDataUpdateDate = utils.GormDateStrToDateStr(e.ErDataUpdateDate)
+	e.DataUpdateTime = utils.GormDateStrToDateTimeStr(e.DataUpdateTime)
+
+	return
+}
+
 func AddEdbUpdateLog(item *EdbInfoUpdateLog) (lastId int64, err error) {
 	err = global.DEFAULT_DB.Create(item).Error
 	if err != nil {

+ 10 - 0
models/data_stat/edb_info_update_stat.go

@@ -3,6 +3,7 @@ package data_stat
 import (
 	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -41,6 +42,15 @@ type EdbInfoUpdateStat struct {
 	HasRefresh             int       `gorm:"column:has_refresh" description:"今日是否发起刷新服务,1是,0否"`
 }
 
+func (e *EdbInfoUpdateStat) AfterFind(db *gorm.DB) (err error) {
+	e.LatestDate = utils.GormDateStrToDateStr(e.LatestDate)
+	e.ErDataUpdateDate = utils.GormDateStrToDateStr(e.ErDataUpdateDate)
+	e.DataUpdateTime = utils.GormDateStrToDateTimeStr(e.DataUpdateTime)
+	e.UpdateTime = utils.GormDateStrToDateTimeStr(e.UpdateTime)
+
+	return
+}
+
 // Add 新增
 func (r *EdbInfoUpdateStat) Add(list []*EdbInfoUpdateStat) (err error) {
 	err = global.DEFAULT_DB.CreateInBatches(list, utils.MultiAddNum).Error

+ 6 - 0
models/edb_data_calculate_ljztbpj.go

@@ -26,6 +26,12 @@ type EdbDataCalculateLjztbpj struct {
 	DataTimestamp int64     `gorm:"column:modify_time" description:"数据日期时间戳"`
 }
 
+func (e *EdbDataCalculateLjztbpj) AfterFind(db *gorm.DB) (err error) {
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
+
+	return
+}
+
 // AddCalculateLjztbpj 新增累计值同比拼接数据
 func AddCalculateLjztbpj(req *EdbInfoCalculateBatchSaveReq, firstEdbInfo, secondEdbInfo *EdbInfo, edbCode, uniqueCode string, sysUserId int, sysUserRealName string) (edbInfo *EdbInfo, err error) {
 	to := global.DEFAULT_DB.Begin()

+ 6 - 0
models/edb_data_calculate_nhcc.go

@@ -25,6 +25,12 @@ type EdbDataCalculateNhcc struct {
 	DataTimestamp int64     `gorm:"column:data_timestamp" description:"数据日期时间戳"`
 }
 
+func (e *EdbDataCalculateNhcc) AfterFind(db *gorm.DB) (err error) {
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
+
+	return
+}
+
 // NhccDate 拟合残差的开始、结束日期
 type NhccDate struct {
 	StartDate time.Time

+ 6 - 0
models/edb_data_calculate_zjpj.go

@@ -23,6 +23,12 @@ type EdbDataCalculateZjpj struct {
 	DataTimestamp int64     `gorm:"column:modify_time" description:"数据日期时间戳"`
 }
 
+func (e *EdbDataCalculateZjpj) AfterFind(db *gorm.DB) (err error) {
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
+
+	return
+}
+
 // AddCalculateZjpj 新增直接拼接数据
 func AddCalculateZjpj(req *EdbInfoCalculateBatchSaveReq, firstEdbInfo, secondEdbInfo *EdbInfo, edbCode, uniqueCode string, sysUserId int, sysUserRealName string) (edbInfo *EdbInfo, err error) {
 	to := global.DEFAULT_DB.Begin()

+ 0 - 1
models/edb_info.go

@@ -70,7 +70,6 @@ type EdbInfo struct {
 }
 
 func (e *EdbInfo) Add() (err error) {
-
 	err = global.DEFAULT_DB.Create(e).Error
 	return
 }

+ 8 - 0
models/future_good/future_good_edb_info.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"eta/eta_index_lib/utils"
 	"github.com/beego/beego/v2/client/orm"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -31,6 +32,13 @@ type FutureGoodEdbInfo struct {
 	ModifyTime          time.Time
 }
 
+func (e *FutureGoodEdbInfo) AfterFind(db *gorm.DB) (err error) {
+	e.StartDate = utils.GormDateStrToDateStr(e.StartDate)
+	e.EndDate = utils.GormDateStrToDateStr(e.EndDate)
+
+	return
+}
+
 // GetFutureGoodEdbInfo 期货指标
 func GetFutureGoodEdbInfo(edbInfoId int) (item *FutureGoodEdbInfo, err error) {
 	o := orm.NewOrm()

+ 6 - 0
models/predict_edb_data_calculate_ljztbpj.go

@@ -25,6 +25,12 @@ type EdbDataPredictCalculateLjztbpj struct {
 	DataTimestamp int64     `gorm:"column:modify_time" description:"数据日期时间戳"`
 }
 
+func (e *EdbDataPredictCalculateLjztbpj) AfterFind(db *gorm.DB) (err error) {
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
+
+	return
+}
+
 // RefreshAllPredictCalculateLjztbpj 刷新所有 累计值同比拼接 数据
 func RefreshAllPredictCalculateLjztbpj(edbInfo *EdbInfo) (latestDateStr string, latestValue float64, err error) {
 	to := global.DEFAULT_DB.Begin()

+ 6 - 0
models/predict_edb_data_calculate_nhcc.go

@@ -25,6 +25,12 @@ type EdbDataPredictCalculateNhcc struct {
 	DataTimestamp int64     `gorm:"column:modify_time" description:"数据日期时间戳"`
 }
 
+func (e *EdbDataPredictCalculateNhcc) AfterFind(db *gorm.DB) (err error) {
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
+
+	return
+}
+
 // SavePredictCalculateNhcc 新增拟合残差数据
 func SavePredictCalculateNhcc(req *EdbInfoCalculateBatchSaveReq, firstEdbInfo, secondEdbInfo *EdbInfo, edbCode, uniqueCode string, nhccDate NhccDate, sysUserId int, sysUserRealName, lang string) (edbInfo *EdbInfo, latestDateStr string, latestValue float64, err error) {
 	to := global.DEFAULT_DB.Begin()

+ 6 - 0
models/predict_edb_data_calculate_zjpj.go

@@ -23,6 +23,12 @@ type EdbDataPredictCalculateZjpj struct {
 	DataTimestamp int64
 }
 
+func (e *EdbDataPredictCalculateZjpj) AfterFind(db *gorm.DB) (err error) {
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
+
+	return
+}
+
 // RefreshAllPredictCalculateZjpj 刷新所有 直接拼接 数据
 func RefreshAllPredictCalculateZjpj(edbInfo *EdbInfo) (latestDateStr string, latestValue float64, err error) {
 	to := global.DEFAULT_DB.Begin()

+ 0 - 13
models/predict_edb_rule_data.go

@@ -72,19 +72,6 @@ func GetPredictEdbRuleDataByTo(to *gorm.DB, configId int) (list []*PredictEdbRul
 	return
 }
 
-// AfterFind 在该模型上设置钩子函数,把日期转成正确的string,所以查询函数只能用Find函数,First或者Scan是不会触发该函数的来获取数据
-func (m *PredictEdbRuleData) AfterFind(db *gorm.DB) (err error) {
-	if m.DataTime == "" {
-		return
-	}
-	dataDateTmp, err := time.ParseInLocation(utils.FormatDateWallWithLoc, m.DataTime, time.Local)
-	if err != nil {
-		return
-	}
-	m.DataTime = dataDateTmp.Format(utils.FormatDate)
-	return
-}
-
 // ConvertDate
 // @Description: 日期转换
 // @author: Roc