orm->gorm

models/manual_edb.go

@@ -1,8 +1,8 @@
 package models
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
@@ -22,8 +22,9 @@ type TargetDetailResp struct {
 // @return err error
 func GetTargetByTradeCode(tradeCode string) (item *EdbInfoItem, err error) {
 	sql := `SELECT * FROM edbinfo WHERE TRADE_CODE = ?  `
-	o := orm.NewOrmUsingDB("edb")
-	err = o.Raw(sql, tradeCode).QueryRow(&item)
+	//o := orm.NewOrmUsingDB("edb")
+	//err = o.Raw(sql, tradeCode).QueryRow(&item)
+	err = global.DmSQL["edb"].Raw(sql, tradeCode).First(&item).Error
 	return
 }
 
@@ -36,17 +37,17 @@ func GetTargetByTradeCode(tradeCode string) (item *EdbInfoItem, err error) {
 // @return total int
 // @return err error
 func GetCountManualUserClassify(sysUserId, classifyId int) (total int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT count(1) ct FROM manual_user_classify WHERE admin_id=? AND classify_id = ? `
-	err = o.Raw(sql, sysUserId, classifyId).QueryRow(&total)
-
+	//err = o.Raw(sql, sysUserId, classifyId).QueryRow(&total)
+	err = global.DmSQL["data"].Raw(sql, sysUserId, classifyId).Scan(&total).Error
 	return
 }
 func GetManualClassifyByClassifyId(classifyId int) (item *EdbdataClassify, err error) {
-	o := orm.NewOrmUsingDB("edb")
+	//o := orm.NewOrmUsingDB("edb")
 	sql := ` SELECT classify_id,classify_name,parent_id FROM edbdata_classify WHERE classify_id = ?  `
-	err = o.Raw(sql, classifyId).QueryRow(&item)
-
+	//err = o.Raw(sql, classifyId).QueryRow(&item)
+	err = global.DmSQL["edb"].Raw(sql, classifyId).First(&item).Error
 	return
 }
 
@@ -59,8 +60,9 @@ func GetManualClassifyByClassifyId(classifyId int) (item *EdbdataClassify, err e
 // @return err error
 func GetEdbDataListByCode(tradeCode string) (items []*Edbdata, err error) {
 	sql := ` SELECT  TRADE_CODE,DT,round(CLOSE,4) CLOSE,modify_time  FROM edbdata WHERE TRADE_CODE = ?  GROUP BY TRADE_CODE,DT ORDER BY DT DESC `
-	o := orm.NewOrmUsingDB("edb")
-	_, err = o.Raw(sql, tradeCode).QueryRows(&items)
+	//o := orm.NewOrmUsingDB("edb")
+	//_, err = o.Raw(sql, tradeCode).QueryRows(&items)
+	err = global.DmSQL["edb"].Raw(sql, tradeCode).Find(&items).Error
 	return
 }
 
@@ -103,7 +105,7 @@ type EdbListResp struct {
 // @return items []*Edbinfo
 // @return err error
 func GetEdbInfoList(condition string, pars []interface{}, startSize, pageSize int) (items []*EdbInfoListItem, err error) {
-	o := orm.NewOrmUsingDB("edb")
+	//o := orm.NewOrmUsingDB("edb")
 	sql := `SELECT DISTINCT a.* FROM edbinfo AS a  WHERE a.classify_id > 0 `
 	if condition != "" {
 		sql += condition
@@ -115,8 +117,8 @@ func GetEdbInfoList(condition string, pars []interface{}, startSize, pageSize in
 		pars = append(pars, startSize, pageSize)
 	}
 
-	_, err = o.Raw(sql, pars).QueryRows(&items)
-
+	//_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DmSQL["edb"].Raw(sql, pars).Find(&items).Error
 	return
 }
 
@@ -129,15 +131,15 @@ func GetEdbInfoList(condition string, pars []interface{}, startSize, pageSize in
 // @return total int
 // @return err error
 func GetCountEdbInfoList(condition string, pars []interface{}) (total int, err error) {
-	o := orm.NewOrmUsingDB("edb")
+	//o := orm.NewOrmUsingDB("edb")
 	sql := `SELECT COUNT(1) ct FROM edbinfo AS a  WHERE a.classify_id > 0 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY a.create_date DESC `
 
-	err = o.Raw(sql, pars).QueryRow(&total)
-
+	//err = o.Raw(sql, pars).QueryRow(&total)
+	err = global.DmSQL["edb"].Raw(sql, pars).Scan(&total).Error
 	return
 }
 
@@ -148,8 +150,9 @@ func GetCountEdbInfoList(condition string, pars []interface{}) (total int, err e
 // @param items []*Edbdata
 // @return err error
 func OnlyMultiAddEdbdata(items []*Edbdata) (err error) {
-	o := orm.NewOrmUsingDB("edb")
-	_, err = o.InsertMulti(utils.MultiAddNum, items)
+	//o := orm.NewOrmUsingDB("edb")
+	//_, err = o.InsertMulti(utils.MultiAddNum, items)
+	err = global.DmSQL["edb"].CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
@@ -166,10 +169,10 @@ func DelEdbdataByCodeAndDateList(tradeCode string, dateList []string) (err error
 		return
 	}
 
-	o := orm.NewOrmUsingDB("edb")
+	//o := orm.NewOrmUsingDB("edb")
 	sql := `delete from edbdata  WHERE TRADE_CODE=? AND DT in (` + utils.GetOrmInReplace(num) + `) `
-	_, err = o.Raw(sql, tradeCode, dateList).Exec()
-
+	//_, err = o.Raw(sql, tradeCode, dateList).Exec()
+	err = global.DmSQL["edb"].Exec(sql, tradeCode, dateList).Error
 	return
 }
 
@@ -181,9 +184,10 @@ func DelEdbdataByCodeAndDateList(tradeCode string, dateList []string) (err error
 // @param isJoinEdb int 是否加入指标库
 // @return err error
 func UpdateManualIsJoinEdbStatus(edbCode string, isJoinEdb int8) (err error) {
-	o := orm.NewOrmUsingDB("edb")
+	//o := orm.NewOrmUsingDB("edb")
 	sql := ` UPDATE edbinfo SET is_join_edb = ? WHERE TRADE_CODE =? `
-	_, err = o.Raw(sql, isJoinEdb, edbCode).Exec()
+	//_, err = o.Raw(sql, isJoinEdb, edbCode).Exec()
+	err = global.DmSQL["edb"].Exec(sql, isJoinEdb, edbCode).Error
 	return
 }
 
@@ -211,7 +215,8 @@ func DelManualIndexByCodeList(codeList []string) (err error) {
 	if num <= 0 {
 		return
 	}
-	to, err := orm.NewOrmUsingDB("edb").Begin()
+	//to, err := orm.NewOrmUsingDB("edb").Begin()
+	to := global.DmSQL["edb"].Begin()
 	if err != nil {
 		return
 	}
@@ -224,14 +229,16 @@ func DelManualIndexByCodeList(codeList []string) (err error) {
 	}()
 	// 删除指标
 	sql := `DELETE FROM edbinfo WHERE TRADE_CODE  in (` + utils.GetOrmInReplace(num) + `) `
-	_, err = to.Raw(sql, codeList).Exec()
+	//_, err = to.Raw(sql, codeList).Exec()
+	err = to.Exec(sql, codeList).Error
 	if err != nil {
 
 	}
 
 	// 删除指标数据
 	sql = `DELETE FROM edbdata WHERE TRADE_CODE  in (` + utils.GetOrmInReplace(num) + `) `
-	_, err = to.Raw(sql, codeList).Exec()
+	//	_, err = to.Raw(sql, codeList).Exec()
+	err = to.Exec(sql, codeList).Error
 	if err != nil {
 
 	}
@@ -252,9 +259,9 @@ func GetEdbinfoListBySecNameList(secNameList []string) (items []*Edbinfo, err er
 		return
 	}
 	sql := `SELECT * FROM edbinfo WHERE SEC_NAME in (` + utils.GetOrmInReplace(num) + ` ) AND REMARK='手动' `
-	o := orm.NewOrmUsingDB("edb")
-	_, err = o.Raw(sql, secNameList).QueryRows(&items)
-
+	//o := orm.NewOrmUsingDB("edb")
+	//_, err = o.Raw(sql, secNameList).QueryRows(&items)
+	err = global.DmSQL["edb"].Raw(sql, secNameList).Find(&items).Error
 	return
 }
 
@@ -270,22 +277,22 @@ func GetTargetsDataListByCodeList(tradeCodeList []string) (items []*Edbdata, err
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("edb")
+	//o := orm.NewOrmUsingDB("edb")
 	sql := `SELECT * FROM edbdata WHERE TRADE_CODE in (` + utils.GetOrmInReplace(num) + ` ) ORDER BY DT ASC `
-	_, err = o.Raw(sql, tradeCodeList).QueryRows(&items)
-
+	//_, err = o.Raw(sql, tradeCodeList).QueryRows(&items)
+	err = global.DmSQL["edb"].Raw(sql, tradeCodeList).Find(&items).Error
 	return
 }
 
 // EdbinfoOpRecord
 // @Description: 手工数据的操作日志
 type EdbinfoOpRecord struct {
-	EdbinfoOpRecordId int       `orm:"column(edbinfo_op_record_id);pk"`
-	TradeCode         string    `orm:"column(TRADE_CODE)" description:"指标编码"`
-	Remark            string    `orm:"column(remark)" description:"操作信息"`
-	UserId            int       `orm:"column(user_id)" description:"用户id"`
-	UserName          string    `orm:"column(user_name)" description:"用户姓名"`
-	CreateTime        time.Time `orm:"column(create_time)" description:"创建时间"`
+	EdbinfoOpRecordId int       `gorm:"column:edbinfo_op_record_id;primaryKey;type:int" orm:"column(edbinfo_op_record_id);pk" description:"操作记录ID"`
+	TradeCode         string    `gorm:"column:TRADE_CODE;type:varchar(255)" orm:"column(TRADE_CODE)" description:"指标编码"`
+	Remark            string    `gorm:"column:REMARK;type:varchar(255)" orm:"column(remark)" description:"操作信息"`
+	UserId            int       `gorm:"column:USER_ID;type:int" orm:"column(user_id)" description:"用户id"`
+	UserName          string    `gorm:"column:USER_NAME;type:varchar(255)" orm:"column(user_name)" description:"用户姓名"`
+	CreateTime        time.Time `gorm:"column:CREATE_TIME;type:datetime" orm:"column(create_time)" description:"创建时间"`
 }
 
 // Remark备注：
@@ -301,8 +308,9 @@ type EdbinfoOpRecord struct {
 // @datetime 2024-07-30 16:25:55
 // @return err error
 func (m *EdbinfoOpRecord) Create() (err error) {
-	o := orm.NewOrmUsingDB("edb")
-	_, err = o.Insert(m)
+	//o := orm.NewOrmUsingDB("edb")
+	//_, err = o.Insert(m)
+	err = global.DmSQL["edb"].Create(m).Error
 	return
 }
 
@@ -314,8 +322,9 @@ func (m *EdbinfoOpRecord) Create() (err error) {
 // @param list []*EdbinfoOpRecord
 // @return err error
 func (m *EdbinfoOpRecord) MulCreate(list []*EdbinfoOpRecord) (err error) {
-	o := orm.NewOrmUsingDB("edb")
-	_, err = o.InsertMulti(utils.MultiAddNum, list)
+	//o := orm.NewOrmUsingDB("edb")
+	//_, err = o.InsertMulti(utils.MultiAddNum, list)
+	err = global.DmSQL["edb"].CreateInBatches(list, utils.MultiAddNum).Error
 	return
 }
 
@@ -346,16 +355,17 @@ type EdbinfoOpRecordListResp struct {
 // @return items []*EdbinfoOpRecordItem
 // @return err error
 func GetEdbinfoOpRecordPageList(tradeCode string, startSize, pageSize int) (total int, items []*EdbinfoOpRecordItem, err error) {
-	o := orm.NewOrmUsingDB("edb")
+	//o := orm.NewOrmUsingDB("edb")
 	sql := `SELECT  count(1) FROM edbinfo_op_record AS a  WHERE TRADE_CODE = ? `
-	err = o.Raw(sql, tradeCode).QueryRow(&total)
+	//err = o.Raw(sql, tradeCode).QueryRow(&total)
+	err = global.DmSQL["edb"].Raw(sql, tradeCode).Scan(&total).Error
 	if err != nil {
 		return
 	}
 
 	sql = `SELECT  a.* FROM edbinfo_op_record AS a  WHERE TRADE_CODE = ? ORDER BY a.create_time DESC LIMIT ?,?`
-	_, err = o.Raw(sql, tradeCode, startSize, pageSize).QueryRows(&items)
-
+	//_, err = o.Raw(sql, tradeCode, startSize, pageSize).QueryRows(&items)
+	err = global.DmSQL["edb"].Raw(sql, tradeCode, startSize, pageSize).Find(&items).Error
 	return
 }
 
@@ -368,12 +378,13 @@ func GetEdbinfoOpRecordPageList(tradeCode string, startSize, pageSize int) (tota
 // @return count int
 // @return err error
 func GetManualEdbCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("edb")
+	//o := orm.NewOrmUsingDB("edb")
 	sql := ` SELECT COUNT(1) AS count FROM edbinfo WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).QueryRow(&count)
+	//err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DmSQL["edb"].Raw(sql, pars).Scan(&count).Error
 	return
 }
 
@@ -384,9 +395,9 @@ func GetManualEdbCountByCondition(condition string, pars []interface{}) (count i
 // @param tradeCode string
 // @return err error
 func DelEdbinfoOpRecordByTradeCode(tradeCode string) (err error) {
-	o := orm.NewOrmUsingDB("edb")
+	//o := orm.NewOrmUsingDB("edb")
 	sql := ` DELETE FROM edbinfo_op_record WHERE TRADE_CODE = ? `
-	_, err = o.Raw(sql, tradeCode).Exec()
-
+	//_, err = o.Raw(sql, tradeCode).Exec()
+	err = global.DmSQL["edb"].Exec(sql, tradeCode).Error
 	return
 }

models/meeting_probabilities.go

@@ -1,33 +1,34 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_api/global"
 	"time"
 )
 
 // MeetingProbabilities 加息表格详情表
 type MeetingProbabilities struct {
-	MeetingInfoId int    `orm:"column(meeting_info_id);pk"`
-	DateTime      string // 数据日期
-	Content       string // 表格内容
-	ExcelImage    string // 表格图片
-	IsDelete      int    // 是否删除，0：未删除，1：已删除
-	CreateTime    time.Time
-	ModifyTime    time.Time
+	MeetingInfoId int       `gorm:"column:meeting_info_id;primaryKey;type:int" orm:"column(meeting_info_id);pk" description:"会议信息ID"`
+	DateTime      string    `gorm:"column:DATE_TIME;type:varchar(255)" orm:"column(datetime)" description:"数据日期"`
+	Content       string    `gorm:"column:CONTENT;type:varchar(255)" orm:"column(content)" description:"表格内容"`
+	ExcelImage    string    `gorm:"column:EXCEL_IMAGE;type:varchar(255)" orm:"column(excel_image)" description:"表格图片"`
+	IsDelete      int       `gorm:"column:IS_DELETE;type:int" orm:"column(is_delete)" description:"是否删除，0：未删除，1：已删除"`
+	CreateTime    time.Time `gorm:"column:CREATE_TIME;type:datetime" orm:"column(create_time)" description:"创建时间"`
+	ModifyTime    time.Time `gorm:"column:MODIFY_TIME;type:datetime" orm:"column(modify_time)" description:"修改时间"`
 }
 
 // GetMeetingInfoById 根据id 获取加息概率表格详情
 func GetMeetingInfoById(dateTime string) (item *MeetingProbabilities, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := ``
 	if dateTime == "" {
 		sql = ` SELECT * FROM meeting_probabilities WHERE is_delete=0 ORDER BY create_time DESC LIMIT 1 `
-		err = o.Raw(sql).QueryRow(&item)
+		//err = o.Raw(sql).QueryRow(&item)
+		err = global.DmSQL["data"].Raw(sql).First(&item).Error
 		return
 	} else {
 		sql = ` SELECT * FROM meeting_probabilities WHERE date_time=? AND is_delete=0 `
-		err = o.Raw(sql, dateTime).QueryRow(&item)
+		//err = o.Raw(sql, dateTime).QueryRow(&item)
+		err = global.DmSQL["data"].Raw(sql, dateTime).First(&item).Error
 		return
 	}
 }
-

models/out_link.go

@@ -1,23 +1,22 @@
 package models
 
 import (
+	"eta_gn/eta_api/global"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"strings"
 	"time"
 )
 
 type OutLink struct {
-	Id           int       `orm:"column(id);pk;auto" description:"自增序号"`
-	Title        string    `description:"菜单名称"`
-	Url          string    `description:"链接地址"`
-	SysAdminId   int       `description:"创建人ID"`
-	SysAdminName string    `description:"创建人姓名"`
-	CreateTime   time.Time `description:"创建时间"`
-	ModifyTime   time.Time `description:"修改时间"`
+	Id           int       `gorm:"column:id;primaryKey;autoIncrement;type:int" orm:"column(id);pk;auto" description:"自增序号"`
+	Title        string    `gorm:"column:title;type:varchar(255)" orm:"column(title)" description:"菜单名称"`
+	Url          string    `gorm:"column:url;type:varchar(255)" orm:"column(url)" description:"链接地址"`
+	SysAdminId   int       `gorm:"column:sys_admin_id;type:int" orm:"column(sys_admin_id)" description:"创建人ID"`
+	SysAdminName string    `gorm:"column:sys_admin_name;type:varchar(255)" orm:"column(sys_admin_name)" description:"创建人姓名"`
+	CreateTime   time.Time `gorm:"column:create_time;type:datetime" orm:"column(create_time)" description:"创建时间"`
+	ModifyTime   time.Time `gorm:"column:modify_time;type:datetime" orm:"column(modify_time)" description:"修改时间"`
 }
-
 type OutLinkItem struct {
 	Id         int    `description:"自增序号"`
 	Title      string `description:"菜单名称"`
@@ -47,23 +46,25 @@ func (ol *OutLink) TableName() string {
 }
 
 func (ol *OutLink) Create() (err error) {
-	o := orm.NewOrm()
-	_, err = o.Insert(ol)
-	if err != nil {
-		return
-	}
+	//o := orm.NewOrm()
+	//_, err = o.Insert(ol)
+	//if err != nil {
+	//	return
+	//}
+	err = global.DEFAULT_DmSQL.Create(ol).Error
 	return
 }
 
 func (ol *OutLink) GetItemById(id int) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM out_link WHERE id = ? LIMIT 1`
-	err = o.Raw(sql, id).QueryRow(&ol)
+	//err = o.Raw(sql, id).QueryRow(&ol)
+	err = global.DEFAULT_DmSQL.Raw(sql, id).First(ol).Error
 	return
 }
 
 func (ol *OutLink) GetItemsByCondition(condition string, pars []interface{}, orderRule string) (items []*OutLink, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM out_link WHERE 1=1 `
 	sql += condition
 	order := ` ORDER BY create_time ASC`
@@ -71,32 +72,36 @@ func (ol *OutLink) GetItemsByCondition(condition string, pars []interface{}, ord
 		order = ` ORDER BY ` + orderRule
 	}
 	sql += order
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	//_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
 	return
 }
 
 func (ol *OutLink) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(ol, cols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(ol, cols...)
+	err = global.DEFAULT_DmSQL.Model(ol).Select(cols).Updates(ol).Error
 	return
 }
 
 func (ol *OutLink) Del() (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `DELETE FROM out_link WHERE id = ? LIMIT 1`
-	_, err = o.Raw(sql, ol.Id).Exec()
+	//_, err = o.Raw(sql, ol.Id).Exec()
+	err = global.DEFAULT_DmSQL.Exec(sql, ol.Id).Error
 	return
 }
 
 func (ol *OutLink) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, ol.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	//err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
 	return
 }
 
 func (ol *OutLink) GetPageItemsByCondition(startSize, pageSize int, condition string, pars []interface{}, fieldArr []string, orderRule string) (total int, items []*OutLink, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -107,10 +112,12 @@ func (ol *OutLink) GetPageItemsByCondition(startSize, pageSize int, condition st
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, ol.TableName(), condition, order)
 	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z`
-	if err = o.Raw(totalSql, pars).QueryRow(&total); err != nil {
+	//if err = o.Raw(totalSql, pars).QueryRow(&total); err != nil {
+	if err = global.DEFAULT_DmSQL.Raw(totalSql, pars).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars, startSize, pageSize).Find(&items).Error
 	return
 }

models/target.go

@@ -66,10 +66,10 @@ type DataAddReq struct {
 }
 
 type Edbdata struct {
-	TradeCode  string    `orm:"column(TRADE_CODE);pk" description:"指标编码"`
-	Dt         string    `orm:"column(DT)" description:"日期"`
-	Close      string    `orm:"column(CLOSE)" description:"值"`
-	ModifyTime time.Time `orm:"column(modify_time)" description:"修改时间"`
+	TradeCode  string    `gorm:"column:TRADE_CODE;primaryKey;type:varchar(255)" orm:"column(TRADE_CODE);pk" description:"指标编码"`
+	Dt         string    `gorm:"column:DT;type:varchar(255)" orm:"column(DT)" description:"日期"`
+	Close      string    `gorm:"column:CLOSE;type:varchar(255)" orm:"column(CLOSE)" description:"值"`
+	ModifyTime time.Time `gorm:"column:modify_time;type:timestamp" orm:"column(modify_time)" description:"修改时间"`
 }
 
 func GetDataInfo(tradeCode, creteDate string) (item *Edbdata, err error) {
@@ -140,24 +140,24 @@ func DeleteAllEdbData(tradeCode string) (err error) {
 }
 
 type Edbinfo struct {
-	TradeCode    string  `orm:"column(TRADE_CODE);pk" description:"指标code"`
-	SecName      string  `orm:"column(SEC_NAME);" description:"指标名称"`
-	Unit         string  `orm:"column(UNIT);" description:"单位"`
-	Remark       string  `orm:"column(REMARK);" description:"备注"`
-	Frequency    string  `orm:"column(frequency)" description:"频度"`
-	ClassifyId   int     `orm:"column(classify_id)" description:"分类id"`
-	ClassifyName string  `orm:"-" description:"分类名称"`
-	CreateDate   string  `orm:"column(create_date)" description:"创建时间"`
-	UserId       int     `orm:"column(user_id)" description:"录入用户id"`
-	UserName     string  `orm:"column(user_name)" description:"录入用户名称"`
-	NoticeTime   string  `orm:"column(notice_time)" description:"通知时间"`
-	Mobile       string  `orm:"column(mobile)" description:"录入者手机号"`
-	Sort         int     `orm:"column(sort)" description:"排序"`
-	ModifyTime   string  `description:"最近一次更新时间"`
-	IsJoinEdb    int8    `description:"指标库是否已添加：0-否；1-是"`
-	StartDate    string  `description:"数据开始日期"`
-	EndDate      string  `description:"数据结束日期"`
-	LatestValue  float64 `description:"指标最新值"`
+	TradeCode    string  `gorm:"column:TRADE_CODE;primaryKey;type:varchar(255)" orm:"column(TRADE_CODE);pk" description:"指标code"`
+	SecName      string  `gorm:"column:SEC_NAME;type:varchar(255)" orm:"column(SEC_NAME);" description:"指标名称"`
+	Unit         string  `gorm:"column:UNIT;type:varchar(255)" orm:"column(UNIT);" description:"单位"`
+	Remark       string  `gorm:"column:REMARK;type:varchar(255)" orm:"column(REMARK);" description:"备注"`
+	Frequency    string  `gorm:"column:FREQUENCY;type:varchar(255)" orm:"column(frequency)" description:"频度"`
+	ClassifyId   int     `gorm:"column:CLASSIFY_ID;type:int" orm:"column(classify_id)" description:"分类id"`
+	ClassifyName string  `gorm:"-" orm:"-" description:"分类名称"`
+	CreateDate   string  `gorm:"column:CREATE_DATE;type:varchar(255)" orm:"column(create_date)" description:"创建时间"`
+	UserId       int     `gorm:"column:USER_ID;type:int" orm:"column(user_id)" description:"录入用户id"`
+	UserName     string  `gorm:"column:USER_NAME;type:varchar(255)" orm:"column(user_name)" description:"录入用户名称"`
+	NoticeTime   string  `gorm:"column:NOTICE_TIME;type:varchar(255)" orm:"column(notice_time)" description:"通知时间"`
+	Mobile       string  `gorm:"column:MOBILE;type:varchar(255)" orm:"column(mobile)" description:"录入者手机号"`
+	Sort         int     `gorm:"column:SORT;type:int" orm:"column(sort)" description:"排序"`
+	ModifyTime   string  `gorm:"column:MODIFY_TIME;type:varchar(255)" description:"最近一次更新时间"`
+	IsJoinEdb    int8    `gorm:"column:IS_JOIN_EDB;type:tinyint" description:"指标库是否已添加：0-否；1-是"`
+	StartDate    string  `gorm:"column:START_DATE;type:varchar(255)" description:"数据开始日期"`
+	EndDate      string  `gorm:"column:END_DATE;type:varchar(255)" description:"数据结束日期"`
+	LatestValue  float64 `gorm:"column:LATEST_VALUE;type:decimal(10,2)" description:"指标最新值"`
 }
 
 func DeleteEdbinfoByTraceCodeList(tradeCodeList []string) (err error) {
@@ -384,12 +384,12 @@ type SearchTargetListResp struct {
 }
 
 type EdbdataClassify struct {
-	ClassifyId   int
-	ClassifyName string
-	ParentId     int
-	EdbInfoTotal int
-	TradeCode    string
-	UniqueCode   string
+	ClassifyId   int    `gorm:"column:classify_id;type:int" xorm:"int 'classify_id'"`
+	ClassifyName string `gorm:"column:classify_name;type:varchar(255)" xorm:"varchar(255) 'classify_name'"`
+	ParentId     int    `gorm:"column:parent_id;type:int" xorm:"int 'parent_id'"`
+	EdbInfoTotal int    `gorm:"column:edb_info_total;type:int" xorm:"int 'edb_info_total'"`
+	TradeCode    string `gorm:"column:trade_code;type:varchar(255)" xorm:"varchar(255) 'trade_code'"`
+	UniqueCode   string `gorm:"column:unique_code;type:varchar(255)" xorm:"varchar(255) 'unique_code'"`
 }
 
 func GetEdbdataClassifyByClassifyName(classifyName string) (item *EdbdataClassify, err error) {
@@ -1264,26 +1264,26 @@ func GetLzFrequency(productName string) (items []*int, err error) {
 
 // EdbInfoItem
 type EdbInfoItem struct {
-	TradeCode    string     `orm:"column(TRADE_CODE);pk" description:"指标code"`
-	SecName      string     `orm:"column(SEC_NAME);" description:"指标名称"`
-	Unit         string     `orm:"column(UNIT);" description:"单位"`
-	Remark       string     `orm:"column(REMARK);" description:"备注"`
-	Frequency    string     `description:"频度"`
-	ClassifyId   int        `description:"分类id"`
-	ClassifyName string     `description:"分类名称"`
-	CreateDate   string     `description:"创建时间"`
-	UserId       int        `description:"录入用户id"`
-	UserName     string     `description:"录入用户名称"`
-	NoticeTime   string     `description:"通知时间"`
-	Mobile       string     `description:"录入者手机号"`
-	ModifyDate   string     `description:"待更新日期"`
-	ModifyTime   string     `description:"最近一次更新时间"`
-	Status       string     `description:"状态：未完成/完成"`
-	IsJoinEdb    int8       `description:"指标库是否已添加：0-否；1-是"`
-	StartDate    string     `description:"数据开始日期"`
-	EndDate      string     `description:"数据结束日期"`
-	LatestValue  float64    `description:"指标最新值"`
-	DataList     []*Edbdata `description:"指标数据列表"`
+	TradeCode    string     `gorm:"column:TRADE_CODE;primaryKey;type:varchar(255)" orm:"column(TRADE_CODE);pk" description:"指标code"`
+	SecName      string     `gorm:"column:SEC_NAME;type:varchar(255)" orm:"column(SEC_NAME);" description:"指标名称"`
+	Unit         string     `gorm:"column:UNIT;type:varchar(255)" orm:"column(UNIT);" description:"单位"`
+	Remark       string     `gorm:"column:REMARK;type:varchar(255)" orm:"column(REMARK);" description:"备注"`
+	Frequency    string     `gorm:"column:FREQUENCY;type:varchar(255)" description:"频度"`
+	ClassifyId   int        `gorm:"column:CLASSIFY_ID;type:int" description:"分类id"`
+	ClassifyName string     `gorm:"column:CLASSIFY_NAME;type:varchar(255)" description:"分类名称"`
+	CreateDate   string     `gorm:"column:CREATE_DATE;type:varchar(255)" description:"创建时间"`
+	UserId       int        `gorm:"column:USER_ID;type:int" description:"录入用户id"`
+	UserName     string     `gorm:"column:USER_NAME;type:varchar(255)" description:"录入用户名称"`
+	NoticeTime   string     `gorm:"column:NOTICE_TIME;type:varchar(255)" description:"通知时间"`
+	Mobile       string     `gorm:"column:MOBILE;type:varchar(255)" description:"录入者手机号"`
+	ModifyDate   string     `gorm:"column:MODIFY_DATE;type:varchar(255)" description:"待更新日期"`
+	ModifyTime   string     `gorm:"column:MODIFY_TIME;type:varchar(255)" description:"最近一次更新时间"`
+	Status       string     `gorm:"column:STATUS;type:varchar(255)" description:"状态：未完成/完成"`
+	IsJoinEdb    int8       `gorm:"column:IS_JOIN_EDB;type:tinyint" description:"指标库是否已添加：0-否；1-是"`
+	StartDate    string     `gorm:"column:START_DATE;type:varchar(255)" description:"数据开始日期"`
+	EndDate      string     `gorm:"column:END_DATE;type:varchar(255)" description:"数据结束日期"`
+	LatestValue  float64    `gorm:"column:LATEST_VALUE;type:decimal(10,2)" description:"指标最新值"`
+	DataList     []*Edbdata `gorm:"-" description:"指标数据列表"`
 }
 
 // GetTargetItemList 获取指标列表数据