fix

models/data_stat/edb_info_update_log.go

@@ -41,6 +41,11 @@ type EdbInfoUpdateLog struct {
 
 func AddEdbUpdateLog(item *EdbInfoUpdateLog) (lastId int64, err error) {
 	err = global.DEFAULT_DB.Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.Id)
+
 	return
 }
 

models/edb_refresh/edb_refresh_config.go

@@ -2,21 +2,21 @@ package edb_refresh
 
 import (
 	"errors"
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_index_lib/global"
 	"time"
 )
 
 // EdbRefreshConfig
 // @Description: 指标的刷新时间配置表
 type EdbRefreshConfig struct {
-	EdbRefreshConfigId  int       `orm:"column(edb_refresh_config_id);pk"`
-	RefreshFrequency    string    `description:"刷新频率"`
-	RefreshFrequencyDay int       `description:"具体刷新的日期"`
-	RefreshTime         string    `description:"刷新时间"`
-	RefreshAllData      int       `description:"是否刷新所有数据，0：否，1：刷新所有数据"`
-	RefreshDataNum      int       `description:"刷新单元格数"`
-	ModifyTime          time.Time `description:"最晚一次的更新时间"`
-	CreateTime          time.Time `description:"添加时间"`
+	EdbRefreshConfigId  int       `gorm:"primaryKey;autoIncrement;column:edb_refresh_config_id"`
+	RefreshFrequency    string    `gorm:"column:refresh_frequency" description:"刷新频率"`
+	RefreshFrequencyDay int       `gorm:"column:refresh_frequency_day" description:"具体刷新的日期"`
+	RefreshTime         string    `gorm:"column:refresh_time" description:"刷新时间"`
+	RefreshAllData      int       `gorm:"column:refresh_all_data" description:"是否刷新所有数据，0：否，1：刷新所有数据"`
+	RefreshDataNum      int       `gorm:"column:refresh_data_num" description:"刷新单元格数"`
+	ModifyTime          time.Time `gorm:"column:modify_time" description:"最晚一次的更新时间"`
+	CreateTime          time.Time `gorm:"column:create_time" description:"添加时间"`
 }
 
 // Add
@@ -31,12 +31,7 @@ func (m *EdbRefreshConfig) Add() (err error) {
 		err = errors.New("该配置已存在")
 		return
 	}
-	o := orm.NewOrm()
-	lastId, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.EdbRefreshConfigId = int(lastId)
+	err = global.DEFAULT_DB.Create(m).Error
 
 	return
 }
@@ -49,8 +44,8 @@ func (m *EdbRefreshConfig) Add() (err error) {
 // @param cols []string
 // @return err error
 func (m *EdbRefreshConfig) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, cols...)
+	err = global.DEFAULT_DB.Model(m).Select(cols).Updates(m).Error
+
 	return
 }
 
@@ -61,8 +56,9 @@ func (m *EdbRefreshConfig) Update(cols []string) (err error) {
 // @datetime 2023-12-14 16:11:10
 // @return err error
 func (m *EdbRefreshConfig) Delete() (err error) {
-	o := orm.NewOrm()
-	_, err = o.Delete(m)
+	//todo 删除前判断
+	err = global.DEFAULT_DB.Delete(m).Error
+
 	return
 }
 
@@ -75,7 +71,6 @@ func (m *EdbRefreshConfig) Delete() (err error) {
 // @return list []*EdbRefreshDefaultConfig
 // @return err error
 func GetEdbRefreshConfigListByCondition(condition string, pars []interface{}) (list []*EdbRefreshConfig, err error) {
-	o := orm.NewOrm()
 	sql := `SELECT * FROM edb_refresh_config
          WHERE 1 = 1 `
 
@@ -83,7 +78,7 @@ func GetEdbRefreshConfigListByCondition(condition string, pars []interface{}) (l
 		sql += condition
 	}
 	sql += ` ORDER BY edb_refresh_config_id ASC `
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&list).Error
 
 	return
 }

models/edb_refresh/edb_refresh_default_config.go

@@ -2,25 +2,25 @@ package edb_refresh
 
 import (
 	"errors"
+	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 // EdbRefreshDefaultConfig
 // @Description: 指标的默认刷新时间配置表
 type EdbRefreshDefaultConfig struct {
-	Id                  int       `orm:"column(id);pk"`
-	Source              int       `description:"来源"`
-	SubSource           int       `description:"来源名称"`
-	Frequency           string    `description:"频度"`
-	RefreshFrequency    string    `description:"刷新频率"`
-	RefreshFrequencyDay int       `description:"具体刷新的日期"`
-	RefreshTime         string    `description:"刷新时间"`
-	RefreshAllData      int       `description:"是否刷新所有数据，0：否，1：刷新所有数据"`
-	RefreshDataNum      int       `description:"刷新单元格数"`
-	ModifyTime          time.Time `description:"最晚一次的更新时间"`
-	CreateTime          time.Time `description:"添加时间"`
+	Id                  int       `gorm:"primaryKey;autoIncrement;column:id" description:"唯一ID"`
+	Source              int       `gorm:"column:source" description:"来源"`
+	SubSource           int       `gorm:"column:sub_source" description:"来源名称"`
+	Frequency           string    `gorm:"column:frequency" description:"频度"`
+	RefreshFrequency    string    `gorm:"column:refresh_frequency" description:"刷新频率"`
+	RefreshFrequencyDay int       `gorm:"column:refresh_frequency_day" description:"具体刷新的日期"`
+	RefreshTime         string    `gorm:"column:refresh_time" description:"刷新时间"`
+	RefreshAllData      int       `gorm:"column:refresh_all_data" description:"是否刷新所有数据，0：否，1：刷新所有数据"`
+	RefreshDataNum      int       `gorm:"column:refresh_data_num" description:"刷新单元格数"`
+	ModifyTime          time.Time `gorm:"column:modify_time" description:"最晚一次的更新时间"`
+	CreateTime          time.Time `gorm:"column:create_time" description:"添加时间"`
 }
 
 // Add
@@ -35,12 +35,7 @@ func (m *EdbRefreshDefaultConfig) Add() (err error) {
 		err = errors.New("该配置已存在")
 		return
 	}
-	o := orm.NewOrm()
-	lastId, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.Id = int(lastId)
+	err = global.DEFAULT_DB.Create(m).Error
 
 	return
 }
@@ -53,8 +48,8 @@ func (m *EdbRefreshDefaultConfig) Add() (err error) {
 // @param cols []string
 // @return err error
 func (m *EdbRefreshDefaultConfig) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, cols...)
+	err = global.DEFAULT_DB.Model(m).Select(cols).Updates(m).Error
+
 	return
 }
 
@@ -65,8 +60,8 @@ func (m *EdbRefreshDefaultConfig) Update(cols []string) (err error) {
 // @datetime 2023-12-14 16:11:10
 // @return err error
 func (m *EdbRefreshDefaultConfig) Delete() (err error) {
-	o := orm.NewOrm()
-	_, err = o.Delete(m)
+	err = global.DEFAULT_DB.Delete(m).Error
+
 	return
 }
 
@@ -80,10 +75,9 @@ func (m *EdbRefreshDefaultConfig) Delete() (err error) {
 // @return list []*EdbRefreshDefaultConfig
 // @return err error
 func GetListBySourceAndFrequency(source, subSource int, frequency string) (list []*EdbRefreshDefaultConfig, err error) {
-	o := orm.NewOrm()
 	sql := `SELECT * FROM edb_refresh_default_config
          WHERE source = ? AND sub_source = ? AND frequency = ? ORDER BY id ASC `
-	_, err = o.Raw(sql, source, subSource, frequency).QueryRows(&list)
+	err = global.DEFAULT_DB.Raw(sql, source, subSource, frequency).Find(&list).Error
 
 	return
 }
@@ -97,7 +91,6 @@ func GetListBySourceAndFrequency(source, subSource int, frequency string) (list
 // @return list []*EdbRefreshDefaultConfig
 // @return err error
 func GetListByCondition(condition string, pars []interface{}) (list []*EdbRefreshDefaultConfig, err error) {
-	o := orm.NewOrm()
 	sql := `SELECT * FROM edb_refresh_default_config
          WHERE 1 = 1 `
 
@@ -105,7 +98,7 @@ func GetListByCondition(condition string, pars []interface{}) (list []*EdbRefres
 		sql += condition
 	}
 	sql += ` ORDER BY id ASC `
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&list).Error
 
 	return
 }
@@ -124,11 +117,10 @@ func GetDefaultRefreshEdbInfoListBySourceAndSubSource(source, subSource int, fre
 		return
 	}
 
-	o := orm.NewOrm()
 	sql := `SELECT a.* FROM edb_info a 
 LEFT JOIN edb_refresh_mapping b ON a.edb_info_id = b.edb_info_id
 WHERE a.source = ? AND a.sub_source = ? AND a.frequency IN (` + utils.GetOrmInReplace(num) + `)  AND b.edb_info_id is null`
-	_, err = o.Raw(sql, source, subSource, frequencyList).QueryRows(&list)
+	err = global.DEFAULT_DB.Raw(sql, source, subSource, frequencyList).Scan(&list).Error
 
 	return
 }

models/edb_refresh/edb_refresh_mapping.go

@@ -2,23 +2,23 @@ package edb_refresh
 
 import (
 	"errors"
+	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 // EdbRefreshMapping
 // @Description: 指标刷新时间配置关系表
 type EdbRefreshMapping struct {
-	EdbRefreshMappingId int       `orm:"column(edb_refresh_mapping_id);pk"`
-	Source              int       `description:"来源"`
-	SubSource           int       `description:"来源名称"`
-	EdbInfoId           int       `description:"指标id，如果是数据源（钢联、有色）的，那么就是数据源里面的id"`
-	EdbRefreshConfigId  int       `description:"刷新配置id"`
-	SysUserId           int       `description:"操作人id"`
-	SysUserRealName     string    `description:"操作人真实姓名"`
-	ModifyTime          time.Time `description:"最晚一次的更新时间"`
-	CreateTime          time.Time `description:"添加时间"`
+	EdbRefreshMappingId int       `gorm:"primaryKey;autoIncrement;column:edb_refresh_mapping_id" description:"映射ID"`
+	Source              int       `gorm:"column:source" description:"来源"`
+	SubSource           int       `gorm:"column:sub_source" description:"来源名称"`
+	EdbInfoId           int       `gorm:"column:edb_info_id" description:"指标id，如果是数据源（钢联、有色）的，那么就是数据源里面的id"`
+	EdbRefreshConfigId  int       `gorm:"column:edb_refresh_config_id" description:"刷新配置id"`
+	SysUserId           int       `gorm:"column:sys_user_id" description:"操作人id"`
+	SysUserRealName     string    `gorm:"column:sys_user_real_name" description:"操作人真实姓名"`
+	ModifyTime          time.Time `gorm:"column:modify_time" description:"最晚一次的更新时间"`
+	CreateTime          time.Time `gorm:"column:create_time" description:"添加时间"`
 }
 
 // Add
@@ -33,12 +33,7 @@ func (m *EdbRefreshMapping) Add() (err error) {
 		err = errors.New("该配置已存在")
 		return
 	}
-	o := orm.NewOrm()
-	lastId, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.EdbRefreshMappingId = int(lastId)
+	err = global.DEFAULT_DB.Create(m).Error
 
 	return
 }
@@ -51,8 +46,8 @@ func (m *EdbRefreshMapping) Add() (err error) {
 // @param cols []string
 // @return err error
 func (m *EdbRefreshMapping) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, cols...)
+	err = global.DEFAULT_DB.Model(m).Select(cols).Updates(m).Error
+
 	return
 }
 
@@ -63,30 +58,30 @@ func (m *EdbRefreshMapping) Update(cols []string) (err error) {
 // @datetime 2023-12-14 16:11:10
 // @return err error
 func (m *EdbRefreshMapping) Delete() (err error) {
-	o := orm.NewOrm()
-	_, err = o.Delete(m)
+	err = global.DEFAULT_DB.Delete(m).Error
+
 	return
 }
 
 type EdbInfoListAndRefreshConfig struct {
-	EdbInfoId          int       `orm:"column(edb_info_id);pk"`
-	SourceName         string    `description:"来源名称"`
-	Source             int       `description:"来源id"`
-	SubSource          int       `description:"子数据来源:0:经济数据库,1:日期序列"`
-	SubSourceName      string    `description:"子数据来源名称"`
-	EdbCode            string    `description:"指标编码"`
-	EdbName            string    `description:"指标名称"`
-	Frequency          string    `description:"频率"`
-	Unit               string    `description:"单位"`
-	StartDate          time.Time `description:"起始日期"`
-	EndDate            time.Time `description:"终止日期"`
-	ClassifyId         int       `description:"分类id"`
-	UniqueCode         string    `description:"指标唯一编码"`
-	CalculateFormula   string    `description:"计算公式"`
-	ModifyTime         string    `description:"更新时间"`
-	NoUpdate           int8      `description:"是否停止更新，0：继续更新；1：停止更新"`
-	EdbRefreshConfigId int       `description:"刷新配置id"`
-	DataRefreshNum     int       `description:"刷新的期数"`
+	EdbInfoId          int       `gorm:"primaryKey;autoIncrement;column:edb_info_id"`
+	SourceName         string    `gorm:"column:source_name" description:"来源名称"`
+	Source             int       `gorm:"column:source" description:"来源id"`
+	SubSource          int       `gorm:"column:sub_source" description:"子数据来源:0:经济数据库,1:日期序列"`
+	SubSourceName      string    `gorm:"column:sub_source_name" description:"子数据来源名称"`
+	EdbCode            string    `gorm:"column:edb_code" description:"指标编码"`
+	EdbName            string    `gorm:"column:edb_name" description:"指标名称"`
+	Frequency          string    `gorm:"column:frequency" description:"频率"`
+	Unit               string    `gorm:"column:unit" description:"单位"`
+	StartDate          time.Time `gorm:"column:start_date" description:"起始日期"`
+	EndDate            time.Time `gorm:"column:end_date" description:"终止日期"`
+	ClassifyId         int       `gorm:"column:classify_id" description:"分类id"`
+	UniqueCode         string    `gorm:"column:unique_code" description:"指标唯一编码"`
+	CalculateFormula   string    `gorm:"column:calculate_formula" description:"计算公式"`
+	ModifyTime         string    `gorm:"column:modify_time" description:"更新时间"`
+	NoUpdate           int8      `gorm:"column:no_update" description:"是否停止更新，0：继续更新；1：停止更新"`
+	EdbRefreshConfigId int       `gorm:"column:edb_refresh_config_id" description:"刷新配置id"`
+	DataRefreshNum     int       `gorm:"column:data_refresh_num" description:"刷新的期数"`
 }
 
 // GetConfigRefreshEdbInfoListBySourceAndSubSource
@@ -105,7 +100,6 @@ func GetConfigRefreshEdbInfoListBySourceAndSubSource(sourceList, configIdList []
 
 	var pars []interface{}
 
-	o := orm.NewOrm()
 	sql := `SELECT a.*,b.edb_refresh_config_id FROM edb_info a 
  JOIN edb_refresh_mapping b ON a.edb_info_id = b.edb_info_id
 WHERE b.edb_refresh_config_id IN (` + utils.GetOrmInReplace(num) + `) `
@@ -116,7 +110,7 @@ WHERE b.edb_refresh_config_id IN (` + utils.GetOrmInReplace(num) + `) `
 		sql += ` AND b.source not in (` + utils.GetOrmInReplace(sourceNum) + `) `
 		pars = append(pars, sourceList)
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = global.DEFAULT_DB.Raw(sql, pars...).Scan(&list).Error
 
 	return
 }

models/edb_refresh/edb_refresh_source.go

@@ -1,27 +1,27 @@
 package edb_refresh
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_index_lib/global"
 	"time"
 )
 
 // EdbRefreshSource
 // @Description: 刷新的数据源表
 type EdbRefreshSource struct {
-	Id            int       `orm:"column(id);pk"`
-	Source        int       `orm:"column(source)" description:"来源"`
-	SourceName    string    `description:"来源名称"`
-	SubSource     int       `description:"子数据来源:0:经济数据库,1:日期序列"`
-	SubSourceName string    `description:"子来源名称"`
-	HasChild      int       `description:"是否有子来源，0：否，1：是"`
-	ModifyTime    time.Time `description:"修改时间"`
-	CreateTime    time.Time `description:"创建时间"`
+	Id            int       `gorm:"primaryKey;autoIncrement;column:id" description:"ID"`
+	Source        int       `gorm:"column:source" description:"来源"`
+	SourceName    string    `gorm:"column:source_name" description:"来源名称"`
+	SubSource     int       `gorm:"column:sub_source" description:"子数据来源:0:经济数据库,1:日期序列"`
+	SubSourceName string    `gorm:"column:sub_source_name" description:"子来源名称"`
+	HasChild      int       `gorm:"column:has_child" description:"是否有子来源，0：否，1：是"`
+	ModifyTime    time.Time `gorm:"column:modify_time" description:"修改时间"`
+	CreateTime    time.Time `gorm:"column:create_time" description:"创建时间"`
 }
 
 // EdbRefreshSourceList
 // @Description: 获取刷新的数据源列表
 type EdbRefreshSourceList struct {
-	Source        int                    `orm:"column(source)" description:"来源"`
+	Source        int                    `description:"来源"`
 	SourceName    string                 `description:"来源名称"`
 	SubSource     int                    `description:"子数据来源:0:经济数据库,1:日期序列"`
 	SubSourceName string                 `description:"子来源名称"`
@@ -36,9 +36,9 @@ type EdbRefreshSourceList struct {
 // @return items []*EdbRefreshSource
 // @return err error
 func (m EdbRefreshSource) GetAllList() (items []*EdbRefreshSource, err error) {
-	o := orm.NewOrm()
 	sql := ` SELECT *  FROM edb_refresh_source ORDER BY id ASC `
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql).Find(&items).Error
+
 	return
 }