change gorm

models/base_from_adjust.go

@@ -12,7 +12,7 @@ import (
 
 // EdbDataAdjust 数据调整指标数据结构体
 type EdbDataAdjust struct {
-	EdbDataId     int `orm:"column(edb_data_id);pk"`
+	EdbDataId     int `gorm:"column:edb_data_id;primaryKey"`
 	EdbInfoId     int
 	EdbCode       string
 	DataTime      string
@@ -186,7 +186,7 @@ func SaveAdjustEdb(req SaveAdjustEdbReq) (edbInfo *EdbInfo, err error, errMsg st
 			var edbAdjustConf *EdbAdjustConf
 			sql := ` SELECT * FROM edb_adjust_conf WHERE edb_info_id=? `
 			//err = o.Raw(sql, edbInfo.EdbInfoId).QueryRow(&edbAdjustConf)
-			err = global.DEFAULT_DB.Where(sql, edbInfo.EdbInfoId).First(&edbAdjustConf).Error
+			err = global.DEFAULT_DB.Raw(sql, edbInfo.EdbInfoId).First(&edbAdjustConf).Error
 			if err != nil {
 				errMsg = "获取指标配置失败"
 				return

models/base_from_bloomberg.go

@@ -167,9 +167,10 @@ func ModifyBaseFromBloombergIndexMinMax(indexCode string, item *EdbInfoMaxAndMin
 }
 
 type BloombergData struct {
-	InputValue float64 `orm:"column(value)" description:"值"`
-	DataTime   string  `orm:"column(data_time)" description:"日期"`
+	InputValue float64 `gorm:"column:value" description:"值"`
+	DataTime   string  `gorm:"column:data_time" description:"日期"`
 }
+
 func (m *BloombergData) AfterFind(c *gorm.DB) (err error) {
 	m.DataTime = utils.GormDateStrToDateStr(m.DataTime)
 	return
@@ -183,6 +184,7 @@ func GetBloombergDataByCondition(condition string, pars []interface{}) (item []*
 	}
 	sql := `select * from (` + sql1 + ` having 1 order by modify_time DESC ) tmp GROUP BY data_time ORDER BY data_time DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&item)
+	sql = utils.ReplaceDriverKeywords("", sql)
 	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&item).Error
 	return
 }

models/base_from_clarksons.go

@@ -24,7 +24,7 @@ type BaseFromClarksonsIndex struct {
 }
 
 type BaseFromClarksonsData struct {
-	BaseFromClarksonsDataId  int       `orm:"column(base_from_clarksons_data_id);pk"`
+	BaseFromClarksonsDataId  int       `gorm:"column:base_from_clarksons_data_id;primaryKey"`
 	BaseFromClarksonsIndexId int       `description:"指标id"`
 	IndexCode                string    `description:"指标编码"`
 	DataTime                 string    `description:"数据日期"`

models/base_from_com_trade.go

@@ -32,8 +32,8 @@ func GetComTradeIndex(indexCode string) (item *ComTradeCodeMapping, err error) {
 }
 
 type ComTradeData struct {
-	Value    float64 `orm:"column(value)" description:"值"`
-	DataTime string  `orm:"column(data_time)" description:"日期"`
+	Value    float64 `gorm:"column:value" description:"值"`
+	DataTime string  `gorm:"column:data_time" description:"日期"`
 }
 
 // AfterFind 在该模型上设置钩子函数，把日期转成正确的string，所以查询函数只能用Find函数，First或者Scan是不会触发该函数的来获取数据

models/base_from_eia_steo.go

@@ -13,8 +13,8 @@ import (
 //钢联
 
 type EiaSteoData struct {
-	InputValue float64 `gorm:"column(value)" description:"值"`
-	DataTime   string  `orm:"column(data_time)" description:"日期"`
+	InputValue float64 `gorm:"column:value" description:"值"`
+	DataTime   string  `gorm:"column:data_time" description:"日期"`
 }
 
 // AfterFind 在该模型上设置钩子函数，把日期转成正确的string，所以查询函数只能用Find函数，First或者Scan是不会触发该函数的来获取数据

models/base_from_fenwei.go

@@ -339,7 +339,7 @@ type HandleFenweiExcelDataReq struct {
 }
 
 type FenWeiNetIndexInfo struct {
-	FenweiIndexId int64  `orm:"column(fenwei_index_id);pk"`
+	FenweiIndexId int64  `gorm:"column:fenwei_index_id;primaryKey"`
 	IndexName     string `description:"指标名称"`
 	//IndexCode    string  `description:"指标编码"`
 	Unit         string      `description:"单位"`

models/base_from_gpr_risk.go

@@ -17,7 +17,7 @@ type BaseFromGprRisk struct{}
 
 type BaseFromGprRiskData struct {
 	//BaseFromGprRiskDataId  int `orm:"column(base_from_gpr_risk_data_id);pk"`
-	BaseFromGprRiskDataId  int `orm:"column(base_from_gpr_risk_data_id);primaryKey"`
+	BaseFromGprRiskDataId  int `gorm:"column:base_from_gpr_risk_data_id;primaryKey"`
 	BaseFromGprRiskIndexId int
 	IndexCode              string
 	DataTime               string

models/base_from_ly_index_record.go

@@ -10,12 +10,12 @@ import (
 type BaseFromLyIndexRecord struct {
 	BaseFromLyIndexRecordId int `gorm:"column:base_from_ly_index_record_id;primaryKey"` // 指标记录ID
 	//BaseFromLyIndexRecordId int    `orm:"column(base_from_ly_index_record_id);pk"` // 指标记录ID
-	CreateTime string `orm:"column(create_time)"` // 创建时间
-	ModifyTime string `orm:"column(modify_time)"` // 修改时间
-	Product    string `orm:"column(product)"`     // 产品
-	Category   string `orm:"column(category)"`    // 分类
-	Url        string `orm:"column(url)"`         // 指标页面地址
-	DataTime   string `orm:"column(data_time)"`   // 数据日期
+	CreateTime string `gorm:"column:create_time"` // 创建时间
+	ModifyTime string `gorm:"column:modify_time"` // 修改时间
+	Product    string `gorm:"column:product"`     // 产品
+	Category   string `gorm:"column:category"`    // 分类
+	Url        string `gorm:"column:url"`         // 指标页面地址
+	DataTime   string `gorm:"column:data_time"`   // 数据日期
 }
 
 // AddLyIndexRecord 添加指标记录

models/base_from_lz.go

@@ -13,8 +13,8 @@ import (
 //隆众
 
 type lzSurveyData struct {
-	DataTime   string `orm:"column(data_time)" description:"日期"`
-	InputValue string `orm:"column(input_value)" description:"值"`
+	DataTime   string `gorm:"column:data_time" description:"日期"`
+	InputValue string `gorm:"column:input_value" description:"值"`
 }
 
 // AfterFind 在该模型上设置钩子函数，把日期转成正确的string，所以查询函数只能用Find函数，First或者Scan是不会触发该函数的来获取数据

models/base_from_manual.go

@@ -19,8 +19,8 @@ type ManualEdbdata struct {
 	TradeCode string `gorm:"column:TRADE_CODE;autoIncrement:false;primaryKey" description:"指标编码"`
 	//TradeCode  string    `orm:"column(TRADE_CODE);pk" description:"指标编码"`
 	Dt         string    `gorm:"column:DT" description:"日期"`
-	Close      string    `orm:"column:CLOSE" description:"值"`
-	ModifyTime time.Time `orm:"column:modify_time" description:"修改时间"`
+	Close      string    `gorm:"column:CLOSE" description:"值"`
+	ModifyTime time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
 
 // AfterFind 在该模型上设置钩子函数，把日期转成正确的string，所以查询函数只能用Find函数，First或者Scan是不会触发该函数的来获取数据

models/base_from_mysteel.go

@@ -13,8 +13,8 @@ import (
 //钢联
 
 type GlData struct {
-	InputValue float64 `orm:"column(DATA_VALUE)" description:"日期"`
-	DataTime   string  `orm:"column(DATA_DATE)" description:"值"`
+	InputValue float64 `gorm:"column:DATA_VALUE" description:"日期"`
+	DataTime   string  `gorm:"column:DATA_DATE" description:"值"`
 }
 
 // AfterFind 在该模型上设置钩子函数，把日期转成正确的string，所以查询函数只能用Find函数，First或者Scan是不会触发该函数的来获取数据

models/base_from_mysteel_chemical.go

@@ -14,8 +14,8 @@ import (
 //钢联
 
 type MysteelChemicalData struct {
-	InputValue float64 `orm:"column(value)" description:"值"`
-	DataTime   string  `orm:"column(data_time)" description:"日期"`
+	InputValue float64 `gorm:"column:value" description:"值"`
+	DataTime   string  `gorm:"column:data_time" description:"日期"`
 }
 
 // AfterFind 在该模型上设置钩子函数，把日期转成正确的string，所以查询函数只能用Find函数，First或者Scan是不会触发该函数的来获取数据

models/base_from_rzd_classify.go

@@ -9,12 +9,12 @@ import (
 type BaseFromRzdClassify struct {
 	BaseFromRzdClassifyId int `gorm:"column:base_from_rzd_classify_id;primaryKey"`
 	//BaseFromRzdClassifyId int    `orm:"column(base_from_rzd_classify_id);pk"`
-	CreateTime     string `orm:"column(create_time)"`
-	ModifyTime     string `orm:"column(modify_time)"`
-	ClassifyName   string `orm:"column(classify_name)"`
-	ParentId       int    `orm:"column(parent_id)"`
-	Sort           int    `orm:"column(sort)"`
-	ClassifyNameEn string `orm:"column(classify_name_en)"`
+	CreateTime     string `gorm:"column:create_time"`
+	ModifyTime     string `gorm:"column:modify_time"`
+	ClassifyName   string `gorm:"column:classify_name"`
+	ParentId       int    `gorm:"column:parent_id"`
+	Sort           int    `gorm:"column:sort"`
+	ClassifyNameEn string `gorm:"column:classify_name_en"`
 }
 
 // GetRzdClassifyByName 根据分类名称查询

models/base_from_rzd_data.go

@@ -10,12 +10,12 @@ import (
 type BaseFromRzdData struct {
 	BaseFromRzdDataId int `gorm:"column:base_from_rzd_data_id;primaryKey"`
 	//BaseFromRzdDataId  int     `orm:"column(base_from_rzd_data_id);pk"`
-	BaseFromRzdIndexId int     `orm:"column(base_from_rzd_index_id)"`
-	CreateTime         string  `orm:"column(create_time)"`
-	DataTime           string  `orm:"column(data_time)"`
-	IndexCode          string  `orm:"column(index_code)"`
-	ModifyTime         string  `orm:"column(modify_time)"`
-	Value              float64 `orm:"column(value)"`
+	BaseFromRzdIndexId int     `gorm:"column:base_from_rzd_index_id"`
+	CreateTime         string  `gorm:"column:create_time"`
+	DataTime           string  `gorm:"column:data_time"`
+	IndexCode          string  `gorm:"column:index_code"`
+	ModifyTime         string  `gorm:"column:modify_time"`
+	Value              float64 `gorm:"column:value"`
 }
 
 // AfterFind 在该模型上设置钩子函数，把日期转成正确的string，所以查询函数只能用Find函数，First或者Scan是不会触发该函数的来获取数据

models/base_from_sci_hq.go

@@ -194,7 +194,7 @@ type HandleSciHqExcelDataReq struct {
 }
 
 type BaseFromSciHqIndex struct {
-	BaseFromSciHqIndexId int       `orm:"column(base_from_sci_hq_index_id);pk"` //序号
+	BaseFromSciHqIndexId int       `gorm:"column:base_from_sci_hq_index_id;primaryKey"` //序号
 	IndexCode            string    `description:"指标编码"`
 	IndexName            string    `description:"指标名称"`
 	ClassifyId           int       `description:"分类id"`
@@ -232,8 +232,8 @@ func BatchAddBaseFromSciHqIndex(list []*BaseFromSciHqIndex) (err error) {
 }
 
 type BaseFromSciHqData struct {
-	SciHqDataId          int       `orm:"column(sci_hq_data_id);pk"`         //序号
-	BaseFromSciHqIndexId int       `orm:"column(base_from_sci_hq_index_id)"` //指标id
+	SciHqDataId          int       `gorm:"column:sci_hq_data_id;primaryKey"` //序号
+	BaseFromSciHqIndexId int       `gorm:"column:base_from_sci_hq_index_id"` //指标id
 	IndexCode            string    `description:"指标编码"`
 	DataTime             string    `description:"数据时间"`
 	Value                string    `description:"数据值"`

models/base_from_sh.go

@@ -316,7 +316,7 @@ type SHMessage struct {
 }
 
 type BaseFromTradeShanghaiIndex struct {
-	BaseFromTradeShangHaiIndexId int `orm:"column(base_from_trade_shanghai_index_id);pk"`
+	BaseFromTradeShangHaiIndexId int `gorm:"column:base_from_trade_shanghai_index_id;primaryKey"`
 	Rank                         int
 	DealShortName                string
 	DealName                     string

models/base_from_smm.go

@@ -261,9 +261,9 @@ type BaseFromSmmIndex struct {
 	Name           string
 	IndexCode      string
 	IndexName      string
-	Type1          string `orm:"column(type_1)"`
-	Type2          string `orm:"column(type_2)"`
-	Type3          string `orm:"column(type_3)"`
+	Type1          string `gorm:"column:type_1"`
+	Type2          string `gorm:"column:type_2"`
+	Type3          string `gorm:"column:type_3"`
 	Frequency      string
 	Unit           string
 	ApiStartTime   string
@@ -719,7 +719,7 @@ func RefreshEdbDataFromSmmToEdb(edbInfoId int, edbCode, startDate string, smmDat
 }
 
 type BaseFromSmmRecord struct {
-	BaseFromSmmRecordId int64 `orm:"column(base_from_smm_record_id);pk"`
+	BaseFromSmmRecordId int64 `gorm:"column:base_from_smm_record_id;primaryKey"`
 	BaseFromSmmIndexId  int64
 	OldIndexName        string    `description:"原始名称"`
 	NewIndexName        string    `description:"新的名称"`

models/base_from_stock_plant.go

@@ -15,9 +15,9 @@ import (
 type StockPlantEdbdata struct {
 	VarietyEdbId string `gorm:"column:variety_edb_id;primaryKey" description:"指标编码"`
 	//VarietyEdbId string    `orm:"column(variety_edb_id);pk" description:"指标编码"`
-	DataTime   string    `orm:"column(data_time)" description:"日期"`
-	Value      string    `orm:"column(value)" description:"值"`
-	ModifyTime time.Time `orm:"column(modify_time)" description:"修改时间"`
+	DataTime   string    `gorm:"column:data_time" description:"日期"`
+	Value      string    `gorm:"column:value" description:"值"`
+	ModifyTime time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
 
 // AfterFind 在该模型上设置钩子函数，把日期转成正确的string，所以查询函数只能用Find函数，First或者Scan是不会触发该函数的来获取数据

models/business_conf.go

@@ -68,7 +68,7 @@ var FromSceneMap = map[int]string{
 
 // BusinessConf 商户配置表
 type BusinessConf struct {
-	Id         int    `orm:"column(id);pk"`
+	Id         int    `gorm:"column:id;primaryKey"`
 	ConfKey    string `description:"配置Key"`
 	ConfVal    string `description:"配置值"`
 	ValType    int    `description:"1-字符串；2-数值；3-字符串数组；4-富文本；"`

models/calculate_residual_analysis_config.go

@@ -8,11 +8,11 @@ import (
 )
 
 type CalculateResidualAnalysisConfig struct {
-	CalculateResidualAnalysisConfigId int       `orm:"column(calculate_residual_analysis_config_id);pk;auto" description:"自增id"`
-	Config                            string    `orm:"column(config)" description:"计算参数配置"`
-	SysUserId                         int       `orm:"column(sys_user_id)" description:"操作人id"`
-	CreateTime                        time.Time `orm:"column(create_time)" description:"创建时间"`
-	ModifyTime                        time.Time `orm:"column(modify_time)" description:"修改时间"`
+	CalculateResidualAnalysisConfigId int       `gorm:"column:calculate_residual_analysis_config_id;primaryKey" description:"自增id"`
+	Config                            string    `gorm:"column:config" description:"计算参数配置"`
+	SysUserId                         int       `gorm:"column:sys_user_id" description:"操作人id"`
+	CreateTime                        time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime                        time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
 
 type ResidualAnalysisConfig struct {

models/calculate_residual_analysis_config_mapping.go

@@ -7,13 +7,13 @@ import (
 )
 
 type CalculateResidualAnalysisConfigMapping struct {
-	CalculateResidualAnalysisConfigMappingId int       `orm:"column(calculate_residual_analysis_config_mapping_id);pk;auto" description:"自增id"`
-	CalculateResidualAnalysisConfigId        int       `orm:"column(calculate_residual_analysis_config_id)" description:"残差分析配置id"`
-	EdbInfoId                                int64     `orm:"column(edb_info_id)" description:"指标id"`
-	ResidualType                             int       `orm:"column(residual_type)" description:"残差类型: 1-映射残差 2-拟合残差"`
-	IndexType                                int       `orm:"column(index_type)" description:"指标类型：1-映射指标 2-残差指标 3-因变量指标 4-自变量指标"`
-	CreateTime                               time.Time `orm:"column(create_time)" description:"创建时间"`
-	ModifyTime                               time.Time `orm:"column(modify_time)" description:"修改时间"`
+	CalculateResidualAnalysisConfigMappingId int       `gorm:"column:calculate_residual_analysis_config_mapping_id;primaryKey" description:"自增id"`
+	CalculateResidualAnalysisConfigId        int       `gorm:"column:calculate_residual_analysis_config_id" description:"残差分析配置id"`
+	EdbInfoId                                int64     `gorm:"column:edb_info_id" description:"指标id"`
+	ResidualType                             int       `gorm:"column:residual_type" description:"残差类型: 1-映射残差 2-拟合残差"`
+	IndexType                                int       `gorm:"column:index_type)" description:"指标类型：1-映射指标 2-残差指标 3-因变量指标 4-自变量指标"`
+	CreateTime                               time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime                               time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
 
 // GetConfigMappingListByConditionNotBase 查询非基础指标的配置映射

models/edb_adjust_conf.go

@@ -6,7 +6,7 @@ import (
 
 // EdbAdjustConf 计算指标于基础指标，关系表
 type EdbAdjustConf struct {
-	EdbInfoId     int       `orm:"column(edb_info_id);pk" description:"计算指标id"`
+	EdbInfoId     int       `gorm:"column:edb_info_id;primaryKey" description:"计算指标id"`
 	SourceEndDate time.Time `description:"来源指标的实际数据日期"`
 	ModifyTime    time.Time `description:"修改时间"`
 	CreateTime    time.Time `description:"创建时间"`

models/excel/excel_info.go

@@ -7,7 +7,7 @@ import (
 
 // ExcelInfo excel表格详情表
 type ExcelInfo struct {
-	ExcelInfoId        int       `orm:"column(excel_info_id);pk"`
+	ExcelInfoId        int       `gorm:"column:excel_info_id;primaryKey"`
 	Source             int       `description:"表格来源，1：excel插件的表格，2：自定义表格，3：混合表格，4：自定义分析，默认：1"`
 	ExcelType          int       `description:"表格类型，1：指标列，2：日期列，默认：1"`
 	ExcelName          string    `description:"表格名称"`

models/future_good/future_good_edb_data.go

@@ -31,7 +31,7 @@ type FutureGoodEdbData struct {
 
 // FutureGoodEdbDataItem 期货指标数据的表
 type FutureGoodEdbDataItem struct {
-	FutureGoodEdbDataId int     `orm:"column(future_good_edb_data_id);pk"`
+	FutureGoodEdbDataId int     `gorm:"column:future_good_edb_data_id;primaryKey"`
 	FutureGoodEdbInfoId int     `description:"期货指标id"`
 	FutureGoodEdbCode   string  `description:"期货指标code"`
 	DataTime            string  `description:"数据日期"`

models/predict_edb_conf.go

@@ -50,7 +50,7 @@ type EditPredictEdbInfoReq struct {
 
 type PredictEdbConf struct {
 	ConfigId         int       `gorm:"primaryKey;autoIncrement;column:config_id" description:"规则id"`
-	PredictEdbInfoId int       `orm:"column(predict_edb_info_id)" description:"预测指标id"`
+	PredictEdbInfoId int       `gorm:"column:predict_edb_info_id" description:"预测指标id"`
 	SourceEdbInfoId  int       `description:"来源指标id"`
 	RuleType         int       `description:"预测规则，1：最新，2：固定值，3：同比，4：同差，5：环比，6：环差，7：N期移动均值，8：N期段线性外推值"`
 	FixedValue       float64   `description:"固定值"`
@@ -65,8 +65,8 @@ type PredictEdbConf struct {
 
 // PredictEdbConfAndData 预测规则和其对应的动态数据
 type PredictEdbConfAndData struct {
-	ConfigId         int                  `orm:"column(config_id);pk" description:"规则id"`
-	PredictEdbInfoId int                  `orm:"column(predict_edb_info_id)" description:"预测指标id"`
+	ConfigId         int                  `gorm:"column:config_id;primaryKey" description:"规则id"`
+	PredictEdbInfoId int                  `gorm:"column:predict_edb_info_id" description:"预测指标id"`
 	SourceEdbInfoId  int                  `description:"来源指标id"`
 	RuleType         int                  `description:"预测规则，1：最新，2：固定值，3：同比，4：同差，5：环比，6：环差，7：N期移动均值，8：N期段线性外推值，9：动态环差"`
 	FixedValue       float64              `description:"固定值"`

models/trade_analysis/trade_analysis.go

@@ -332,7 +332,7 @@ type ContractCompanyTradeDataList struct {
 }
 
 type BaseFromTradeGuangzhouIndex struct {
-	BaseFromTradeGuangzhouIndexId    int       `orm:"column(base_from_trade_guangzhou_index_id);pk"`
+	BaseFromTradeGuangzhouIndexId    int       `gorm:"column:base_from_trade_guangzhou_index_id;primaryKey"`
 	BaseFromTradeGuangzhouClassifyId int       `description:"分类id"`
 	IndexCode                        string    `description:"指标编码"`
 	IndexName                        string    `description:"指标名称"`
@@ -369,7 +369,7 @@ func GetBaseFromTradeGuangzhouIndex(classifyIds []int, contracts []string, index
 }
 
 type BaseFromTradeGuangzhouData struct {
-	BaseFromTradeGuangzhouDataId  int       `orm:"column(base_from_trade_guangzhou_data_id);pk"`
+	BaseFromTradeGuangzhouDataId  int       `gorm:"column:base_from_trade_guangzhou_data_id;primaryKey"`
 	BaseFromTradeGuangzhouIndexId int       `description:"指标id"`
 	IndexCode                     string    `description:"指标编码"`
 	DataTime                      time.Time `description:"数据日期"`

models/trade_analysis/trade_classify.go

@@ -9,7 +9,7 @@ import (
 
 // BaseFromTradeClassify 交易所分类表
 type BaseFromTradeClassify struct {
-	Id           uint64    `orm:"column(id);pk"`
+	Id           uint64    `gorm:"column:id;primaryKey"`
 	ClassifyName string    //分类名称
 	ClassifyType string    //分类名称下的类型
 	Exchange     string    //交易所