xyxie 7 ماه پیش
والد
کامیت
cec5588528
35فایلهای تغییر یافته به همراه571 افزوده شده و 553 حذف شده
  1. 6 6
      models/ccf_stock_excel.go
  2. 28 28
      models/chart.go
  3. 16 16
      models/chart_edb_mapping.go
  4. 38 38
      models/data_stat/edb_info_delete_log.go
  5. 30 30
      models/data_stat/edb_info_update_log.go
  6. 31 31
      models/data_stat/edb_info_update_stat.go
  7. 15 15
      models/data_stat/edb_source_stat.go
  8. 3 3
      models/edb_adjust_conf.go
  9. 12 12
      models/edb_classify.go
  10. 18 18
      models/edb_data_base.go
  11. 9 9
      models/edb_data_calculate_ljztbpj.go
  12. 10 10
      models/edb_data_calculate_nhcc.go
  13. 9 9
      models/edb_data_calculate_zjpj.go
  14. 7 7
      models/edb_data_ly.go
  15. 7 7
      models/edb_data_ths_hf.go
  16. 7 7
      models/edb_data_trade_analysis.go
  17. 97 79
      models/edb_info.go
  18. 54 54
      models/edb_info_calculate_mapping.go
  19. 12 12
      models/edb_info_record.go
  20. 15 15
      models/edb_info_relation.go
  21. 6 6
      models/edb_python_code.go
  22. 7 7
      models/edb_refresh/edb_refresh_config.go
  23. 11 11
      models/edb_refresh/edb_refresh_default_config.go
  24. 26 26
      models/edb_refresh/edb_refresh_mapping.go
  25. 9 9
      models/edb_refresh/edb_refresh_source.go
  26. 10 10
      models/edb_terminal.go
  27. 12 12
      models/excel/excel_classify.go
  28. 5 5
      models/excel/excel_edb_mapping.go
  29. 14 14
      models/excel/excel_info.go
  30. 6 6
      models/factor_edb_series.go
  31. 9 9
      models/factor_edb_series_calculate_data.go
  32. 9 9
      models/factor_edb_series_calculate_data_qjjs.go
  33. 6 6
      models/factor_edb_series_calculate_func.go
  34. 11 11
      models/factor_edb_series_chart_mapping.go
  35. 6 6
      models/factor_edb_series_mapping.go

+ 6 - 6
models/ccf_stock_excel.go

@@ -11,12 +11,12 @@ import (
 // CCFStockExcel CCF化纤装置表格
 type CCFStockExcel struct {
 	CcfStockExcelId int       `gorm:"primaryKey;autoIncrement;column:ccf_stock_excel_id"`
-	ClassifyId      int       `description:"分类ID"`
-	ExcelDate       time.Time `description:"表格日期"`
-	ExcelContent    string    `description:"表格HTML"`
-	FromPage        string    `description:"表格来源"`
-	CreateTime      time.Time `description:"创建时间"`
-	ModifyTime      time.Time `description:"修改时间"`
+	ClassifyId      int       `gorm:"column:classify_id" description:"分类ID"`
+	ExcelDate       time.Time `gorm:"column:excel_date" description:"表格日期"`
+	ExcelContent    string    `gorm:"column:excel_content" description:"表格HTML"`
+	FromPage        string    `gorm:"column:from_page" description:"表格来源"`
+	CreateTime      time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime      time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
 
 func (m *CCFStockExcel) TableName() string {

+ 28 - 28
models/chart.go

@@ -41,34 +41,34 @@ func GetChartInfoDataKey(chartInfoId int) string {
 }
 
 type ChartInfo struct {
-	ChartInfoId     int    `gorm:"primaryKey;autoIncrement;column:chart_info_id"`
-	ChartName       string `description:"来源名称"`
-	ChartNameEn     string `description:"英文图表名称"`
-	ChartClassifyId int    `description:"图表分类id"`
-	SysUserId       int
-	SysUserRealName string
-	UniqueCode      string `description:"图表唯一编码"`
-	CreateTime      time.Time
-	ModifyTime      time.Time
-	DateType        int    `description:"日期类型:1:00年至今,2:10年至今,3:15年至今,4:年初至今,5:自定义时间"`
-	StartDate       string `description:"自定义开始日期"`
-	EndDate         string `description:"自定义结束日期"`
-	IsSetName       int    `description:"设置名称"`
-	EdbInfoIds      string `description:"指标id"`
-	ChartType       int    `description:"生成样式:1:曲线图,2:季节性图,3:面积图,4:柱状图,5:散点图,6:组合图,7:柱方图,8:商品价格曲线图,9:相关性图"`
-	Calendar        string `description:"公历/农历"`
-	SeasonStartDate string `description:"季节性图开始日期"`
-	SeasonEndDate   string `description:"季节性图开始日期"`
-	ChartImage      string `description:"图表图片"`
-	Sort            int    `description:"排序字段,数字越小越排前面"`
-	LeftMin         string `description:"图表左侧最小值"`
-	LeftMax         string `description:"图表左侧最大值"`
-	RightMin        string `description:"图表右侧最小值"`
-	RightMax        string `description:"图表右侧最大值"`
-	Disabled        int    `description:"是否禁用,0:启用,1:禁用,默认:0"`
-	BarConfig       string `description:"柱方图的配置,json数据"`
-	Source          int    `description:"1:ETA图库;2:商品价格曲线"`
-	ExtraConfig     string `description:"图表额外配置,json数据"`
+	ChartInfoId     int       `gorm:"primaryKey;autoIncrement;column:chart_info_id"`
+	ChartName       string    `gorm:"column:chart_name" description:"来源名称"`
+	ChartNameEn     string    `gorm:"column:chart_name_en" description:"英文图表名称"`
+	ChartClassifyId int       `gorm:"column:chart_classify_id" description:"图表分类id"`
+	SysUserId       int       `gorm:"column:sys_user_id"`
+	SysUserRealName string    `gorm:"column:sys_user_real_name"`
+	UniqueCode      string    `gorm:"column:unique_code" description:"图表唯一编码"`
+	CreateTime      time.Time `gorm:"column:create_time"`
+	ModifyTime      time.Time `gorm:"column:modify_time"`
+	DateType        int       `gorm:"column:date_type" description:"日期类型:1:00年至今,2:10年至今,3:15年至今,4:年初至今,5:自定义时间"`
+	StartDate       string    `gorm:"column:start_date" description:"自定义开始日期"`
+	EndDate         string    `gorm:"column:end_date" description:"自定义结束日期"`
+	IsSetName       int       `gorm:"column:is_set_name" description:"设置名称"`
+	EdbInfoIds      string    `gorm:"column:edb_info_ids" description:"指标id"`
+	ChartType       int       `gorm:"column:chart_type" description:"生成样式:1:曲线图,2:季节性图,3:面积图,4:柱状图,5:散点图,6:组合图,7:柱方图,8:商品价格曲线图,9:相关性图"`
+	Calendar        string    `gorm:"column:calendar" description:"公历/农历"`
+	SeasonStartDate string    `gorm:"column:season_start_date" description:"季节性图开始日期"`
+	SeasonEndDate   string    `gorm:"column:season_end_date" description:"季节性图开始日期(注意:这里可能是个错误,应该是结束日期)"`
+	ChartImage      string    `gorm:"column:chart_image" description:"图表图片"`
+	Sort            int       `gorm:"column:sort" description:"排序字段,数字越小越排前面"`
+	LeftMin         string    `gorm:"column:left_min" description:"图表左侧最小值"`
+	LeftMax         string    `gorm:"column:left_max" description:"图表左侧最大值"`
+	RightMin        string    `gorm:"column:right_min" description:"图表右侧最小值"`
+	RightMax        string    `gorm:"column:right_max" description:"图表右侧最大值"`
+	Disabled        int       `gorm:"column:disabled" description:"是否禁用,0:启用,1:禁用,默认:0"`
+	BarConfig       string    `gorm:"column:bar_config" description:"柱方图的配置,json数据"`
+	Source          int       `gorm:"column:source" description:"1:ETA图库;2:商品价格曲线"`
+	ExtraConfig     string    `gorm:"column:extra_config" description:"图表额外配置,json数据"`
 }
 
 // GetChartInfoById 通过id获取图表信息

+ 16 - 16
models/chart_edb_mapping.go

@@ -7,22 +7,22 @@ import (
 
 type ChartEdbMapping struct {
 	ChartEdbMappingId int       `gorm:"primaryKey;autoIncrement;column:chart_edb_mapping_id"`
-	ChartInfoId       int       `description:"图表id"`
-	EdbInfoId         int       `description:"指标id"`
-	CreateTime        time.Time `description:"创建时间"`
-	ModifyTime        time.Time `description:"修改时间"`
-	UniqueCode        string    `description:"唯一编码"`
-	MaxData           float64   `description:"上限"`
-	MinData           float64   `description:"下限"`
-	IsOrder           bool      `description:"true:正序,false:逆序"`
-	IsAxis            int       `description:"true:左轴,false:右轴"`
-	EdbInfoType       int       `description:"true:标准指标,false:领先指标"`
-	LeadValue         int       `description:"领先值"`
-	LeadUnit          string    `description:"领先单位"`
-	ChartStyle        string    `description:"图表类型"`
-	ChartColor        string    `description:"颜色"`
-	ChartWidth        float64   `description:"线条大小"`
-	Source            int       `description:"1:ETA图库;2:商品价格曲线"`
+	ChartInfoId       int       `gorm:"column:chart_info_id" description:"图表id"`
+	EdbInfoId         int       `gorm:"column:edb_info_id" description:"指标id"`
+	CreateTime        time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime        time.Time `gorm:"column:modify_time" description:"修改时间"`
+	UniqueCode        string    `gorm:"column:unique_code" description:"唯一编码"`
+	MaxData           float64   `gorm:"column:max_data" description:"上限"`
+	MinData           float64   `gorm:"column:min_data" description:"下限"`
+	IsOrder           bool      `gorm:"column:is_order" description:"true:正序,false:逆序"`
+	IsAxis            int       `gorm:"column:is_axis" description:"true:左轴,false:右轴"`
+	EdbInfoType       int       `gorm:"column:edb_info_type" description:"true:标准指标,false:领先指标"`
+	LeadValue         int       `gorm:"column:lead_value" description:"领先值"`
+	LeadUnit          string    `gorm:"column:lead_unit" description:"领先单位"`
+	ChartStyle        string    `gorm:"column:chart_style" description:"图表类型"`
+	ChartColor        string    `gorm:"column:chart_color" description:"颜色"`
+	ChartWidth        float64   `gorm:"column:chart_width" description:"线条大小"`
+	Source            int       `gorm:"column:source" description:"1:ETA图库;2:商品价格曲线"`
 }
 
 // GetChartEdbMappingListByEdbInfoId 根据指标id获取关联图表列表

+ 38 - 38
models/data_stat/edb_info_delete_log.go

@@ -6,44 +6,44 @@ import (
 
 // EdbInfoDeleteLog 指标删除日志表
 type EdbInfoDeleteLog struct {
-	Id                 uint64  `gorm:"primaryKey;autoIncrement;column:id"`
-	EdbInfoId          int     `description:"指标ID"`
-	EdbInfoType        int     `description:"指标类型,0:普通指标,1:预测指标"`
-	SourceName         string  `description:"来源名称"`
-	Source             int     `description:"来源id"`
-	EdbCode            string  `description:"指标编码"`
-	EdbName            string  `description:"指标名称"`
-	EdbNameEn          string  `description:"英文指标名称"`
-	EdbNameSource      string  `description:"指标名称来源"`
-	Frequency          string  `description:"频率"`
-	Unit               string  `description:"单位"`
-	UnitEn             string  `description:"英文单位"`
-	StartDate          string  `description:"起始日期"`
-	EndDate            string  `description:"终止日期"`
-	SysUserId          int     `description:"创建人ID"`
-	SysUserRealName    string  `description:"创建人姓名"`
-	UniqueCode         string  `description:"指标唯一编码"`
-	EdbCreateTime      string  `description:"指标创建时间"`
-	EdbModifyTime      string  `description:"指标修改时间"`
-	CreateTime         string  `description:"创建时间即删除时间"`
-	MinValue           float64 `description:"指标最小值"`
-	MaxValue           float64 `description:"指标最大值"`
-	CalculateFormula   string  `description:"计算公式"`
-	EdbType            int     `description:"指标类型:1:基础指标,2:计算指标"`
-	LatestDate         string  `description:"数据最新日期"`
-	LatestValue        float64 `description:"数据最新值"`
-	MoveType           int     `description:"移动方式:1:领先(默认),2:滞后"`
-	MoveFrequency      string  `description:"移动频度"`
-	NoUpdate           int8    `description:"是否停止更新,0:继续更新;1:停止更新"`
-	ChartImage         string  `description:"图表图片"`
-	Calendar           string  `description:"公历/农历" orm:"default(公历);"`
-	DataDateType       string  `orm:"column(data_date_type);size(255);null;default(交易日)"`
-	ManualSave         int     `description:"是否有手动保存过上下限: 0-否; 1-是"`
-	TerminalCode       string  `description:"终端编码,用于配置在机器上"`
-	DelSysUserId       int     `description:"删除人ID"`
-	DelSysUserRealName string  `description:"删除人姓名"`
-	DataUpdateTime     string  `description:"最近一次数据发生变化的时间"`
-	ErDataUpdateDate   string  `description:"本次更新,数据发生变化的最早日期"`
+	Id                 uint64  `gorm:"primaryKey;autoIncrement;column:id"             description:"记录ID"`
+	EdbInfoId          int     `gorm:"column:edb_info_id"                           description:"指标ID"`
+	EdbInfoType        int     `gorm:"column:edb_info_type"                         description:"指标类型,0:普通指标,1:预测指标"`
+	SourceName         string  `gorm:"column:source_name"                           description:"来源名称"`
+	Source             int     `gorm:"column:source"                               description:"来源id"`
+	EdbCode            string  `gorm:"column:edb_code"                             description:"指标编码"`
+	EdbName            string  `gorm:"column:edb_name"                             description:"指标名称"`
+	EdbNameEn          string  `gorm:"column:edb_name_en"                          description:"英文指标名称"`
+	EdbNameSource      string  `gorm:"column:edb_name_source"                      description:"指标名称来源"`
+	Frequency          string  `gorm:"column:frequency"                           description:"频率"`
+	Unit               string  `gorm:"column:unit"                                description:"单位"`
+	UnitEn             string  `gorm:"column:unit_en"                             description:"英文单位"`
+	StartDate          string  `gorm:"column:start_date"                          description:"起始日期"`
+	EndDate            string  `gorm:"column:end_date"                            description:"终止日期"`
+	SysUserId          int     `gorm:"column:sys_user_id"                         description:"创建人ID"`
+	SysUserRealName    string  `gorm:"column:sys_user_real_name"                  description:"创建人姓名"`
+	UniqueCode         string  `gorm:"column:unique_code"                         description:"指标唯一编码"`
+	EdbCreateTime      string  `gorm:"column:edb_create_time"                     description:"指标创建时间"`
+	EdbModifyTime      string  `gorm:"column:edb_modify_time"                     description:"指标修改时间"`
+	CreateTime         string  `gorm:"column:create_time"                         description:"创建时间即删除时间"`
+	MinValue           float64 `gorm:"column:min_value"                           description:"指标最小值"`
+	MaxValue           float64 `gorm:"column:max_value"                           description:"指标最大值"`
+	CalculateFormula   string  `gorm:"column:calculate_formula"                   description:"计算公式"`
+	EdbType            int     `gorm:"column:edb_type"                            description:"指标类型:1:基础指标,2:计算指标"`
+	LatestDate         string  `gorm:"column:latest_date"                         description:"数据最新日期"`
+	LatestValue        float64 `gorm:"column:latest_value"                        description:"数据最新值"`
+	MoveType           int     `gorm:"column:move_type"                           description:"移动方式:1:领先(默认),2:滞后"`
+	MoveFrequency      string  `gorm:"column:move_frequency"                      description:"移动频度"`
+	NoUpdate           int8    `gorm:"column:no_update"                           description:"是否停止更新,0:继续更新;1:停止更新"`
+	ChartImage         string  `gorm:"column:chart_image"                         description:"图表图片"`
+	Calendar           string  `gorm:"column:calendar;default:公历"               description:"公历/农历"`
+	DataDateType       string  `gorm:"column:data_date_type;size:255;null;default:交易日" description:"数据日期类型"`
+	ManualSave         int     `gorm:"column:manual_save"                         description:"是否有手动保存过上下限: 0-否; 1-是"`
+	TerminalCode       string  `gorm:"column:terminal_code"                       description:"终端编码,用于配置在机器上"`
+	DelSysUserId       int     `gorm:"column:del_sys_user_id"                     description:"删除人ID"`
+	DelSysUserRealName string  `gorm:"column:del_sys_user_real_name"              description:"删除人姓名"`
+	DataUpdateTime     string  `gorm:"column:data_update_time"                    description:"最近一次数据发生变化的时间"`
+	ErDataUpdateDate   string  `gorm:"column:er_data_update_date"                 description:"本次更新,数据发生变化的最早日期"`
 }
 
 type EdbInfoDeleteLogNum struct {

+ 30 - 30
models/data_stat/edb_info_update_log.go

@@ -7,36 +7,36 @@ import (
 
 // EdbInfoUpdateLog 指标更新/刷新日志列表
 type EdbInfoUpdateLog struct {
-	Id                     uint64    `gorm:"primaryKey;autoIncrement;column:id"`
-	EdbInfoId              int       `description:"指标ID"`
-	SourceName             string    `description:"来源名称"`
-	Source                 int       `description:"来源id"`
-	EdbCode                string    `description:"指标编码"`
-	EdbName                string    `description:"指标名称"`
-	EdbNameSource          string    `description:"指标名称来源"`
-	Frequency              string    `description:"频率"`
-	Unit                   string    `description:"单位"`
-	StartDate              string    `description:"起始日期"`
-	EndDate                string    `description:"终止日期"`
-	SysUserId              int       `description:"创建人ID"`
-	SysUserRealName        string    `description:"创建人姓名"`
-	UniqueCode             string    `description:"指标唯一编码"`
-	EdbCreateTime          time.Time `description:"指标创建时间"`
-	EdbModifyTime          time.Time `description:"指标修改时间"`
-	CreateTime             time.Time `description:"创建时间"`
-	UpdateSysUserId        int       `description:"变更人ID"`
-	UpdateSysUserRealName  string    `description:"变更人姓名"`
-	LatestDate             string    `description:"数据最新日期"`
-	LatestValue            float64   `description:"数据最新值"`
-	TerminalCode           string    `description:"终端编码,用于配置在机器上"`
-	ErDataUpdateDate       string    `description:"本次更新,数据发生变化的最早日期"`
-	UpdateResult           int       `description:"本次刷新操作结果:1成功,2失败"`
-	UpdateFailedReason     string    `description:"刷新失败原因"`
-	DataUpdateResult       int       `description:"数据更新结果:1成功,2失败"`
-	DataUpdateFailedReason string    `description:"数据未正常更新原因"`
-	DataUpdateTime         string    `description:"数据更新时间"`
-	IsSourceRefresh        int       `description:"是否为终端刷新到数据源的刷新操作:0否,1是"`
-	UpdateType             int       `description:"变更类型,0:数据明细变更,1:基础信息变更, 2:新增指标"`
+	Id                     uint64    `gorm:"primaryKey;autoIncrement;column:id"                        description:"记录ID"`
+	EdbInfoId              int       `gorm:"column:edb_info_id"                                      description:"指标ID"`
+	SourceName             string    `gorm:"column:source_name"                                     description:"来源名称"`
+	Source                 int       `gorm:"column:source"                                          description:"来源id"`
+	EdbCode                string    `gorm:"column:edb_code"                                        description:"指标编码"`
+	EdbName                string    `gorm:"column:edb_name"                                        description:"指标名称"`
+	EdbNameSource          string    `gorm:"column:edb_name_source"                                 description:"指标名称来源"`
+	Frequency              string    `gorm:"column:frequency"                                       description:"频率"`
+	Unit                   string    `gorm:"column:unit"                                            description:"单位"`
+	StartDate              string    `gorm:"column:start_date"                                      description:"起始日期"`
+	EndDate                string    `gorm:"column:end_date"                                        description:"终止日期"`
+	SysUserId              int       `gorm:"column:sys_user_id"                                     description:"创建人ID"`
+	SysUserRealName        string    `gorm:"column:sys_user_real_name"                              description:"创建人姓名"`
+	UniqueCode             string    `gorm:"column:unique_code"                                     description:"指标唯一编码"`
+	EdbCreateTime          time.Time `gorm:"column:edb_create_time"                                 description:"指标创建时间"`
+	EdbModifyTime          time.Time `gorm:"column:edb_modify_time"                                 description:"指标修改时间"`
+	CreateTime             time.Time `gorm:"column:create_time"                                     description:"创建时间"`
+	UpdateSysUserId        int       `gorm:"column:update_sys_user_id"                              description:"变更人ID"`
+	UpdateSysUserRealName  string    `gorm:"column:update_sys_user_real_name"                       description:"变更人姓名"`
+	LatestDate             string    `gorm:"column:latest_date"                                     description:"数据最新日期"`
+	LatestValue            float64   `gorm:"column:latest_value"                                    description:"数据最新值"`
+	TerminalCode           string    `gorm:"column:terminal_code"                                   description:"终端编码,用于配置在机器上"`
+	ErDataUpdateDate       string    `gorm:"column:er_data_update_date"                             description:"本次更新,数据发生变化的最早日期"`
+	UpdateResult           int       `gorm:"column:update_result"                                   description:"本次刷新操作结果:1成功,2失败"`
+	UpdateFailedReason     string    `gorm:"column:update_failed_reason"                            description:"刷新失败原因"`
+	DataUpdateResult       int       `gorm:"column:data_update_result"                              description:"数据更新结果:1成功,2失败"`
+	DataUpdateFailedReason string    `gorm:"column:data_update_failed_reason"                       description:"数据未正常更新原因"`
+	DataUpdateTime         string    `gorm:"column:data_update_time"                                description:"数据更新时间"`
+	IsSourceRefresh        int       `gorm:"column:is_source_refresh"                               description:"是否为终端刷新到数据源的刷新操作:0否,1是"`
+	UpdateType             int       `gorm:"column:update_type"                                     description:"变更类型,0:数据明细变更,1:基础信息变更, 2:新增指标"`
 }
 
 func AddEdbUpdateLog(item *EdbInfoUpdateLog) (lastId int64, err error) {

+ 31 - 31
models/data_stat/edb_info_update_stat.go

@@ -8,37 +8,37 @@ import (
 
 // EdbInfoUpdateStat 指标更新/刷新 汇总表(数据源明细表)
 type EdbInfoUpdateStat struct {
-	Id                     uint64    `gorm:"primaryKey;autoIncrement;column:id"`
-	EdbInfoId              int       `description:"指标ID"`
-	SourceName             string    `description:"来源名称"`
-	Source                 int       `description:"来源id"`
-	EdbCode                string    `description:"指标编码"`
-	EdbName                string    `description:"指标名称"`
-	EdbNameSource          string    `description:"指标名称来源"`
-	Frequency              string    `description:"频率"`
-	Unit                   string    `description:"单位"`
-	StartDate              string    `description:"起始日期"`
-	EndDate                string    `description:"终止日期"`
-	SysUserId              int       `description:"创建人ID"`
-	SysUserRealName        string    `description:"创建人姓名"`
-	UniqueCode             string    `description:"指标唯一编码"`
-	EdbCreateTime          time.Time `description:"指标创建时间"`
-	EdbModifyTime          time.Time `description:"指标修改时间"`
-	CreateTime             time.Time `description:"记录创建时间"`
-	LatestDate             string    `description:"数据最新日期"`
-	LatestValue            float64   `description:"数据最新值"`
-	TerminalCode           string    `description:"终端编码,用于配置在机器上"`
-	ErDataUpdateDate       string    `description:"本次更新,数据发生变化的最早日期"`
-	DataUpdateResult       int       `description:"数据更新结果:1成功,2失败"`
-	DataUpdateFailedReason string    `description:"数据未正常更新原因"`
-	DataUpdateTime         string    `description:"数据更新时间"`
-	UpdateResult           int       `description:"本次刷新操作结果:1成功,2失败"`
-	UpdateFailedReason     string    `description:"刷新失败原因"`
-	UpdateTime             string    `description:"刷新时间"`
-	ModifyTime             time.Time `description:"修改时间"`
-	IsAdd                  int       `description:"是否是当日新增的指标:1是,2否"`
-	NeedRefresh            int       `description:"今日是否需要定时刷新,1需要,0不需要"`
-	HasRefresh             int       `description:"今日是否发起刷新服务,1是,0否"`
+	Id                     uint64    `gorm:"primaryKey;autoIncrement;column:id" description:"ID"`
+	EdbInfoId              int       `gorm:"column:edb_info_id" description:"指标ID"`
+	SourceName             string    `gorm:"column:source_name" description:"来源名称"`
+	Source                 int       `gorm:"column:source" description:"来源id"`
+	EdbCode                string    `gorm:"column:edb_code" description:"指标编码"`
+	EdbName                string    `gorm:"column:edb_name" description:"指标名称"`
+	EdbNameSource          string    `gorm:"column:edb_name_source" description:"指标名称来源"`
+	Frequency              string    `gorm:"column:frequency" description:"频率"`
+	Unit                   string    `gorm:"column:unit" description:"单位"`
+	StartDate              string    `gorm:"column:start_date" description:"起始日期"`
+	EndDate                string    `gorm:"column:end_date" description:"终止日期"`
+	SysUserId              int       `gorm:"column:sys_user_id" description:"创建人ID"`
+	SysUserRealName        string    `gorm:"column:sys_user_real_name" description:"创建人姓名"`
+	UniqueCode             string    `gorm:"column:unique_code" description:"指标唯一编码"`
+	EdbCreateTime          time.Time `gorm:"column:edb_create_time" description:"指标创建时间"`
+	EdbModifyTime          time.Time `gorm:"column:edb_modify_time" description:"指标修改时间"`
+	CreateTime             time.Time `gorm:"column:create_time" description:"记录创建时间"`
+	LatestDate             string    `gorm:"column:latest_date" description:"数据最新日期"`
+	LatestValue            float64   `gorm:"column:latest_value" description:"数据最新值"`
+	TerminalCode           string    `gorm:"column:terminal_code" description:"终端编码,用于配置在机器上"`
+	ErDataUpdateDate       string    `gorm:"column:er_data_update_date" description:"本次更新,数据发生变化的最早日期"`
+	DataUpdateResult       int       `gorm:"column:data_update_result" description:"数据更新结果:1成功,2失败"`
+	DataUpdateFailedReason string    `gorm:"column:data_update_failed_reason" description:"数据未正常更新原因"`
+	DataUpdateTime         string    `gorm:"column:data_update_time" description:"数据更新时间"`
+	UpdateResult           int       `gorm:"column:update_result" description:"本次刷新操作结果:1成功,2失败"`
+	UpdateFailedReason     string    `gorm:"column:update_failed_reason" description:"刷新失败原因"`
+	UpdateTime             string    `gorm:"column:update_time" description:"刷新时间"`
+	ModifyTime             time.Time `gorm:"column:modify_time" description:"修改时间"`
+	IsAdd                  int       `gorm:"column:is_add" description:"是否是当日新增的指标:1是,2否"`
+	NeedRefresh            int       `gorm:"column:need_refresh" description:"今日是否需要定时刷新,1需要,0不需要"`
+	HasRefresh             int       `gorm:"column:has_refresh" description:"今日是否发起刷新服务,1是,0否"`
 }
 
 // Add 新增

+ 15 - 15
models/data_stat/edb_source_stat.go

@@ -8,21 +8,21 @@ import (
 
 // EdbSourceStat 数据源统计表
 type EdbSourceStat struct {
-	Id                int       `gorm:"primaryKey;autoIncrement;column:id"`
-	SourceName        string    `description:"来源名称"`
-	Source            int       `description:"来源id"`
-	TerminalCode      string    `description:"终端编码,用于配置在机器上"`
-	EdbNum            int       `description:"指标总数"`
-	EdbNewNum         int       `description:"今日新增指标数"`
-	EdbDelNum         int       `description:"今日删除指标数"`
-	NeedRefreshNum    int       `description:"今日需刷新指标"`
-	HasRefreshNum     int       `description:"今日发起刷新任务指标数"`
-	UpdateSuccessNum  int       `description:"今日已更新成功指标数"`
-	UpdateFailedNum   int       `description:"今日已更新失败指标数"`
-	RefreshSuccessNum int       `description:"今日已刷新成功指标数"`
-	RefreshFailedNum  int       `description:"今日已刷新失败指标数"`
-	CreateTime        time.Time `description:"创建时间"`
-	ModifyTime        time.Time `description:"修改时间"`
+	Id                int       `gorm:"primaryKey;autoIncrement;column:id" description:"ID"`
+	SourceName        string    `gorm:"column:source_name" description:"来源名称"`
+	Source            int       `gorm:"column:source" description:"来源id"`
+	TerminalCode      string    `gorm:"column:terminal_code" description:"终端编码,用于配置在机器上"`
+	EdbNum            int       `gorm:"column:edb_num" description:"指标总数"`
+	EdbNewNum         int       `gorm:"column:edb_new_num" description:"今日新增指标数"`
+	EdbDelNum         int       `gorm:"column:edb_del_num" description:"今日删除指标数"`
+	NeedRefreshNum    int       `gorm:"column:need_refresh_num" description:"今日需刷新指标"`
+	HasRefreshNum     int       `gorm:"column:has_refresh_num" description:"今日发起刷新任务指标数"`
+	UpdateSuccessNum  int       `gorm:"column:update_success_num" description:"今日已更新成功指标数"`
+	UpdateFailedNum   int       `gorm:"column:update_failed_num" description:"今日已更新失败指标数"`
+	RefreshSuccessNum int       `gorm:"column:refresh_success_num" description:"今日已刷新成功指标数"`
+	RefreshFailedNum  int       `gorm:"column:refresh_failed_num" description:"今日已刷新失败指标数"`
+	CreateTime        time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime        time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
 
 func GetEdbSourceStatByCondition(condition string, pars []interface{}) (item []*EdbSourceStat, err error) {

+ 3 - 3
models/edb_adjust_conf.go

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

+ 12 - 12
models/edb_classify.go

@@ -10,18 +10,18 @@ import (
 
 type EdbClassify struct {
 	ClassifyId      int       `gorm:"primaryKey;autoIncrement;column:classify_id"`
-	ClassifyType    uint8     `description:"分类类型,0:普通指标分类,1:预测指标分类"`
-	ClassifyName    string    `description:"分类名称"`
-	ParentId        int       `description:"父级id"`
-	RootId          int       `description:"顶级id"`
-	HasData         int       `description:"是否含有指标数据"`
-	CreateTime      time.Time `description:"创建时间"`
-	ModifyTime      time.Time `description:"修改时间"`
-	SysUserId       int       `description:"创建人id"`
-	SysUserRealName string    `description:"创建人姓名"`
-	Level           int       `description:"层级"`
-	UniqueCode      string    `description:"唯一编码"`
-	Sort            int       `description:"排序字段,越小越靠前,默认值:10"`
+	ClassifyType    uint8     `gorm:"column:classify_type" description:"分类类型,0:普通指标分类,1:预测指标分类"`
+	ClassifyName    string    `gorm:"column:classify_name" description:"分类名称"`
+	ParentId        int       `gorm:"column:parent_id" description:"父级id"`
+	RootId          int       `gorm:"column:root_id" description:"顶级id"`
+	HasData         int       `gorm:"column:has_data" description:"是否含有指标数据"`
+	CreateTime      time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime      time.Time `gorm:"column:modify_time" description:"修改时间"`
+	SysUserId       int       `gorm:"column:sys_user_id" description:"创建人id"`
+	SysUserRealName string    `gorm:"column:sys_user_real_name" description:"创建人姓名"`
+	Level           int       `gorm:"column:level" description:"层级"`
+	UniqueCode      string    `gorm:"column:unique_code" description:"唯一编码"`
+	Sort            int       `gorm:"column:sort" description:"排序字段,越小越靠前,默认值:10"`
 }
 
 func AddEdbClassify(item *EdbClassify) (lastId int64, err error) {

+ 18 - 18
models/edb_data_base.go

@@ -21,15 +21,15 @@ type EdbDataItem struct {
 }
 
 type EdbData struct {
-	EdbDataId     int `gorm:"primaryKey;autoIncrement;column:edb_data_id"`
-	EdbInfoId     int
-	EdbCode       string
-	DataTime      string
-	Value         string
-	Status        int
-	CreateTime    time.Time
-	ModifyTime    time.Time
-	DataTimestamp int64
+	EdbDataId     int       `gorm:"primaryKey;autoIncrement;column:edb_data_id"`
+	EdbInfoId     int       `gorm:"column:edb_info_id"`
+	EdbCode       string    `gorm:"column:edb_code"`
+	DataTime      string    `gorm:"column:data_time"`
+	Value         string    `gorm:"column:value"`
+	Status        int       `gorm:"column:status"`
+	CreateTime    time.Time `gorm:"column:create_time"`
+	ModifyTime    time.Time `gorm:"column:modify_time"`
+	DataTimestamp int64     `gorm:"column:data_timestamp"`
 }
 
 func GetAddSql(edbInfoId, edbCode, dataTime, timestampStr string, value string) (addSql string) {
@@ -159,15 +159,15 @@ func GetFinalLastByTo(to *gorm.DB, edbInfoId, source, subSource int, latestDate
 
 // 新版本
 type EdbDataV1 struct {
-	EdbDataId     int `gorm:"primaryKey;autoIncrement;column:edb_data_id"`
-	EdbInfoId     int
-	EdbCode       string
-	DataTime      string
-	Value         string
-	Status        int
-	CreateTime    time.Time
-	ModifyTime    time.Time
-	DataTimestamp int64
+	EdbDataId     int       `gorm:"primaryKey;autoIncrement;column:edb_data_id"`
+	EdbInfoId     int       `gorm:"column:edb_info_id"`
+	EdbCode       string    `gorm:"column:edb_code"`
+	DataTime      string    `gorm:"column:data_time"`
+	Value         string    `gorm:"column:value"`
+	Status        int       `gorm:"column:status"`
+	CreateTime    time.Time `gorm:"column:create_time"`
+	ModifyTime    time.Time `gorm:"column:modify_time"`
+	DataTimestamp int64     `gorm:"column:data_timestamp"`
 }
 
 type EdbDataList struct {

+ 9 - 9
models/edb_data_calculate_ljztbpj.go

@@ -15,15 +15,15 @@ import (
 
 // EdbDataCalculateLjztbpj 累计值同比拼接数据结构体
 type EdbDataCalculateLjztbpj struct {
-	EdbDataId     int `gorm:"primaryKey;autoIncrement;column:edb_data_id"`
-	EdbInfoId     int
-	EdbCode       string
-	DataTime      string
-	Value         float64
-	Status        int
-	CreateTime    time.Time
-	ModifyTime    time.Time
-	DataTimestamp int64
+	EdbDataId     int       `gorm:"primaryKey;autoIncrement;column:edb_data_id"`
+	EdbInfoId     int       `gorm:"column:edb_info_id" description:"指标ID"`
+	EdbCode       string    `gorm:"column:edb_code" description:"指标编码"`
+	DataTime      string    `gorm:"column:data_time" description:"数据日期"`
+	Value         float64   `gorm:"column:value" description:"数据值"`
+	Status        int       `gorm:"column:status" description:"状态"`
+	CreateTime    time.Time `gorm:"column:status" description:"创建时间"`
+	ModifyTime    time.Time `gorm:"column:create_time" description:"修改时间"`
+	DataTimestamp int64     `gorm:"column:modify_time" description:"数据日期时间戳"`
 }
 
 // AddCalculateLjztbpj 新增累计值同比拼接数据

+ 10 - 10
models/edb_data_calculate_nhcc.go

@@ -14,15 +14,15 @@ import (
 
 // EdbDataCalculateNhcc 拟合残差数据结构体
 type EdbDataCalculateNhcc struct {
-	EdbDataId     int `gorm:"primaryKey;autoIncrement;column:edb_data_id"`
-	EdbInfoId     int
-	EdbCode       string
-	DataTime      string
-	Value         float64
-	Status        int
-	CreateTime    time.Time
-	ModifyTime    time.Time
-	DataTimestamp int64
+	EdbDataId     int       `gorm:"primaryKey;autoIncrement;column:edb_data_id"`
+	EdbInfoId     int       `gorm:"column:edb_info_id" description:"指标ID"`
+	EdbCode       string    `gorm:"column:edb_code" description:"指标编码"`
+	DataTime      string    `gorm:"column:data_time" description:"数据日期"`
+	Value         float64   `gorm:"column:value" description:"数据值"`
+	Status        int       `gorm:"column:status" description:"状态"`
+	CreateTime    time.Time `gorm:"column:status" description:"创建时间"`
+	ModifyTime    time.Time `gorm:"column:create_time" description:"修改时间"`
+	DataTimestamp int64     `gorm:"column:modify_time" description:"数据日期时间戳"`
 }
 
 // NhccDate 拟合残差的开始、结束日期
@@ -592,7 +592,7 @@ func refreshAllCalculateNhcc(to *gorm.DB, edbInfo *EdbInfo, existItemA, existIte
 			// 如果有的话,还需要判断值是否一致,一致则不处理,不一致则修改
 			if existData.Value != val {
 				existData.Value = val
-				_ = to.Model(existData).Select( []string{"Value"}).Updates(existData).Error
+				_ = to.Model(existData).Select([]string{"Value"}).Updates(existData).Error
 				if err != nil {
 					return
 				}

+ 9 - 9
models/edb_data_calculate_zjpj.go

@@ -12,15 +12,15 @@ import (
 
 // EdbDataCalculateZjpj 直接拼接数据结构体
 type EdbDataCalculateZjpj struct {
-	EdbDataId     int `gorm:"primaryKey;autoIncrement;column:edb_data_id"`
-	EdbInfoId     int
-	EdbCode       string
-	DataTime      string
-	Value         float64
-	Status        int
-	CreateTime    time.Time
-	ModifyTime    time.Time
-	DataTimestamp int64
+	EdbDataId     int       `gorm:"primaryKey;autoIncrement;column:edb_data_id"`
+	EdbInfoId     int       `gorm:"column:edb_info_id" description:"指标ID"`
+	EdbCode       string    `gorm:"column:edb_code" description:"指标编码"`
+	DataTime      string    `gorm:"column:data_time" description:"数据日期"`
+	Value         float64   `gorm:"column:value" description:"数据值"`
+	Status        int       `gorm:"column:status" description:"状态"`
+	CreateTime    time.Time `gorm:"column:status" description:"创建时间"`
+	ModifyTime    time.Time `gorm:"column:create_time" description:"修改时间"`
+	DataTimestamp int64     `gorm:"column:modify_time" description:"数据日期时间戳"`
 }
 
 // AddCalculateZjpj 新增直接拼接数据

+ 7 - 7
models/edb_data_ly.go

@@ -13,13 +13,13 @@ import (
 
 type EdbDataLy struct {
 	edbDataId     int     `gorm:"primaryKey;autoIncrement;column:edb_data_id"` // 数据ID
-	CreateTime    string  `orm:"column(create_time)"`                          // 创建时间
-	ModifyTime    string  `orm:"column(modify_time)"`                          // 修改时间
-	EdbInfoId     int     `orm:"column(edb_info_id)"`                          // 指标id
-	EdbCode       string  `orm:"column(edb_code)"`                             // 指标编码
-	DataTime      string  `orm:"column(data_time)"`                            // 数据日期
-	Value         float64 `orm:"column(value)"`                                // 数据值
-	DataTimestamp uint64  `orm:"column(data_timestamp)"`                       // 数据日期时间戳
+	EdbInfoId     int     `gorm:"column:edb_info_id" description:"指标ID"`
+	EdbCode       string  `gorm:"column:edb_code" description:"指标编码"`
+	DataTime      string  `gorm:"column:data_time" description:"数据日期"`
+	Value         float64 `gorm:"column:value" description:"数据值"`
+	CreateTime    string  `gorm:"column:status" description:"创建时间"`
+	ModifyTime    string  `gorm:"column:create_time" description:"修改时间"`
+	DataTimestamp int64   `gorm:"column:modify_time" description:"数据日期时间戳"`
 }
 
 /*func init() {

+ 7 - 7
models/edb_data_ths_hf.go

@@ -12,13 +12,13 @@ import (
 // EdbDataThsHf 同花顺高频指标数据
 type EdbDataThsHf struct {
 	EdbDataId     int       `gorm:"primaryKey;autoIncrement;column:edb_data_id"`
-	EdbInfoId     int       `description:"指标ID"`
-	EdbCode       string    `description:"指标编码"`
-	DataTime      time.Time `description:"数据日期"`
-	Value         float64   `description:"数据值"`
-	CreateTime    time.Time `description:"创建时间"`
-	ModifyTime    time.Time `description:"修改时间"`
-	DataTimestamp int64     `description:"数据日期时间戳"`
+	EdbInfoId     int       `gorm:"column:edb_info_id" description:"指标ID"`
+	EdbCode       string    `gorm:"column:edb_code" description:"指标编码"`
+	DataTime      time.Time `gorm:"column:data_time" description:"数据日期"`
+	Value         float64   `gorm:"column:value" description:"数据值"`
+	CreateTime    time.Time `gorm:"column:status" description:"创建时间"`
+	ModifyTime    time.Time `gorm:"column:create_time" description:"修改时间"`
+	DataTimestamp int64     `gorm:"column:modify_time" description:"数据日期时间戳"`
 }
 
 func (m *EdbDataThsHf) TableName() string {

+ 7 - 7
models/edb_data_trade_analysis.go

@@ -12,13 +12,13 @@ import (
 // EdbDataTradeAnalysis 持仓分析指标数据
 type EdbDataTradeAnalysis struct {
 	EdbDataId     int       `gorm:"primaryKey;autoIncrement;column:edb_data_id"`
-	EdbInfoId     int       `description:"指标ID"`
-	EdbCode       string    `description:"指标编码"`
-	DataTime      time.Time `description:"数据日期"`
-	Value         float64   `description:"数据值"`
-	CreateTime    time.Time `description:"创建时间"`
-	ModifyTime    time.Time `description:"修改时间"`
-	DataTimestamp int64     `description:"数据日期时间戳"`
+	EdbInfoId     int       `gorm:"column:edb_info_id" description:"指标ID"`
+	EdbCode       string    `gorm:"column:edb_code" description:"指标编码"`
+	DataTime      time.Time `gorm:"column:data_time" description:"数据日期"`
+	Value         float64   `gorm:"column:value" description:"数据值"`
+	CreateTime    time.Time `gorm:"column:status" description:"创建时间"`
+	ModifyTime    time.Time `gorm:"column:create_time" description:"修改时间"`
+	DataTimestamp int64     `gorm:"column:modify_time" description:"数据日期时间戳"`
 }
 
 func (m *EdbDataTradeAnalysis) TableName() string {

+ 97 - 79
models/edb_info.go

@@ -18,54 +18,54 @@ import (
 )
 
 type EdbInfo struct {
-	EdbInfoId        int    `gorm:"primaryKey;autoIncrement;column:edb_info_id"`
-	EdbInfoType      int    `description:"指标类型,0:普通指标,1:预测指标"`
-	SourceName       string `description:"来源名称"`
-	Source           int    `description:"来源id"`
-	EdbCode          string `description:"指标编码"`
-	EdbName          string `description:"指标名称"`
-	EdbNameEn        string `description:"英文指标名称"`
-	EdbNameSource    string `description:"指标名称来源"`
-	Frequency        string `description:"频率"`
-	Unit             string `description:"单位"`
-	UnitEn           string `description:"英文单位"`
-	StartDate        string `description:"起始日期"`
-	EndDate          string `description:"终止日期"`
-	ClassifyId       int    `description:"分类id"`
-	SysUserId        int
-	SysUserRealName  string
-	UniqueCode       string `description:"指标唯一编码"`
-	CreateTime       time.Time
-	ModifyTime       time.Time
-	BaseModifyTime   time.Time
-	MinValue         float64 `description:"指标最小值"`
-	MaxValue         float64 `description:"指标最大值"`
-	CalculateFormula string  `description:"计算公式"`
-	EdbType          int     `description:"指标类型:1:基础指标,2:计算指标"`
-	IsUpdate         int     `description:"当天是否已更新,1:未更新,2:已更新"`
-	Sort             int     `description:"排序字段"`
-	LatestDate       string  `description:"数据最新日期(实际日期)"`
-	LatestValue      float64 `description:"数据最新值(实际值)"`
-	EndValue         float64 `description:"数据的最新值(预测日期的最新值)"`
-	MoveType         int     `description:"移动方式:1:领先(默认),2:滞后"`
-	MoveFrequency    string  `description:"移动频度"`
-	NoUpdate         int8    `description:"是否停止更新,0:继续更新;1:停止更新"`
-	ServerUrl        string  `description:"服务器地址"`
-	ChartImage       string  `description:"图表图片"`
-	Calendar         string  `description:"公历/农历" orm:"default(公历);"`
-	EmptyType        int     `description:"空值处理类型(0查找前后35天,1不计算,2前值填充,3后值填充,4等于0)"`
-	MaxEmptyType     int     `description:"MAX、MIN公式空值处理类型(1、等于0;2、跳过空值)"`
-	DataDateType     string  `orm:"column(data_date_type);size(255);null;default(交易日)"`
-	ManualSave       int     `description:"是否有手动保存过上下限: 0-否; 1-是"`
-	TerminalCode     string  `description:"终端编码,用于配置在机器上"`
-	DataUpdateTime   string  `description:"最近一次数据发生变化的时间"`
-	ErDataUpdateDate string  `description:"本次更新,数据发生变化的最早日期"`
-	SourceIndexName  string  `description:"数据源中的指标名称"`
-	SubSource        int     `description:"子数据来源:0:经济数据库,1:日期序列"`
-	SubSourceName    string  `description:"子数据来源名称"`
-	IndicatorCode    string  `description:"指标代码"`
-	StockCode        string  `description:"证券代码"`
-	Extra            string  `description:"指标的额外配置"`
+	EdbInfoId        int       `gorm:"primaryKey;autoIncrement;column:edb_info_id" description:"唯一标识"`
+	EdbInfoType      int       `gorm:"column:edb_info_type" description:"指标类型,0:普通指标,1:预测指标"`
+	SourceName       string    `gorm:"column:source_name" description:"来源名称"`
+	Source           int       `gorm:"column:source" description:"来源id"`
+	EdbCode          string    `gorm:"column:edb_code" description:"指标编码"`
+	EdbName          string    `gorm:"column:edb_name" description:"指标名称"`
+	EdbNameEn        string    `gorm:"column:edb_name_en" description:"英文指标名称"`
+	EdbNameSource    string    `gorm:"column:edb_name_source" description:"指标名称来源"`
+	Frequency        string    `gorm:"column:frequency" description:"频率"`
+	Unit             string    `gorm:"column:unit" description:"单位"`
+	UnitEn           string    `gorm:"column:unit_en" description:"英文单位"`
+	StartDate        string    `gorm:"column:start_date" description:"起始日期"`
+	EndDate          string    `gorm:"column:end_date" description:"终止日期"`
+	ClassifyId       int       `gorm:"column:classify_id" description:"分类id"`
+	SysUserId        int       `gorm:"column:sys_user_id" description:"系统用户ID"`
+	SysUserRealName  string    `gorm:"column:sys_user_real_name" description:"系统用户真实姓名"`
+	UniqueCode       string    `gorm:"column:unique_code" description:"指标唯一编码"`
+	CreateTime       time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime       time.Time `gorm:"column:modify_time" description:"修改时间"`
+	BaseModifyTime   time.Time `gorm:"column:base_modify_time" description:"基础修改时间"`
+	MinValue         float64   `gorm:"column:min_value" description:"指标最小值"`
+	MaxValue         float64   `gorm:"column:max_value" description:"指标最大值"`
+	CalculateFormula string    `gorm:"column:calculate_formula" description:"计算公式"`
+	EdbType          int       `gorm:"column:edb_type" description:"指标类型:1:基础指标,2:计算指标"`
+	IsUpdate         int       `gorm:"column:is_update" description:"当天是否已更新,1:未更新,2:已更新"`
+	Sort             int       `gorm:"column:sort" description:"排序字段"`
+	LatestDate       string    `gorm:"column:latest_date" description:"数据最新日期(实际日期)"`
+	LatestValue      float64   `gorm:"column:latest_value" description:"数据最新值(实际值)"`
+	EndValue         float64   `gorm:"column:end_value" description:"数据的最新值(预测日期的最新值)"`
+	MoveType         int       `gorm:"column:move_type" description:"移动方式:1:领先(默认),2:滞后"`
+	MoveFrequency    string    `gorm:"column:move_frequency" description:"移动频度"`
+	NoUpdate         int8      `gorm:"column:no_update" description:"是否停止更新,0:继续更新;1:停止更新"`
+	ServerUrl        string    `gorm:"column:server_url" description:"服务器地址"`
+	ChartImage       string    `gorm:"column:chart_image" description:"图表图片"`
+	Calendar         string    `gorm:"column:calendar;default:公历" description:"公历/农历"`
+	EmptyType        int       `gorm:"column:empty_type" description:"空值处理类型(0查找前后35天,1不计算,2前值填充,3后值填充,4等于0)"`
+	MaxEmptyType     int       `gorm:"column:max_empty_type" description:"MAX、MIN公式空值处理类型(1、等于0;2、跳过空值)"`
+	DataDateType     string    `gorm:"column:data_date_type;size:255;default:交易日" description:"数据日期类型"`
+	ManualSave       int       `gorm:"column:manual_save" description:"是否有手动保存过上下限: 0-否; 1-是"`
+	TerminalCode     string    `gorm:"column:terminal_code" description:"终端编码,用于配置在机器上"`
+	DataUpdateTime   string    `gorm:"column:data_update_time" description:"最近一次数据发生变化的时间"`
+	ErDataUpdateDate string    `gorm:"column:er_data_update_date" description:"本次更新,数据发生变化的最早日期"`
+	SourceIndexName  string    `gorm:"column:source_index_name" description:"数据源中的指标名称"`
+	SubSource        int       `gorm:"column:sub_source" description:"子数据来源:0:经济数据库,1:日期序列"`
+	SubSourceName    string    `gorm:"column:sub_source_name" description:"子数据来源名称"`
+	IndicatorCode    string    `gorm:"column:indicator_code" description:"指标代码"`
+	StockCode        string    `gorm:"column:stock_code" description:"证券代码"`
+	Extra            string    `gorm:"column:extra" description:"指标的额外配置"`
 }
 
 func (e *EdbInfo) Add() (err error) {
@@ -83,45 +83,63 @@ func AddEdbInfo(item *EdbInfo) (lastId int64, err error) {
 
 // EdbInfoList 指标数据列表
 type EdbInfoList struct {
-	EdbInfoId       int                    `gorm:"primaryKey;autoIncrement;column:edb_info_id"`
-	EdbInfoType     int                    `description:"指标类型,0:普通指标,1:预测指标"`
-	SourceName      string                 `description:"来源名称"`
-	Source          int                    `description:"来源id"`
-	EdbCode         string                 `description:"指标编码"`
-	EdbNameEn       string                 `description:"英文指标名称"`
-	EdbName         string                 `description:"指标名称"`
-	Frequency       string                 `description:"频率"`
 	FrequencyEn     string                 `description:"英文频率"`
-	Unit            string                 `description:"单位"`
-	UnitEn          string                 `description:"英文单位"`
-	StartDate       string                 `description:"起始日期"`
-	EndDate         string                 `description:"终止日期"`
-	LatestDate      string                 `description:"数据最新日期(实际日期)"`
-	LatestValue     float64                `description:"数据最新值(实际值)"`
-	EndValue        float64                `description:"数据的最新值(预测日期的最新值)"`
-	ClassifyId      int                    `description:"分类id"`
-	UniqueCode      string                 `description:"指标唯一编码"`
-	SysUserId       int                    `description:"创建人id"`
-	SysUserRealName string                 `description:"创建人姓名"`
-	ModifyTime      string                 `description:"最新修改时间"`
-	CreateTime      string                 `description:"创建时间"`
 	EdbNameAlias    string                 `json:"-" description:"指标名称,别名"`
-	EdbType         int                    `description:"指标类型:1:基础指标,2:计算指标"`
-	ChartImage      string                 `description:"图表图片"`
 	RuleType        int                    `description:"预测规则,1:最新,2:固定值"`
 	FixedValue      float64                `description:"固定值"`
 	DataList        []*EdbData             `description:"实际指标数据"`
 	PredictDataList []*EdbData             `description:"预测指标数据"`
 	Button          EdbClassifyItemsButton `description:"操作权限"`
 	IsEnEdb         bool                   `description:"是否展示英文标识"`
-	DataDateType    string                 `description:"数据日期类型,枚举值:交易日、自然日"`
-	EmptyType       int                    `description:"空值处理类型(0查找前后35天,1不计算,2前值填充,3后值填充,4等于0)"`
-	MaxEmptyType    int                    `description:"MAX、MIN公式空值处理类型(1、等于0;2、跳过空值)"`
-	SubSource       int                    `description:"子数据来源:0:经济数据库,1:日期序列"`
-	SubSourceName   string                 `description:"子数据来源名称"`
-	IndicatorCode   string                 `description:"指标代码"`
-	StockCode       string                 `description:"证券代码"`
-	NoUpdate        int8                   `description:"是否停止更新,0:继续更新;1:停止更新"`
+
+	EdbInfoId   int    `gorm:"primaryKey;autoIncrement;column:edb_info_id" description:"唯一标识"`
+	EdbInfoType int    `gorm:"column:edb_info_type" description:"指标类型,0:普通指标,1:预测指标"`
+	SourceName  string `gorm:"column:source_name" description:"来源名称"`
+	Source      int    `gorm:"column:source" description:"来源id"`
+	EdbCode     string `gorm:"column:edb_code" description:"指标编码"`
+	EdbName     string `gorm:"column:edb_name" description:"指标名称"`
+	EdbNameEn   string `gorm:"column:edb_name_en" description:"英文指标名称"`
+	//EdbNameSource    string    `gorm:"column:edb_name_source" description:"指标名称来源"`
+	Frequency       string    `gorm:"column:frequency" description:"频率"`
+	Unit            string    `gorm:"column:unit" description:"单位"`
+	UnitEn          string    `gorm:"column:unit_en" description:"英文单位"`
+	StartDate       string    `gorm:"column:start_date" description:"起始日期"`
+	EndDate         string    `gorm:"column:end_date" description:"终止日期"`
+	ClassifyId      int       `gorm:"column:classify_id" description:"分类id"`
+	SysUserId       int       `gorm:"column:sys_user_id" description:"系统用户ID"`
+	SysUserRealName string    `gorm:"column:sys_user_real_name" description:"系统用户真实姓名"`
+	UniqueCode      string    `gorm:"column:unique_code" description:"指标唯一编码"`
+	CreateTime      time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime      time.Time `gorm:"column:modify_time" description:"修改时间"`
+	//BaseModifyTime   time.Time `gorm:"column:base_modify_time" description:"基础修改时间"`
+	//MinValue         float64   `gorm:"column:min_value" description:"指标最小值"`
+	/*MaxValue         float64   `gorm:"column:max_value" description:"指标最大值"`
+	CalculateFormula string    `gorm:"column:calculate_formula" description:"计算公式"`*/
+	EdbType int `gorm:"column:edb_type" description:"指标类型:1:基础指标,2:计算指标"`
+	//IsUpdate         int       `gorm:"column:is_update" description:"当天是否已更新,1:未更新,2:已更新"`
+	//Sort             int       `gorm:"column:sort" description:"排序字段"`
+	LatestDate  string  `gorm:"column:latest_date" description:"数据最新日期(实际日期)"`
+	LatestValue float64 `gorm:"column:latest_value" description:"数据最新值(实际值)"`
+	EndValue    float64 `gorm:"column:end_value" description:"数据的最新值(预测日期的最新值)"`
+	//MoveType         int       `gorm:"column:move_type" description:"移动方式:1:领先(默认),2:滞后"`
+	//MoveFrequency    string    `gorm:"column:move_frequency" description:"移动频度"`
+	NoUpdate int8 `gorm:"column:no_update" description:"是否停止更新,0:继续更新;1:停止更新"`
+	//ServerUrl        string    `gorm:"column:server_url" description:"服务器地址"`
+	ChartImage string `gorm:"column:chart_image" description:"图表图片"`
+	//Calendar         string    `gorm:"column:calendar;default:公历" description:"公历/农历"`
+	EmptyType    int    `gorm:"column:empty_type" description:"空值处理类型(0查找前后35天,1不计算,2前值填充,3后值填充,4等于0)"`
+	MaxEmptyType int    `gorm:"column:max_empty_type" description:"MAX、MIN公式空值处理类型(1、等于0;2、跳过空值)"`
+	DataDateType string `gorm:"column:data_date_type;size:255;default:交易日" description:"数据日期类型"`
+	/*ManualSave       int       `gorm:"column:manual_save" description:"是否有手动保存过上下限: 0-否; 1-是"`
+	TerminalCode     string    `gorm:"column:terminal_code" description:"终端编码,用于配置在机器上"`
+	DataUpdateTime   string    `gorm:"column:data_update_time" description:"最近一次数据发生变化的时间"`
+	ErDataUpdateDate string    `gorm:"column:er_data_update_date" description:"本次更新,数据发生变化的最早日期"`
+	SourceIndexName  string    `gorm:"column:source_index_name" description:"数据源中的指标名称"`*/
+	SubSource     int    `gorm:"column:sub_source" description:"子数据来源:0:经济数据库,1:日期序列"`
+	SubSourceName string `gorm:"column:sub_source_name" description:"子数据来源名称"`
+	IndicatorCode string `gorm:"column:indicator_code" description:"指标代码"`
+	StockCode     string `gorm:"column:stock_code" description:"证券代码"`
+	//Extra            string    `gorm:"column:extra" description:"指标的额外配置"`
 }
 
 // EdbClassifyItemsButton 操作按钮

+ 54 - 54
models/edb_info_calculate_mapping.go

@@ -9,41 +9,41 @@ import (
 // EdbInfoCalculateMapping 计算指标于基础指标,关系表
 type EdbInfoCalculateMapping struct {
 	EdbInfoCalculateMappingId int       `gorm:"primaryKey;autoIncrement;column:edb_info_calculate_mapping_id"`
-	EdbInfoId                 int       `description:"计算指标id"`
-	Source                    int       `description:"计算指标来源"`
-	SourceName                string    `description:"计算指标来源名称"`
-	EdbCode                   string    `description:"计算指标编码"`
-	FromEdbInfoId             int       `description:"基础指标id"`
-	FromEdbCode               string    `description:"基础指标编码"`
-	FromEdbName               string    `description:"基础指标名称"`
-	FromSource                int       `description:"基础指标来源"`
-	FromSourceName            string    `description:"基础指标来源名称"`
-	MoveValue                 int       `description:"移动的值,小于0是提前,0是不变,大于0是滞后"`
-	Sort                      int       `description:"计算指标名称排序"`
-	CreateTime                time.Time `description:"创建时间"`
-	ModifyTime                time.Time `description:"修改时间"`
-	FromTag                   string    `description:"来源指标标签"`
-	FromSubSource             int       `description:"渠道子数据库来源"`
+	EdbInfoId                 int       `gorm:"column:edb_info_id" description:"计算指标id"`
+	Source                    int       `gorm:"column:source" description:"计算指标来源"`
+	SourceName                string    `gorm:"column:source_name" description:"计算指标来源名称"`
+	EdbCode                   string    `gorm:"column:edb_code" description:"计算指标编码"`
+	FromEdbInfoId             int       `gorm:"column:from_edb_info_id" description:"基础指标id"`
+	FromEdbCode               string    `gorm:"column:from_edb_code" description:"基础指标编码"`
+	FromEdbName               string    `gorm:"column:from_edb_name" description:"基础指标名称"`
+	FromSource                int       `gorm:"column:from_source" description:"基础指标来源"`
+	FromSourceName            string    `gorm:"column:from_source_name" description:"基础指标来源名称"`
+	MoveValue                 int       `gorm:"column:move_value" description:"移动的值,小于0是提前,0是不变,大于0是滞后"`
+	Sort                      int       `gorm:"column:sort" description:"计算指标名称排序"`
+	CreateTime                time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime                time.Time `gorm:"column:modify_time" description:"修改时间"`
+	FromTag                   string    `gorm:"column:from_tag" description:"来源指标标签"`
+	FromSubSource             int       `gorm:"column:from_sub_source" description:"渠道子数据库来源"`
 }
 
 // EdbInfoCalculateMappingInfo
 // @Description: 计算指标与基础指标关系表
 type EdbInfoCalculateMappingInfo struct {
 	EdbInfoCalculateMappingId int       `gorm:"primaryKey;autoIncrement;column:edb_info_calculate_mapping_id"`
-	EdbInfoId                 int       `description:"计算指标id"`
-	Source                    int       `description:"计算指标来源"`
-	SourceName                string    `description:"计算指标来源名称"`
-	EdbCode                   string    `description:"计算指标编码"`
-	FromEdbInfoId             int       `description:"基础指标id"`
-	FromEdbCode               string    `description:"基础指标编码"`
-	FromEdbName               string    `description:"基础指标名称"`
-	FromSource                int       `description:"基础指标来源"`
-	FromSourceName            string    `description:"基础指标来源名称"`
-	MoveValue                 int       `description:"领先值"`
-	FromTag                   string    `description:"来源指标标签"`
-	Sort                      int       `description:"计算指标名称排序"`
-	CreateTime                time.Time `description:"创建时间"`
-	ModifyTime                time.Time `description:"修改时间"`
+	EdbInfoId                 int       `gorm:"column:edb_info_id" description:"计算指标id"`
+	Source                    int       `gorm:"column:source" description:"计算指标来源"`
+	SourceName                string    `gorm:"column:source_name" description:"计算指标来源名称"`
+	EdbCode                   string    `gorm:"column:edb_code" description:"计算指标编码"`
+	FromEdbInfoId             int       `gorm:"column:from_edb_info_id" description:"基础指标id"`
+	FromEdbCode               string    `gorm:"column:from_edb_code" description:"基础指标编码"`
+	FromEdbName               string    `gorm:"column:from_edb_name" description:"基础指标名称"`
+	FromSource                int       `gorm:"column:from_source" description:"基础指标来源"`
+	FromSourceName            string    `gorm:"column:from_source_name" description:"基础指标来源名称"`
+	MoveValue                 int       `gorm:"column:move_value" description:"移动的值,小于0是提前,0是不变,大于0是滞后"`
+	Sort                      int       `gorm:"column:sort" description:"计算指标名称排序"`
+	CreateTime                time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime                time.Time `gorm:"column:modify_time" description:"修改时间"`
+	FromTag                   string    `gorm:"column:from_tag" description:"来源指标标签"`
 	FromEdbType               int       `description:"来源指标类型:1:基础指标,2:计算指标"`
 	FromEdbInfoType           int       `description:"来源指标类型: 0-基础指标; 1-预测指标"`
 	FromClassifyId            int       `description:"来源指标分类ID"`
@@ -68,19 +68,19 @@ func (e *EdbInfoCalculateMapping) Add() (err error) {
 // EdbInfoCalculateMappingView
 type EdbInfoCalculateMappingView struct {
 	EdbInfoCalculateMappingId int       `gorm:"primaryKey;autoIncrement;column:edb_info_calculate_mapping_id"`
-	EdbInfoId                 int       `description:"计算指标id"`
-	Source                    int       `description:"计算指标来源"`
-	SourceName                string    `description:"计算指标来源名称"`
-	EdbCode                   string    `description:"计算指标编码"`
-	FromEdbInfoId             int       `description:"基础指标id"`
-	FromEdbCode               string    `description:"基础指标编码"`
-	FromEdbName               string    `description:"基础指标名称"`
-	FromSource                int       `description:"基础指标来源"`
-	FromSourceName            string    `description:"基础指标来源名称"`
-	FromTag                   string    `description:"来源指标标签"`
-	Sort                      int       `description:"计算指标名称排序"`
-	CreateTime                time.Time `description:"创建时间"`
-	ModifyTime                time.Time `description:"修改时间"`
+	EdbInfoId                 int       `gorm:"column:edb_info_id" description:"计算指标id"`
+	Source                    int       `gorm:"column:source" description:"计算指标来源"`
+	SourceName                string    `gorm:"column:source_name" description:"计算指标来源名称"`
+	EdbCode                   string    `gorm:"column:edb_code" description:"计算指标编码"`
+	FromEdbInfoId             int       `gorm:"column:from_edb_info_id" description:"基础指标id"`
+	FromEdbCode               string    `gorm:"column:from_edb_code" description:"基础指标编码"`
+	FromEdbName               string    `gorm:"column:from_edb_name" description:"基础指标名称"`
+	FromSource                int       `gorm:"column:from_source" description:"基础指标来源"`
+	FromSourceName            string    `gorm:"column:from_source_name" description:"基础指标来源名称"`
+	Sort                      int       `gorm:"column:sort" description:"计算指标名称排序"`
+	CreateTime                time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime                time.Time `gorm:"column:modify_time" description:"修改时间"`
+	FromTag                   string    `gorm:"column:from_tag" description:"来源指标标签"`
 	StartDate                 string    `description:"开始日期"`
 	EndDate                   string    `description:"结束日期"`
 	CalculateFormula          string    `description:"N值"`
@@ -110,18 +110,18 @@ func GetEdbInfoCalculateMappingDetailByFromTag(edbInfoId int, fromTag string) (i
 
 // EdbInfoCalculateDetail
 type EdbInfoCalculateDetail struct {
-	EdbInfoCalculateId int       `gorm:"primaryKey;autoIncrement;column:edb_info_calculate_id"`
-	EdbInfoId          int       `description:"指标id"`
-	EdbCode            string    `description:"指标编码"`
-	FromEdbInfoId      int       `description:"计算指标id"`
-	FromEdbCode        string    `description:"计算指标编码"`
-	FromEdbName        string    `description:"计算指标名称"`
-	FromSource         int       `description:"计算指标来源"`
-	FromSourceName     string    `description:"计算指标来源名称"`
-	FromTag            string    `description:"来源指标标签"`
-	Sort               int       `description:"计算指标名称排序"`
-	CreateTime         time.Time `description:"创建时间"`
-	ModifyTime         time.Time `description:"修改时间"`
+	EdbInfoCalculateId int       `gorm:"primaryKey;autoIncrement;column:edb_info_calculate_mapping_id"`
+	EdbInfoId          int       `gorm:"column:edb_info_id" description:"计算指标id"`
+	EdbCode            string    `gorm:"column:edb_code" description:"计算指标编码"`
+	FromEdbInfoId      int       `gorm:"column:from_edb_info_id" description:"基础指标id"`
+	FromEdbCode        string    `gorm:"column:from_edb_code" description:"基础指标编码"`
+	FromEdbName        string    `gorm:"column:from_edb_name" description:"基础指标名称"`
+	FromSource         int       `gorm:"column:from_source" description:"基础指标来源"`
+	FromSourceName     string    `gorm:"column:from_source_name" description:"基础指标来源名称"`
+	Sort               int       `gorm:"column:sort" description:"计算指标名称排序"`
+	CreateTime         time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime         time.Time `gorm:"column:modify_time" description:"修改时间"`
+	FromTag            string    `gorm:"column:from_tag" description:"来源指标标签"`
 	StartDate          string    `description:"开始日期"`
 	EndDate            string    `description:"结束日期"`
 	EdbType            int       `description:"指标类型:1:基础指标,2:计算指标"`

+ 12 - 12
models/edb_info_record.go

@@ -6,18 +6,18 @@ import (
 )
 
 type EdbInfoRecord struct {
-	EdbInfoRecordId     int       `gorm:"primaryKey;autoIncrement;column:edb_info_record_id"`
-	EdbInfoId           int       `orm:"column(edb_info_id)"`
-	OldEdbName          string    `description:"旧的指标名称"`
-	OldFrequency        string    `description:"旧的频率"`
-	OldUnit             string    `description:"旧的单位"`
-	NewEdbName          string    `description:"新的指标名称"`
-	NewFrequency        string    `description:"新的频率"`
-	NewUnit             string    `description:"新的单位"`
-	OperateUserId       int       `description:"执行人id"`
-	OperateUserRealName string    `description:"执行人名称"`
-	CreateTime          time.Time `description:"记录的生成时间"`
-	Timestamp           int64     `description:"时间戳"`
+	EdbInfoRecordId     int       `gorm:"primaryKey;autoIncrement;column:edb_info_record_id" description:"唯一记录ID"`
+	EdbInfoId           int       `gorm:"column:edb_info_id" description:"指标ID"`
+	OldEdbName          string    `gorm:"column:old_edb_name" description:"旧的指标名称"`
+	OldFrequency        string    `gorm:"column:old_frequency" description:"旧的频率"`
+	OldUnit             string    `gorm:"column:old_unit" description:"旧的单位"`
+	NewEdbName          string    `gorm:"column:new_edb_name" description:"新的指标名称"`
+	NewFrequency        string    `gorm:"column:new_frequency" description:"新的频率"`
+	NewUnit             string    `gorm:"column:new_unit" description:"新的单位"`
+	OperateUserId       int       `gorm:"column:operate_user_id" description:"执行人id"`
+	OperateUserRealName string    `gorm:"column:operate_user_real_name" description:"执行人名称"`
+	CreateTime          time.Time `gorm:"column:create_time" description:"记录的生成时间"`
+	Timestamp           int64     `gorm:"column:timestamp" description:"时间戳"`
 }
 
 func AddEditEdbInfoRcord(edbRecord *EdbInfoRecord) (e error) {

+ 15 - 15
models/edb_info_relation.go

@@ -9,21 +9,21 @@ import (
 
 type EdbInfoRelation struct {
 	EdbInfoRelationId  int       `gorm:"primaryKey;autoIncrement;column:edb_info_relation_id"`
-	EdbInfoId          int       `description:"指标id"`
-	Source             int       `description:"来源:1:同花顺,2:wind,3:彭博,4:指标运算,5:累计值转月,6:同比值,7:同差值,8:N数值移动平均计算,9:手工指标,10:隆众"`
-	EdbName            string    `description:"指标名称"`
-	EdbCode            string    `description:"指标编码"`
-	ReferObjectId      int       `description:"引用对象ID(图表ID,ETA逻辑ID等)"`
-	ReferObjectType    int       `description:"引用对象ID类型(1.图表,2.ETA逻辑)"`
-	ReferObjectSubType int       `description:"引用对象子类"`
-	CreateTime         time.Time `description:"创建时间"`
-	ModifyTime         time.Time `description:"修改时间"`
-	RelationTime       time.Time `description:"引用时间"`
-	RelationType       int       `description:"引用类型,0:直接饮用,1间接引用"`
-	RootEdbInfoId      int       `description:"间接引用时,关联的直接引用的指标ID"`
-	ChildEdbInfoId     int       `description:"间接引用时,计算指标直接关联的指标ID"`
-	RelationCode       string    `description:"引用标识"`
-	ParentRelationId   int       `description:"间接引用关联的直接引用的ID"`
+	EdbInfoId          int       `gorm:"column:edb_info_id" description:"指标id"`
+	Source             int       `gorm:"column:source" description:"来源:1:同花顺,2:wind,3:彭博,4:指标运算,5:累计值转月,6:同比值,7:同差值,8:N数值移动平均计算,9:手工指标,10:隆众"`
+	EdbName            string    `gorm:"column:edb_name" description:"指标名称"`
+	EdbCode            string    `gorm:"column:edb_code" description:"指标编码"`
+	ReferObjectId      int       `gorm:"column:refer_object_id" description:"引用对象ID(图表ID,ETA逻辑ID等)"`
+	ReferObjectType    int       `gorm:"column:refer_object_type" description:"引用对象ID类型(1.图表,2.ETA逻辑)"`
+	ReferObjectSubType int       `gorm:"column:refer_object_sub_type" description:"引用对象子类"`
+	CreateTime         time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime         time.Time `gorm:"column:modify_time" description:"修改时间"`
+	RelationTime       time.Time `gorm:"column:relation_time" description:"引用时间"`
+	RelationType       int       `gorm:"column:relation_type" description:"引用类型,0:直接引用,1间接引用"`
+	RootEdbInfoId      int       `gorm:"column:root_edb_info_id" description:"间接引用时,关联的直接引用的指标ID"`
+	ChildEdbInfoId     int       `gorm:"column:child_edb_info_id" description:"间接引用时,计算指标直接关联的指标ID"`
+	RelationCode       string    `gorm:"column:relation_code" description:"引用标识"`
+	ParentRelationId   int       `gorm:"column:parent_relation_id" description:"间接引用关联的直接引用的ID"`
 }
 
 func (e *EdbInfoRelation) TableName() string {

+ 6 - 6
models/edb_python_code.go

@@ -7,12 +7,12 @@ import (
 
 // EdbPythonCode python指标运算代码
 type EdbPythonCode struct {
-	EdbPythonCodeId int    `gorm:"primaryKey;autoIncrement;column:edb_python_code_id"`
-	EdbInfoId       int    `description:"指标id"`
-	EdbCode         string `description:"指标编码"`
-	PythonCode      string `description:"python代码"`
-	ModifyTime      time.Time
-	CreateTime      time.Time
+	EdbPythonCodeId int       `gorm:"primaryKey;autoIncrement;column:edb_python_code_id"`
+	EdbInfoId       int       `gorm:"column:edb_info_id" description:"指标id"`
+	EdbCode         string    `gorm:"column:edb_code" description:"指标编码"`
+	PythonCode      string    `gorm:"column:python_code" description:"python代码"`
+	ModifyTime      time.Time `gorm:"column:modify_time"`
+	CreateTime      time.Time `gorm:"column:create_time"`
 }
 
 // Update 更新EdbPythonCode信息

+ 7 - 7
models/edb_refresh/edb_refresh_config.go

@@ -10,13 +10,13 @@ import (
 // @Description: 指标的刷新时间配置表
 type EdbRefreshConfig struct {
 	EdbRefreshConfigId  int       `gorm:"primaryKey;autoIncrement;column:edb_refresh_config_id"`
-	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:"添加时间"`
+	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

+ 11 - 11
models/edb_refresh/edb_refresh_default_config.go

@@ -10,17 +10,17 @@ import (
 // EdbRefreshDefaultConfig
 // @Description: 指标的默认刷新时间配置表
 type EdbRefreshDefaultConfig struct {
-	Id                  int       `gorm:"primaryKey;autoIncrement;column:id"`
-	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

+ 26 - 26
models/edb_refresh/edb_refresh_mapping.go

@@ -10,15 +10,15 @@ import (
 // EdbRefreshMapping
 // @Description: 指标刷新时间配置关系表
 type EdbRefreshMapping struct {
-	EdbRefreshMappingId int       `gorm:"primaryKey;autoIncrement;column:edb_refresh_mapping_id"`
-	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
@@ -63,23 +63,23 @@ func (m *EdbRefreshMapping) Delete() (err error) {
 
 type EdbInfoListAndRefreshConfig struct {
 	EdbInfoId          int       `gorm:"primaryKey;autoIncrement;column:edb_info_id"`
-	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:"刷新的期数"`
+	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

+ 9 - 9
models/edb_refresh/edb_refresh_source.go

@@ -8,20 +8,20 @@ import (
 // EdbRefreshSource
 // @Description: 刷新的数据源表
 type EdbRefreshSource struct {
-	Id            int       `gorm:"primaryKey;autoIncrement;column:id"`
-	Source        int       `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:"子来源名称"`

+ 10 - 10
models/edb_terminal.go

@@ -8,16 +8,16 @@ import (
 
 // EdbTerminal 指标终端
 type EdbTerminal struct {
-	TerminalId   int       `gorm:"primaryKey;autoIncrement;column:terminal_id"`
-	Source       int       `orm:"column(source)" description:"指标来源类型"`
-	Name         string    `description:"终端别名"`
-	TerminalCode string    `description:"终端编码,用于配置在机器上"`
-	ServerUrl    string    `description:"终端地址"`
-	Num          int       `description:"终端最大指标数"`
-	Status       int       `description:"状态,1启用,2禁用"`
-	Value        string    `description:"终端相关的凭证"`
-	ModifyTime   time.Time `description:"修改时间"`
-	CreateTime   time.Time `description:"创建时间"`
+	TerminalId   int       `gorm:"primaryKey;autoIncrement;column:terminal_id" description:"终端ID"`
+	Source       int       `gorm:"column:source" description:"指标来源类型"`
+	Name         string    `gorm:"column:name" description:"终端别名"`
+	TerminalCode string    `gorm:"column:terminal_code" description:"终端编码,用于配置在机器上"`
+	ServerUrl    string    `gorm:"column:server_url" description:"终端地址"`
+	Num          int       `gorm:"column:num" description:"终端最大指标数"`
+	Status       int       `gorm:"column:status" description:"状态,1启用,2禁用"`
+	Value        string    `gorm:"column:value" description:"终端相关的凭证"`
+	ModifyTime   time.Time `gorm:"column:modify_time" description:"修改时间"`
+	CreateTime   time.Time `gorm:"column:create_time" description:"创建时间"`
 }
 
 // GetEdbTerminalListBySource 根据指标来源类型获取所有的终端列表

+ 12 - 12
models/excel/excel_classify.go

@@ -7,18 +7,18 @@ import (
 
 // ExcelClassify excel表格分类
 type ExcelClassify struct {
-	ExcelClassifyId   int       `gorm:"primaryKey;autoIncrement;column:excel_classify_id"`
-	Source            int       `description:"表格来源,1:excel插件的表格,2:自定义表格,3:混合表格,4:自定义分析,默认:1"`
-	ExcelClassifyName string    `description:"分类名称"`
-	ParentId          int       `description:"父级id"`
-	SysUserId         int       `description:"创建人id"`
-	SysUserRealName   string    `description:"创建人姓名"`
-	Level             int       `description:"层级"`
-	UniqueCode        string    `description:"唯一编码"`
-	Sort              int       `description:"排序字段,越小越靠前,默认值:10"`
-	IsDelete          int       `description:"排序字段,越小越靠前,默认值:10"`
-	CreateTime        time.Time `description:"创建时间"`
-	ModifyTime        time.Time `description:"修改时间"`
+	ExcelClassifyId   int       `gorm:"primaryKey;autoIncrement;column:excel_classify_id" description:"表格分类ID"`
+	Source            int       `gorm:"column:source" description:"表格来源,1:excel插件的表格,2:自定义表格,3:混合表格,4:自定义分析,默认:1"`
+	ExcelClassifyName string    `gorm:"column:excel_classify_name" description:"分类名称"`
+	ParentId          int       `gorm:"column:parent_id" description:"父级id"`
+	SysUserId         int       `gorm:"column:sys_user_id" description:"创建人id"`
+	SysUserRealName   string    `gorm:"column:sys_user_real_name" description:"创建人姓名"`
+	Level             int       `gorm:"column:level" description:"层级"`
+	UniqueCode        string    `gorm:"column:unique_code" description:"唯一编码"`
+	Sort              int       `gorm:"column:sort" description:"排序字段,越小越靠前,默认值:10"`
+	IsDelete          int       `gorm:"column:is_delete" description:"是否删除,0:未删除,1:已删除(注意:这里的描述可能与原字段名IsDelete的注释不完全一致,已根据常见用法调整)"`
+	CreateTime        time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime        time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
 
 // AddExcelClassify 添加excel分类

+ 5 - 5
models/excel/excel_edb_mapping.go

@@ -8,11 +8,11 @@ import (
 // ExcelEdbMapping excel与指标的关系表
 type ExcelEdbMapping struct {
 	ExcelEdbMappingId int       `gorm:"primaryKey;autoIncrement;column:excel_edb_mapping_id"`
-	ExcelInfoId       int       `description:"excel的id"`
-	Source            int       `description:"表格来源,1:excel插件的表格,2:自定义表格,3:混合表格,4:自定义分析,默认:1"`
-	EdbInfoId         int       `description:"计算指标id"`
-	CreateTime        time.Time `description:"创建时间"`
-	ModifyTime        time.Time `description:"修改时间"`
+	ExcelInfoId       int       `gorm:"column:excel_info_id" description:"excel的id"`
+	Source            int       `gorm:"column:source" description:"表格来源,1:excel插件的表格,2:自定义表格,3:混合表格,4:自定义分析,默认:1"`
+	EdbInfoId         int       `gorm:"column:edb_info_id" description:"计算指标id"`
+	CreateTime        time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime        time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
 
 // AddExcelEdbMappingMulti 批量添加excel与指标的关系

+ 14 - 14
models/excel/excel_info.go

@@ -8,20 +8,20 @@ import (
 // ExcelInfo excel表格详情表
 type ExcelInfo struct {
 	ExcelInfoId     int       `gorm:"primaryKey;autoIncrement;column:excel_info_id"`
-	Source          int       `description:"表格来源,1:excel插件的表格,2:自定义表格,3:混合表格,4:自定义分析,默认:1"`
-	ExcelType       int       `description:"表格类型,1:指标列,2:日期列,默认:1"`
-	ExcelName       string    `description:"表格名称"`
-	UniqueCode      string    `description:"表格唯一编码"`
-	ExcelClassifyId int       `description:"表格分类id"`
-	SysUserId       int       `description:"操作人id"`
-	SysUserRealName string    `description:"操作人真实姓名"`
-	Content         string    `description:"表格内容"`
-	ExcelImage      string    `description:"表格图片"`
-	FileUrl         string    `description:"表格下载地址"`
-	Sort            int       `description:"排序字段,数字越小越排前面"`
-	IsDelete        int       `description:"是否删除,0:未删除,1:已删除"`
-	ModifyTime      time.Time `description:"最近修改日期"`
-	CreateTime      time.Time `description:"创建日期"`
+	Source          int       `gorm:"column:source" description:"表格来源,1:excel插件的表格,2:自定义表格,3:混合表格,4:自定义分析,默认:1"`
+	ExcelType       int       `gorm:"column:excel_type" description:"表格类型,1:指标列,2:日期列,默认:1"`
+	ExcelName       string    `gorm:"column:excel_name" description:"表格名称"`
+	UniqueCode      string    `gorm:"column:unique_code" description:"表格唯一编码"`
+	ExcelClassifyId int       `gorm:"column:excel_classify_id" description:"表格分类id"`
+	SysUserId       int       `gorm:"column:sys_user_id" description:"操作人id"`
+	SysUserRealName string    `gorm:"column:sys_user_real_name" description:"操作人真实姓名"`
+	Content         string    `gorm:"column:content" description:"表格内容"`
+	ExcelImage      string    `gorm:"column:excel_image" description:"表格图片"`
+	FileUrl         string    `gorm:"column:file_url" description:"表格下载地址"`
+	Sort            int       `gorm:"column:sort" description:"排序字段,数字越小越排前面"`
+	IsDelete        int       `gorm:"column:is_delete" description:"是否删除,0:未删除,1:已删除"`
+	ModifyTime      time.Time `gorm:"column:modify_time" description:"最近修改日期"`
+	CreateTime      time.Time `gorm:"column:create_time" description:"创建日期"`
 }
 
 // GetNoContentExcelInfoAll 获取不含content的表格列表 用于分类展示

+ 6 - 6
models/factor_edb_series.go

@@ -18,12 +18,12 @@ const (
 // FactorEdbSeries 因子指标系列表
 type FactorEdbSeries struct {
 	FactorEdbSeriesId int       `gorm:"primaryKey;autoIncrement;column:factor_edb_series_id"`
-	SeriesName        string    `description:"系列名称"`
-	EdbInfoType       int       `description:"关联指标类型:0-普通指标;1-预测指标"`
-	CalculateStep     string    `description:"计算步骤-JSON"`
-	CalculateState    int       `description:"计算状态: 0-无计算; 1-计算中; 2-计算完成"`
-	CreateTime        time.Time `description:"创建时间"`
-	ModifyTime        time.Time `description:"修改时间"`
+	SeriesName        string    `gorm:"column:series_name" description:"系列名称"`
+	EdbInfoType       int       `gorm:"column:edb_info_type" description:"关联指标类型:0-普通指标;1-预测指标"`
+	CalculateStep     string    `gorm:"column:calculate_step" description:"计算步骤-JSON"`
+	CalculateState    int       `gorm:"column:calculate_state" description:"计算状态: 0-无计算; 1-计算中; 2-计算完成"`
+	CreateTime        time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime        time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
 
 func (m *FactorEdbSeries) TableName() string {

+ 9 - 9
models/factor_edb_series_calculate_data.go

@@ -10,15 +10,15 @@ import (
 
 // FactorEdbSeriesCalculateData 因子指标系列-指标计算数据表
 type FactorEdbSeriesCalculateData struct {
-	FactorEdbSeriesCalculateDataId int       `gorm:"primaryKey;autoIncrement;column:factor_edb_series_calculate_data_id"`
-	FactorEdbSeriesId              int       `description:"因子指标系列ID"`
-	EdbInfoId                      int       `description:"指标ID"`
-	EdbCode                        string    `description:"指标编码"`
-	DataTime                       time.Time `description:"数据日期"`
-	Value                          float64   `description:"数据值"`
-	CreateTime                     time.Time `description:"创建时间"`
-	ModifyTime                     time.Time `description:"修改时间"`
-	DataTimestamp                  int64     `description:"数据日期时间戳"`
+	FactorEdbSeriesCalculateDataId int       `gorm:"primaryKey;autoIncrement;column:factor_edb_series_calculate_data_id" description:"因子指标系列计算数据ID"`
+	FactorEdbSeriesId              int       `gorm:"column:factor_edb_series_id" description:"因子指标系列ID"`
+	EdbInfoId                      int       `gorm:"column:edb_info_id" description:"指标ID"`
+	EdbCode                        string    `gorm:"column:edb_code" description:"指标编码"`
+	DataTime                       time.Time `gorm:"column:data_time" description:"数据日期"`
+	Value                          float64   `gorm:"column:value" description:"数据值"`
+	CreateTime                     time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime                     time.Time `gorm:"column:modify_time" description:"修改时间"`
+	DataTimestamp                  int64     `gorm:"column:data_timestamp" description:"数据日期时间戳"`
 }
 
 func (m *FactorEdbSeriesCalculateData) TableName() string {

+ 9 - 9
models/factor_edb_series_calculate_data_qjjs.go

@@ -10,15 +10,15 @@ import (
 
 // FactorEdbSeriesCalculateDataQjjs 因子指标系列-区间计算数据表
 type FactorEdbSeriesCalculateDataQjjs struct {
-	FactorEdbSeriesCalculateDataId int       `gorm:"primaryKey;autoIncrement;column:factor_edb_series_calculate_data_id"`
-	FactorEdbSeriesId              int       `description:"因子指标系列ID"`
-	EdbInfoId                      int       `description:"指标ID"`
-	EdbCode                        string    `description:"指标编码"`
-	DataTime                       time.Time `description:"数据日期"`
-	Value                          float64   `description:"数据值"`
-	CreateTime                     time.Time `description:"创建时间"`
-	ModifyTime                     time.Time `description:"修改时间"`
-	DataTimestamp                  int64     `description:"数据日期时间戳"`
+	FactorEdbSeriesCalculateDataId int       `gorm:"primaryKey;autoIncrement;column:factor_edb_series_calculate_data_id_qjjs" description:"因子指标系列区间计算数据ID"`
+	FactorEdbSeriesId              int       `gorm:"column:factor_edb_series_id_qjjs" description:"因子指标系列ID"`
+	EdbInfoId                      int       `gorm:"column:edb_info_id_qjjs" description:"指标ID"`
+	EdbCode                        string    `gorm:"column:edb_code_qjjs" description:"指标编码"`
+	DataTime                       time.Time `gorm:"column:data_time_qjjs" description:"数据日期"`
+	Value                          float64   `gorm:"column:value_qjjs" description:"数据值"`
+	CreateTime                     time.Time `gorm:"column:create_time_qjjs" description:"创建时间"`
+	ModifyTime                     time.Time `gorm:"column:modify_time_qjjs" description:"修改时间"`
+	DataTimestamp                  int64     `gorm:"column:data_timestamp_qjjs" description:"数据日期时间戳"`
 }
 
 func (m *FactorEdbSeriesCalculateDataQjjs) TableName() string {

+ 6 - 6
models/factor_edb_series_calculate_func.go

@@ -10,12 +10,12 @@ import (
 
 // FactorEdbSeriesCalculateFunc 多因子系列-计算方式表
 type FactorEdbSeriesCalculateFunc struct {
-	FactorEdbSeriesCalculateFuncId int       `gorm:"primaryKey;autoIncrement;column:factor_edb_series_calculate_func_id"`
-	CalculateName                  string    `description:"计算方式名称"`
-	Source                         int       `description:"计算方式来源"`
-	EdbInfoType                    int       `description:"指标计算类型:0-普通指标;1-预测指标"`
-	CreateTime                     time.Time `description:"创建时间"`
-	ModifyTime                     time.Time `description:"修改时间"`
+	FactorEdbSeriesCalculateFuncId int       `gorm:"primaryKey;autoIncrement;column:factor_edb_series_calculate_func_id" description:"多因子系列计算方式ID"`
+	CalculateName                  string    `gorm:"column:calculate_name" description:"计算方式名称"`
+	Source                         int       `gorm:"column:source" description:"计算方式来源"`
+	EdbInfoType                    int       `gorm:"column:edb_info_type" description:"指标计算类型:0-普通指标;1-预测指标"`
+	CreateTime                     time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime                     time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
 
 func (m *FactorEdbSeriesCalculateFunc) TableName() string {

+ 11 - 11
models/factor_edb_series_chart_mapping.go

@@ -15,17 +15,17 @@ const (
 
 // FactorEdbSeriesChartMapping 因子指标系列-图表关联
 type FactorEdbSeriesChartMapping struct {
-	FactorEdbSeriesChartMappingId int       `gorm:"primaryKey;autoIncrement;column:factor_edb_series_chart_mapping_id"`
-	ChartInfoId                   int       `description:"图表ID"`
-	Source                        int       `description:"图表来源, 同chart_info表source"`
-	CalculateType                 int       `description:"计算方式: 1-相关性"`
-	CalculatePars                 string    `description:"计算参数-JSON(如计算窗口等)"`
-	CalculateData                 string    `description:"计算数据-JSON(如相关性矩阵等)"`
-	FactorEdbSeriesId             int       `description:"因子指标系列ID"`
-	EdbInfoId                     int       `description:"指标ID"`
-	EdbUsed                       int       `description:"指标是否使用: 0-否; 1-是"`
-	CreateTime                    time.Time `description:"创建时间"`
-	ModifyTime                    time.Time `description:"修改时间"`
+	FactorEdbSeriesChartMappingId int       `gorm:"primaryKey;autoIncrement;column:factor_edb_series_chart_mapping_id" description:"因子指标系列图表映射ID"`
+	ChartInfoId                   int       `gorm:"column:chart_info_id" description:"图表ID"`
+	Source                        int       `gorm:"column:source" description:"图表来源, 同chart_info表source"`
+	CalculateType                 int       `gorm:"column:calculate_type" description:"计算方式: 1-相关性"`
+	CalculatePars                 string    `gorm:"column:calculate_pars" description:"计算参数-JSON(如计算窗口等)"`
+	CalculateData                 string    `gorm:"column:calculate_data" description:"计算数据-JSON(如相关性矩阵等)"`
+	FactorEdbSeriesId             int       `gorm:"column:factor_edb_series_id" description:"因子指标系列ID"`
+	EdbInfoId                     int       `gorm:"column:edb_info_id" description:"指标ID"`
+	EdbUsed                       int       `gorm:"column:edb_used" description:"指标是否使用: 0-否; 1-是"`
+	CreateTime                    time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime                    time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
 
 func (m *FactorEdbSeriesChartMapping) TableName() string {

+ 6 - 6
models/factor_edb_series_mapping.go

@@ -10,12 +10,12 @@ import (
 
 // FactorEdbSeriesMapping 因子指标系列-指标关联表
 type FactorEdbSeriesMapping struct {
-	FactorEdbSeriesMappingId int       `gorm:"primaryKey;autoIncrement;column:factor_edb_series_mapping_id"`
-	FactorEdbSeriesId        int       `description:"因子指标系列ID"`
-	EdbInfoId                int       `description:"指标ID"`
-	EdbCode                  string    `description:"指标编码"`
-	CreateTime               time.Time `description:"创建时间"`
-	ModifyTime               time.Time `description:"修改时间"`
+	FactorEdbSeriesMappingId int       `gorm:"primaryKey;autoIncrement;column:factor_edb_series_mapping_id" description:"因子指标系列映射ID"`
+	FactorEdbSeriesId        int       `gorm:"column:factor_edb_series_id" description:"因子指标系列ID"`
+	EdbInfoId                int       `gorm:"column:edb_info_id" description:"指标ID"`
+	EdbCode                  string    `gorm:"column:edb_code" description:"指标编码"`
+	CreateTime               time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime               time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
 
 func (m *FactorEdbSeriesMapping) TableName() string {