Browse Source

数据库迁移:为主键添加`primaryKey`注解

对数据库模型中的主键字段添加了`gorm:"primaryKey"`注解,以明确标识主键列。此次变更增强了数据库模型的可读性及可维护性,确保了主键在各种数据库操作中的正确识别与处理。
Roc 5 months ago
parent
commit
8339603763
100 changed files with 240 additions and 243 deletions
  1. 3 4
      models/ai_summary/ai_pormpt.go
  2. 2 2
      models/ai_summary/ai_summary.go
  3. 1 3
      models/ai_summary/ai_summary_classify.go
  4. 2 2
      models/aimod/ai.go
  5. 1 1
      models/aimod/file_upload_record.go
  6. 1 1
      models/api_uri.go
  7. 1 1
      models/business_conf.go
  8. 1 1
      models/business_conf_operation_record.go
  9. 1 1
      models/chart_permission.go
  10. 2 2
      models/classify.go
  11. 1 1
      models/classify_menu.go
  12. 1 1
      models/classify_menu_relation.go
  13. 1 1
      models/cloud_disk_menu.go
  14. 1 1
      models/cloud_disk_resource.go
  15. 1 1
      models/company/company.go
  16. 2 2
      models/data_manage/baiinfo_data.go
  17. 3 3
      models/data_manage/base_from_baiinfo.go
  18. 1 1
      models/data_manage/base_from_baiinfo_classify.go
  19. 2 2
      models/data_manage/base_from_bloomberg_index.go
  20. 1 1
      models/data_manage/base_from_business_data.go
  21. 4 4
      models/data_manage/base_from_business_index.go
  22. 4 4
      models/data_manage/base_from_ccf.go
  23. 1 1
      models/data_manage/base_from_ccf_classify.go
  24. 1 1
      models/data_manage/base_from_edb_mapping.go
  25. 6 6
      models/data_manage/base_from_eia_stero.go
  26. 4 4
      models/data_manage/base_from_fenwei.go
  27. 1 1
      models/data_manage/base_from_fenwei_classify.go
  28. 5 5
      models/data_manage/base_from_mtjh.go
  29. 1 1
      models/data_manage/base_from_national_statistics_classify.go
  30. 1 1
      models/data_manage/base_from_national_statistics_data.go
  31. 1 1
      models/data_manage/base_from_national_statistics_index.go
  32. 1 1
      models/data_manage/base_from_oilchem.go
  33. 3 3
      models/data_manage/base_from_sci.go
  34. 1 1
      models/data_manage/base_from_sci_classify.go
  35. 2 2
      models/data_manage/base_from_sci_hq_classify.go
  36. 1 1
      models/data_manage/base_from_sci_hq_data.go
  37. 2 2
      models/data_manage/base_from_sci_hq_index.go
  38. 4 4
      models/data_manage/base_from_smm.go
  39. 1 1
      models/data_manage/base_from_smm_classify.go
  40. 1 1
      models/data_manage/base_from_ths_hf.go
  41. 1 1
      models/data_manage/base_from_ths_hf_classify.go
  42. 1 1
      models/data_manage/base_from_ths_hf_data.go
  43. 11 11
      models/data_manage/base_from_trade_index.go
  44. 4 4
      models/data_manage/base_from_yongyi.go
  45. 1 1
      models/data_manage/base_from_yongyi_classify.go
  46. 1 1
      models/data_manage/ccf_stock_classify.go
  47. 1 1
      models/data_manage/ccf_stock_excel.go
  48. 2 2
      models/data_manage/chart_classify.go
  49. 1 1
      models/data_manage/chart_edb_mapping.go
  50. 1 1
      models/data_manage/chart_framework.go
  51. 1 1
      models/data_manage/chart_framework_node.go
  52. 3 3
      models/data_manage/chart_info.go
  53. 1 1
      models/data_manage/chart_info_correlation.go
  54. 1 1
      models/data_manage/chart_info_log.go
  55. 1 1
      models/data_manage/chart_series.go
  56. 1 1
      models/data_manage/chart_series_edb_mapping.go
  57. 2 2
      models/data_manage/chart_theme/chart_theme.go
  58. 1 1
      models/data_manage/chart_theme/chart_theme_default_data.go
  59. 1 1
      models/data_manage/chart_theme/chart_theme_type.go
  60. 1 1
      models/data_manage/chart_type.go
  61. 1 1
      models/data_manage/coal_data.go
  62. 1 1
      models/data_manage/com_trade_country.go
  63. 2 2
      models/data_manage/com_trade_data.go
  64. 2 2
      models/data_manage/com_trade_index.go
  65. 1 1
      models/data_manage/cross_variety/chart_info_cross_variety.go
  66. 2 2
      models/data_manage/cross_variety/chart_tag.go
  67. 2 2
      models/data_manage/cross_variety/chart_tag_variety.go
  68. 1 1
      models/data_manage/cross_variety/chart_variety.go
  69. 1 1
      models/data_manage/cross_variety/chart_variety_mapping.go
  70. 16 16
      models/data_manage/data_manage_permission/chart.go
  71. 8 8
      models/data_manage/data_manage_permission/classify_no_auth_record.go
  72. 17 17
      models/data_manage/data_manage_permission/edb.go
  73. 16 16
      models/data_manage/data_manage_permission/excel.go
  74. 1 1
      models/data_manage/data_manage_permission/message.go
  75. 12 12
      models/data_manage/data_manage_permission/move_record.go
  76. 9 9
      models/data_manage/data_manage_permission/no_auth_record.go
  77. 1 1
      models/data_manage/data_manage_permission/req_and_resp.go
  78. 2 2
      models/data_manage/edb_classify.go
  79. 1 1
      models/data_manage/edb_data_baiinfo.go
  80. 1 1
      models/data_manage/edb_data_base.go
  81. 2 2
      models/data_manage/edb_data_cffex.go
  82. 2 2
      models/data_manage/edb_data_coal.go
  83. 2 2
      models/data_manage/edb_data_dl.go
  84. 1 1
      models/data_manage/edb_data_from_python.go
  85. 1 1
      models/data_manage/edb_data_gie.go
  86. 1 1
      models/data_manage/edb_data_insert_config.go
  87. 1 1
      models/data_manage/edb_data_manual.go
  88. 1 1
      models/data_manage/edb_data_oilchem.go
  89. 1 1
      models/data_manage/edb_data_pb.go
  90. 1 1
      models/data_manage/edb_data_sci99.go
  91. 2 2
      models/data_manage/edb_data_sh.go
  92. 2 2
      models/data_manage/edb_data_shfe.go
  93. 1 1
      models/data_manage/edb_data_ths.go
  94. 1 1
      models/data_manage/edb_data_wind.go
  95. 1 1
      models/data_manage/edb_data_ys.go
  96. 2 2
      models/data_manage/edb_data_zz.go
  97. 4 4
      models/data_manage/edb_info.go
  98. 2 2
      models/data_manage/edb_info_calculate.go
  99. 3 3
      models/data_manage/edb_info_calculate_mapping.go
  100. 1 1
      models/data_manage/edb_info_log.go

+ 3 - 4
models/ai_summary/ai_pormpt.go

@@ -6,7 +6,7 @@ import (
 )
 
 type AiPrompt struct {
-	AiPromptId    int       `orm:"column(ai_prompt_id);pk"` // ai纪要提示词id
+	AiPromptId    int       `orm:"column(ai_prompt_id);pk" gorm:"primaryKey" ` // ai纪要提示词id
 	PromptContent string    // 原始内容
 	SysAdminId    int       // 创建人ID
 	SysAdminName  string    // 创建人姓名
@@ -18,7 +18,7 @@ type AiPrompt struct {
 }
 
 type AiPromptItem struct {
-	AiPromptId    int    `orm:"column(ai_prompt_id);pk"` // ai纪要提示词id
+	AiPromptId    int    `orm:"column(ai_prompt_id);pk" gorm:"primaryKey" ` // ai纪要提示词id
 	PromptContent string // 原始内容
 	SysAdminId    int    // 创建人ID
 	SysAdminName  string // 创建人姓名
@@ -115,7 +115,6 @@ func GetAiPromptMaxSort(adminId int) (sort int, err error) {
 	return
 }
 
-
 // MoveDownPromptBySort 往下移动提示词
 func MoveDownPromptBySort(sysAdminId, prevSort, currentSort int) (err error) {
 	o := orm.NewOrm()
@@ -130,4 +129,4 @@ func MoveUpPromptBySort(sysAdminId, nextSort, currentSort int) (err error) {
 	sql := `update ai_prompt set sort = sort + 1 where sys_admin_id = ? and sort >= ? and sort< ?`
 	_, err = o.Raw(sql, sysAdminId, nextSort, currentSort).Exec()
 	return
-}
+}

+ 2 - 2
models/ai_summary/ai_summary.go

@@ -7,7 +7,7 @@ import (
 )
 
 type AiSummary struct {
-	AiSummaryId     int       `orm:"column(ai_summary_id);pk"` // ai纪要id
+	AiSummaryId     int       `orm:"column(ai_summary_id);pk" gorm:"primaryKey" ` // ai纪要id
 	SaDocId         int       // 文档ID
 	OriginContent   string    // 原始内容
 	SummaryContent  string    // 纪要内容
@@ -24,7 +24,7 @@ type AiSummary struct {
 }
 
 type AiSummaryItems struct {
-	AiSummaryId     int    `orm:"column(ai_summary_id);pk"` // ai纪要id
+	AiSummaryId     int    `orm:"column(ai_summary_id);pk" gorm:"primaryKey" ` // ai纪要id
 	SaDocId         int    // 文档ID
 	OriginContent   string // 原始内容
 	OriginTitle     string // 原文标题

+ 1 - 3
models/ai_summary/ai_summary_classify.go

@@ -8,7 +8,7 @@ import (
 )
 
 type AiSummaryClassify struct {
-	AiSummaryClassifyId int       `orm:"column(ai_summary_classify_id);pk"` // ai纪要分类id
+	AiSummaryClassifyId int       `orm:"column(ai_summary_classify_id);pk" gorm:"primaryKey" ` // ai纪要分类id
 	ClassifyName        string    // 分类名称
 	ParentId            int       // 父级id
 	CreateTime          time.Time // 创建时间
@@ -327,5 +327,3 @@ func GetAiSummaryClassifyAll() (items []*AiSummaryClassifyItems, err error) {
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
-
-

+ 2 - 2
models/aimod/ai.go

@@ -7,7 +7,7 @@ import (
 )
 
 type AiChatTopic struct {
-	AiChatTopicId   int `orm:"column(ai_chat_topic_id);pk"`
+	AiChatTopicId   int `orm:"column(ai_chat_topic_id);pk" gorm:"primaryKey" `
 	TopicName       string
 	SysUserId       int
 	SysUserRealName string
@@ -18,7 +18,7 @@ type AiChatTopic struct {
 }
 
 type AiChat struct {
-	AiChatId        int `orm:"column(ai_chat_id);pk"`
+	AiChatId        int `orm:"column(ai_chat_id);pk" gorm:"primaryKey"`
 	AiChatTopicId   int
 	Ask             string
 	AskUuid         string

+ 1 - 1
models/aimod/file_upload_record.go

@@ -6,7 +6,7 @@ import (
 )
 
 type FileUploadRecord struct {
-	FileUploadRecordId  int       `orm:"column(file_upload_record_id);pk"`
+	FileUploadRecordId  int       `orm:"column(file_upload_record_id);pk" gorm:"primaryKey" `
 	AdminId             int       `description:"用户id"`
 	FileUrl             string    `description:"文件地址"`
 	FileName            string    `description:"文件名称"`

+ 1 - 1
models/api_uri.go

@@ -11,7 +11,7 @@ type ApiUriTest struct {
 	ParentMenu     string `gorm:"column:parent_menu"`      // 一级菜单
 	ChildMenu      string `gorm:"column:child_menu"`       // 二级菜单
 	ButtonName     string `gorm:"column:button_name"`      // 按钮名称
-	Id             int    `gorm:"column:id;primaryKey"`    // `orm:"column(id);pk"`
+	Id             int    `gorm:"column:id;primaryKey"`    // `orm:"column(id);pk" gorm:"primaryKey" `
 	IsPublic       int    `gorm:"column:is_public"`        // 是否公共api,0否,1是
 	ChildChildMenu string `gorm:"column:child_child_menu"` // 三级菜单
 }

+ 1 - 1
models/business_conf.go

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

+ 1 - 1
models/business_conf_operation_record.go

@@ -10,7 +10,7 @@ import (
 
 // BusinessConfOperationRecord 商户配置操作记录表
 type BusinessConfOperationRecord struct {
-	Id          int       //`orm:"column(id);pk"`
+	Id          int       //`orm:"column(id);pk" gorm:"primaryKey" `
 	SysUserId   int       //`description:"操作人ID"`
 	SysRealName string    //`description:"操作人姓名"`
 	Content     string    //`description:"操作数据"`

+ 1 - 1
models/chart_permission.go

@@ -13,7 +13,7 @@ const (
 
 // ChartPermission 报告权限表
 type ChartPermission struct {
-	ChartPermissionId     int       `gorm:"column:chart_permission_id"`     //`orm:"column(chart_permission_id);pk" description:"问题ID" json:"chart_permission_id"`
+	ChartPermissionId     int       `gorm:"column:chart_permission_id"`     //`orm:"column(chart_permission_id);pk" gorm:"primaryKey"  description:"问题ID" json:"chart_permission_id"`
 	ChartPermissionName   string    `gorm:"column:chart_permission_name"`   //`description:"名称" json:"chart_permission_name"`
 	PermissionName        string    `gorm:"column:permission_name"`         //`description:"权限名" json:"permission_name"`
 	Sort                  int       `gorm:"column:sort"`                    //`description:"排序" json:"sort"`

+ 2 - 2
models/classify.go

@@ -9,7 +9,7 @@ import (
 )
 
 type Classify struct {
-	Id                   int       `gorm:"column:id;primaryKey" json:"id"`                                //`orm:"column(id);pk"`
+	Id                   int       `gorm:"column:id;primaryKey" json:"id"`                                //`orm:"column(id);pk" gorm:"primaryKey" `
 	ClassifyName         string    `gorm:"column:classify_name" json:"classify_name"`                     //`description:"分类名称"`
 	Sort                 int       `gorm:"column:sort" json:"sort"`                                       //`json:"-"`
 	ParentId             int       `gorm:"column:parent_id" json:"parent_id"`                             //`description:"父级分类id"`
@@ -191,7 +191,7 @@ func FindByIdClassify(classifyId int) (item *Classify, err error) {
 }
 
 type ClassifyList struct {
-	Id                    int             `gorm:"column:id" json:"id"`                                 //`orm:"column(id);pk"`
+	Id                    int             `gorm:"column:id" json:"id"`                                 //`orm:"column(id);pk" gorm:"primaryKey" `
 	ClassifyName          string          `gorm:"column:classify_name" json:"classify_name"`           //`description:"分类名称"`
 	Sort                  int             `gorm:"column:sort" json:"sort"`                             //`description:"排序"`
 	ParentId              int             `gorm:"column:parent_id" json:"parent_id"`                   //`description:"父级分类id"`

+ 1 - 1
models/classify_menu.go

@@ -9,7 +9,7 @@ import (
 
 // ClassifyMenu 报告分类-子目录表
 type ClassifyMenu struct {
-	MenuId     int       `gorm:"column:menu_id"`     // `orm:"column(menu_id);pk"`
+	MenuId     int       `gorm:"column:menu_id"`     // `orm:"column(menu_id);pk" gorm:"primaryKey" `
 	MenuName   string    `gorm:"column:mobile"`      //`description:"子目录名称"`
 	ClassifyId int       `gorm:"column:classify_id"` //`description:"一级分类ID"`
 	Sort       int       `gorm:"column:sort"`        //`description:"排序"`

+ 1 - 1
models/classify_menu_relation.go

@@ -8,7 +8,7 @@ import (
 
 // ClassifyMenuRelation 报告分类-子目录关联表
 type ClassifyMenuRelation struct {
-	Id         int       `gorm:"column:id"`          //`orm:"column(id);pk"`
+	Id         int       `gorm:"column:id"`          //`orm:"column(id);pk" gorm:"primaryKey" `
 	MenuId     int       `gorm:"column:menu_id"`     //`description:"子目录ID"`
 	ClassifyId int       `gorm:"column:classify_id"` //`description:"二级分类ID"`
 	CreateTime time.Time `gorm:"column:create_time"` //`description:"创建时间"`

+ 1 - 1
models/cloud_disk_menu.go

@@ -9,7 +9,7 @@ import (
 )
 
 type CloudDiskMenu struct {
-	MenuId     int       `gorm:"column:menu_id"`     // `orm:"column(menu_id);pk" description:"目录ID"`
+	MenuId     int       `gorm:"column:menu_id"`     // `orm:"column(menu_id);pk" gorm:"primaryKey"  description:"目录ID"`
 	MenuName   string    `gorm:"column:menu_name"`   //`description:"目录名称"`
 	ParentId   int       `gorm:"column:parent_id"`   //`description:"父级ID"`
 	Size       int64     `gorm:"column:size"`        //`description:"目录大小"`

+ 1 - 1
models/cloud_disk_resource.go

@@ -15,7 +15,7 @@ const (
 )
 
 //type CloudDiskResource struct {
-//	ResourceId     int       `gorm`//`orm:"column(resource_id);pk" description:"资源ID"`
+//	ResourceId     int       `gorm`//`orm:"column(resource_id);pk" gorm:"primaryKey"  description:"资源ID"`
 //	MenuId         int       `description:"目录ID"`
 //	ResourceName   string    `description:"文件名"`
 //	ResourceSuffix string    `description:"文件后缀名"`

+ 1 - 1
models/company/company.go

@@ -6,7 +6,7 @@ import (
 )
 
 type Company struct {
-	CompanyId       int       `orm:"column(company_id);pk"`
+	CompanyId       int       `orm:"column(company_id);pk" gorm:"primaryKey" `
 	CompanyName     string    `description:"客户名称"`
 	CompanyType     int       `orm:"column(type)"`
 	CreditCode      string    `description:"社会统一信用码"`

+ 2 - 2
models/data_manage/baiinfo_data.go

@@ -31,7 +31,7 @@ func GetBaiinfoFrequencyByClassifyId(classifyId int) (items []*GlFrequency, err
 }
 
 type BaiinfoIndex struct {
-	BaseFromBaiinfoIndexId int `orm:"column(base_from_baiinfo_index_id);pk"`
+	BaseFromBaiinfoIndexId int `orm:"column(base_from_baiinfo_index_id);pk" gorm:"primaryKey" `
 	Interface              string
 	Name                   string
 	IndexCode              string
@@ -97,7 +97,7 @@ func GetBaiinfoFrequencyByCode(code string) (items []*string, err error) {
 }
 
 type BaiinfoIndexList struct {
-	BaseFromBaiinfoIndexId int `orm:"column(base_from_baiinfo_index_id);pk"`
+	BaseFromBaiinfoIndexId int `orm:"column(base_from_baiinfo_index_id);pk" gorm:"primaryKey" `
 	Interface              string
 	Name                   string
 	IndexCode              string

+ 3 - 3
models/data_manage/base_from_baiinfo.go

@@ -8,7 +8,7 @@ import (
 )
 
 type BaseFromBaiinfo struct {
-	BaseFromBaiinfoId int `orm:"column(base_from_baiinfo_id);pk"`
+	BaseFromBaiinfoId int `orm:"column(base_from_baiinfo_id);pk" gorm:"primaryKey" `
 	Aid               int
 	Name              string
 	Interface         string
@@ -34,7 +34,7 @@ type BaseFromBaiinfo struct {
 }
 
 type BaseFromBaiinfoIndex struct {
-	BaseFromBaiinfoIndexId int `orm:"column(base_from_baiinfo_index_id);pk"`
+	BaseFromBaiinfoIndexId int `orm:"column(base_from_baiinfo_index_id);pk" gorm:"primaryKey" `
 	ClassifyId             int
 	Interface              string
 	IndexCode              string
@@ -47,7 +47,7 @@ type BaseFromBaiinfoIndex struct {
 }
 
 type BaseFromBaiinfoData struct {
-	BaiinfoDataId          int `orm:"column(baiinfo_data_id);pk"`
+	BaiinfoDataId          int `orm:"column(baiinfo_data_id);pk" gorm:"primaryKey" `
 	BaseFromBaiinfoIndexId int
 	IndexCode              string
 	DataTime               string

+ 1 - 1
models/data_manage/base_from_baiinfo_classify.go

@@ -8,7 +8,7 @@ import (
 
 // BaseFromBaiinfoClassify SMM原始数据分类表
 type BaseFromBaiinfoClassify struct {
-	ClassifyId      int       `orm:"column(classify_id);pk"`
+	ClassifyId      int       `orm:"column(classify_id);pk" gorm:"primaryKey" `
 	ClassifyName    string    `description:"分类名称"`
 	ParentId        int       `description:"父级id"`
 	SysUserId       int       `description:"创建人id"`

+ 2 - 2
models/data_manage/base_from_bloomberg_index.go

@@ -11,7 +11,7 @@ import (
 
 // BaseFromBloombergIndex 彭博原始指标表
 type BaseFromBloombergIndex struct {
-	BaseFromBloombergIndexId int       `orm:"column(base_from_bloomberg_index_id);pk"`
+	BaseFromBloombergIndexId int       `orm:"column(base_from_bloomberg_index_id);pk" gorm:"primaryKey" `
 	IndexCode                string    `description:"指标编码"`
 	IndexName                string    `description:"指标名称"`
 	Unit                     string    `description:"单位"`
@@ -256,7 +256,7 @@ type BloombergSourceBatchAddCheckReq struct {
 
 // BaseFromBloombergData 彭博原始指标表
 //type BaseFromBloombergData struct {
-//	BaseFromBloombergDataId  int       `orm:"column(base_from_bloomberg_data_id);pk"`
+//	BaseFromBloombergDataId  int       `orm:"column(base_from_bloomberg_data_id);pk" gorm:"primaryKey" `
 //	BaseFromBloombergIndexId int       `description:"指标ID"`
 //	IndexCode                string    `description:"指标编码"`
 //	DataTime                 time.Time `description:"数据日期"`

+ 1 - 1
models/data_manage/base_from_business_data.go

@@ -11,7 +11,7 @@ import (
 // BaseFromBusinessData
 // @Description: 外部指标(商家系统)原始数据表
 type BaseFromBusinessData struct {
-	BusinessDataId          int       `orm:"column(business_data_id);pk" json:"business_data_id"`
+	BusinessDataId          int       `orm:"column(business_data_id);pk" gorm:"primaryKey"  json:"business_data_id"`
 	BaseFromBusinessIndexId int       `json:"base_from_business_index_id"` // 指标id
 	IndexCode               string    `json:"index_code"`                  // 指标编码
 	DataTime                time.Time `json:"data_time"`                   // 数据日期

+ 4 - 4
models/data_manage/base_from_business_index.go

@@ -10,7 +10,7 @@ import (
 // BaseFromBusinessIndex
 // @Description: 外部指标(商家系统)表
 type BaseFromBusinessIndex struct {
-	BaseFromBusinessIndexId int64     `orm:"column(base_from_business_index_id);pk"`
+	BaseFromBusinessIndexId int64     `orm:"column(base_from_business_index_id);pk" gorm:"primaryKey" `
 	IndexCode               string    `description:"指标编码"`
 	IndexName               string    `description:"指标名称"`
 	Unit                    string    `description:"单位"`
@@ -61,7 +61,7 @@ var BaseFromBusinessIndexCols = struct {
 // EdbBusinessSource
 // @Description: 自有数据(商家)指标来源
 type EdbBusinessSource struct {
-	EdbBusinessSourceId int64     `orm:"column(edb_business_source_id);pk"`
+	EdbBusinessSourceId int64     `orm:"column(edb_business_source_id);pk" gorm:"primaryKey" `
 	SourceName          string    `description:"来源名称"` // 来源名称
 	CreateTime          time.Time `description:"创建时间"` // 创建时间
 }
@@ -147,7 +147,7 @@ type BusinessIndexListResp struct {
 // BaseFromBusinessIndexItem
 // @Description: 外部指标(商家系统)结构
 type BaseFromBusinessIndexItem struct {
-	BaseFromBusinessIndexId int64  `orm:"column(base_from_business_index_id);pk"`
+	BaseFromBusinessIndexId int64  `orm:"column(base_from_business_index_id);pk" gorm:"primaryKey" `
 	IndexCode               string `description:"指标编码"`
 	IndexName               string `description:"指标名称"`
 	Unit                    string `description:"单位"`
@@ -241,7 +241,7 @@ type BusinessIndexDataListResp struct {
 // @Description: 外部指标(商家系统)数据结构
 type BaseFromBusinessIndexDataItem struct {
 	ID        string
-	EdbDataId int `orm:"column(edb_data_id);pk"`
+	EdbDataId int `orm:"column(edb_data_id);pk" gorm:"primaryKey" `
 	IndexCode string
 	DataTime  string
 	Value     float64

+ 4 - 4
models/data_manage/base_from_ccf.go

@@ -8,7 +8,7 @@ import (
 )
 
 type BaseFromCCFIndex struct {
-	BaseFromCcfIndexId int `orm:"column(base_from_ccf_index_id);pk"`
+	BaseFromCcfIndexId int `orm:"column(base_from_ccf_index_id);pk" gorm:"primaryKey" `
 	ClassifyId         int
 	IndexCode          string
 	IndexName          string
@@ -20,7 +20,7 @@ type BaseFromCCFIndex struct {
 }
 
 type BaseFromCCFIndexList struct {
-	BaseFromCcfIndexId int `orm:"column(base_from_ccf_index_id);pk"`
+	BaseFromCcfIndexId int `orm:"column(base_from_ccf_index_id);pk" gorm:"primaryKey" `
 	ClassifyId         int
 	IndexCode          string
 	IndexName          string
@@ -102,7 +102,7 @@ func GetCCFIndexDataByCodes(indexCode []string) (items []*BaseFromCCFData, err e
 }
 
 type BaseFromCCFData struct {
-	BaseFromCcfDataId  int `orm:"column(base_from_ccf_data_id);pk"`
+	BaseFromCcfDataId  int `orm:"column(base_from_ccf_data_id);pk" gorm:"primaryKey" `
 	BaseFromCcfIndexId int
 	IndexCode          string
 	DataTime           string
@@ -113,7 +113,7 @@ type BaseFromCCFData struct {
 }
 
 type BaseFromCCFIndexSearchItem struct {
-	BaseFromCcfIndexId int `orm:"column(base_from_ccf_index_id);pk"`
+	BaseFromCcfIndexId int `orm:"column(base_from_ccf_index_id);pk" gorm:"primaryKey" `
 	ClassifyId         int
 	IndexCode          string
 	IndexName          string

+ 1 - 1
models/data_manage/base_from_ccf_classify.go

@@ -8,7 +8,7 @@ import (
 
 // BaseFromCCFClassify CCF原始数据分类表
 type BaseFromCCFClassify struct {
-	BaseFromCcfClassifyId int       `orm:"column(base_from_ccf_classify_id);pk"`
+	BaseFromCcfClassifyId int       `orm:"column(base_from_ccf_classify_id);pk" gorm:"primaryKey" `
 	ClassifyName          string    `description:"分类名称"`
 	ParentId              int       `description:"父级id"`
 	SysUserId             int       `description:"创建人id"`

+ 1 - 1
models/data_manage/base_from_edb_mapping.go

@@ -10,7 +10,7 @@ import (
 
 // BaseFromEdbMapping 同花顺高频数据
 type BaseFromEdbMapping struct {
-	Id              int       `orm:"column(id);pk"`
+	Id              int       `orm:"column(id);pk" gorm:"primaryKey" `
 	BaseFromIndexId int       `description:"源指标ID"`
 	BaseIndexCode   string    `description:"源指标编码"`
 	EdbInfoId       int       `description:"指标ID"`

+ 6 - 6
models/data_manage/base_from_eia_stero.go

@@ -9,7 +9,7 @@ import (
 
 // BaseFromEiaSteoIndex EiaSteo指标
 type BaseFromEiaSteoIndex struct {
-	BaseFromEiaSteoIndexId    int       `orm:"column(base_from_eia_steo_index_id);pk"`
+	BaseFromEiaSteoIndexId    int       `orm:"column(base_from_eia_steo_index_id);pk" gorm:"primaryKey" `
 	BaseFromEiaSteoClassifyId int       `description:"指标分类id"`
 	IndexCode                 string    `description:"指标编码"`
 	IndexName                 string    `description:"指标名称(中文名称)"`
@@ -30,7 +30,7 @@ type BaseFromEiaSteoIndex struct {
 
 // BaseFromEiaSteoIndexItem EiaSteo指标
 type BaseFromEiaSteoIndexItem struct {
-	BaseFromEiaSteoIndexId    int    `orm:"column(base_from_eia_steo_index_id);pk"`
+	BaseFromEiaSteoIndexId    int    `orm:"column(base_from_eia_steo_index_id);pk" gorm:"primaryKey" `
 	BaseFromEiaSteoClassifyId int    `description:"指标分类id"`
 	IndexCode                 string `description:"指标编码"`
 	IndexName                 string `description:"指标名称(中文名称)"`
@@ -51,7 +51,7 @@ type BaseFromEiaSteoIndexItem struct {
 
 // BaseFromEiaSteoClassify EiaSteo分类
 type BaseFromEiaSteoClassify struct {
-	BaseFromEiaSteoClassifyId int       `orm:"column(base_from_eia_steo_classify_id);pk"`
+	BaseFromEiaSteoClassifyId int       `orm:"column(base_from_eia_steo_classify_id);pk" gorm:"primaryKey" `
 	ClassifyName              string    `description:"分类名称(中文名称)"`
 	ClassifyNameOriginal      string    `description:"分类名称(原始名称)"`
 	ModifyTime                time.Time `description:"最新更新时间"`
@@ -60,7 +60,7 @@ type BaseFromEiaSteoClassify struct {
 
 // BaseFromEiaSteoData EiaSteo数据表
 type BaseFromEiaSteoData struct {
-	BaseFromEiaSteoDataId  int       `orm:"column(base_from_eia_steo_data_id);pk"`
+	BaseFromEiaSteoDataId  int       `orm:"column(base_from_eia_steo_data_id);pk" gorm:"primaryKey" `
 	BaseFromEiaSteoIndexId int       `description:"指标id"`
 	IndexCode              string    `description:"指标编码"`
 	DataTime               time.Time `description:"数据日期"`
@@ -71,7 +71,7 @@ type BaseFromEiaSteoData struct {
 
 // BaseFromEiaSteoDataItem EiaSteo数据
 type BaseFromEiaSteoDataItem struct {
-	BaseFromEiaSteoDataId  int     `orm:"column(base_from_eia_steo_data_id);pk"`
+	BaseFromEiaSteoDataId  int     `orm:"column(base_from_eia_steo_data_id);pk" gorm:"primaryKey" `
 	BaseFromEiaSteoIndexId int     `description:"指标id"`
 	IndexCode              string  `description:"指标编码"`
 	DataTime               string  `description:"数据日期"`
@@ -89,7 +89,7 @@ func GetEiaSteoClassifyList() (items []*BaseFromEiaSteoClassify, err error) {
 }
 
 type EiaSteoIndexListResp struct {
-	BaseFromEiaSteoIndexId    int                `orm:"column(base_from_eia_steo_index_id);pk"`
+	BaseFromEiaSteoIndexId    int                `orm:"column(base_from_eia_steo_index_id);pk" gorm:"primaryKey" `
 	BaseFromEiaSteoClassifyId int                `description:"指标分类id"`
 	IndexCode                 string             `description:"指标编码"`
 	IndexName                 string             `description:"指标名称(中文名称)"`

+ 4 - 4
models/data_manage/base_from_fenwei.go

@@ -8,7 +8,7 @@ import (
 )
 
 type BaseFromFenweiIndex struct {
-	FenweiIndexId int `orm:"column(fenwei_index_id);pk"`
+	FenweiIndexId int `orm:"column(fenwei_index_id);pk" gorm:"primaryKey" `
 	ClassifyId    int
 	IndexCode     string
 	IndexName     string
@@ -20,7 +20,7 @@ type BaseFromFenweiIndex struct {
 }
 
 type BaseFromFenweiIndexList struct {
-	FenweiIndexId int `orm:"column(fenwei_index_id);pk"`
+	FenweiIndexId int `orm:"column(fenwei_index_id);pk" gorm:"primaryKey" `
 	ClassifyId    int
 	IndexCode     string
 	IndexName     string
@@ -135,7 +135,7 @@ func GetFenweiIndexDataByCodes(indexCode []string) (items []*BaseFromFenweiData,
 }
 
 type BaseFromFenweiData struct {
-	FenweiDataId  int `orm:"column(fenwei_data_id);pk"`
+	FenweiDataId  int `orm:"column(fenwei_data_id);pk" gorm:"primaryKey" `
 	FenweiIndexId int
 	IndexCode     string
 	DataTime      string
@@ -146,7 +146,7 @@ type BaseFromFenweiData struct {
 }
 
 type BaseFromFenweiIndexSearchItem struct {
-	FenweiIndexId int `orm:"column(fenwei_index_id);pk"`
+	FenweiIndexId int `orm:"column(fenwei_index_id);pk" gorm:"primaryKey" `
 	ClassifyId    int
 	IndexCode     string
 	IndexName     string

+ 1 - 1
models/data_manage/base_from_fenwei_classify.go

@@ -8,7 +8,7 @@ import (
 
 // BaseFromFenweiClassify 汾渭原始数据分类表
 type BaseFromFenweiClassify struct {
-	ClassifyId      int       `orm:"column(classify_id);pk"`
+	ClassifyId      int       `orm:"column(classify_id);pk" gorm:"primaryKey" `
 	ClassifyName    string    `description:"分类名称"`
 	ParentId        int       `description:"父级id"`
 	SysUserId       int       `description:"创建人id"`

+ 5 - 5
models/data_manage/base_from_mtjh.go

@@ -8,7 +8,7 @@ import (
 )
 
 type BaseFromMtjhMapping struct {
-	BaseFromMtjhMappingId int       `orm:"column(base_from_mtjh_mapping_id);pk"`
+	BaseFromMtjhMappingId int       `orm:"column(base_from_mtjh_mapping_id);pk" gorm:"primaryKey" `
 	IndexName             string    `description:"持买单量指标名称"`
 	IndexCode             string    `description:"持买单量指标编码"`
 	CreateTime            time.Time `description:"时间"`
@@ -20,7 +20,7 @@ type BaseFromMtjhMapping struct {
 }
 
 type BaseFromMtjhIndex struct {
-	BaseFromMtjhIndexId int       `orm:"column(base_from_mtjh_index_id);pk"`
+	BaseFromMtjhIndexId int       `orm:"column(base_from_mtjh_index_id);pk" gorm:"primaryKey" `
 	IndexName           string    `description:"持买单量指标名称"`
 	IndexCode           string    `description:"持买单量指标编码"`
 	DealValue           string    `description:"成交量"`
@@ -35,7 +35,7 @@ type BaseFromMtjhIndex struct {
 }
 
 type BaseFromMtjhIndexItem struct {
-	BaseFromMtjhIndexId int    `orm:"column(base_from_mtjh_index_id);pk"`
+	BaseFromMtjhIndexId int    `orm:"column(base_from_mtjh_index_id);pk" gorm:"primaryKey" `
 	IndexName           string `description:"持买单量指标名称"`
 	IndexCode           string `description:"持买单量指标编码"`
 	DealValue           string `description:"成交量"`
@@ -57,7 +57,7 @@ func GetMtjhClassifyList() (list []*BaseFromMtjhMapping, err error) {
 }
 
 type BaseFromMtjhMappingItem struct {
-	BaseFromMtjhMappingId int    `orm:"column(base_from_mtjh_mapping_id);pk"`
+	BaseFromMtjhMappingId int    `orm:"column(base_from_mtjh_mapping_id);pk" gorm:"primaryKey" `
 	IndexName             string `description:"持买单量指标名称"`
 	IndexCode             string `description:"持买单量指标编码"`
 	CreateTime            string `description:"时间"`
@@ -80,7 +80,7 @@ func GetMtjhMapping(condition string, pars interface{}) (items []*BaseFromMtjhMa
 }
 
 type BaseFromMtjhIndexList struct {
-	BaseFromMtjhMappingId int    `orm:"column(base_from_mtjh_mapping_id);pk"`
+	BaseFromMtjhMappingId int    `orm:"column(base_from_mtjh_mapping_id);pk" gorm:"primaryKey" `
 	IndexName             string `description:"持买单量指标名称"`
 	IndexCode             string `description:"持买单量指标编码"`
 	Area                  string `description:"区域"`

+ 1 - 1
models/data_manage/base_from_national_statistics_classify.go

@@ -10,7 +10,7 @@ import (
 
 // BaseFromNationalStatisticsClassify 国统局-指标分类
 type BaseFromNationalStatisticsClassify struct {
-	BaseFromNationalStatisticsClassifyId int       `orm:"column(base_from_national_statistics_classify_id);pk"`
+	BaseFromNationalStatisticsClassifyId int       `orm:"column(base_from_national_statistics_classify_id);pk" gorm:"primaryKey" `
 	ClassifyName                         string    `description:"分类名称"`
 	Id                                   string    `description:"分类ID(字符串)"`
 	Dbcode                               string    `description:"dbcode"`

+ 1 - 1
models/data_manage/base_from_national_statistics_data.go

@@ -10,7 +10,7 @@ import (
 
 // BaseFromNationalStatisticsData 国统局-指标
 type BaseFromNationalStatisticsData struct {
-	BaseFromNationalStatisticsDataId  int       `orm:"column(base_from_national_statistics_data_id);pk"`
+	BaseFromNationalStatisticsDataId  int       `orm:"column(base_from_national_statistics_data_id);pk" gorm:"primaryKey" `
 	BaseFromNationalStatisticsIndexId int       `description:"指标ID"`
 	IndexCode                         string    `description:"指标编码"`
 	DataTime                          time.Time `description:"数据日期"`

+ 1 - 1
models/data_manage/base_from_national_statistics_index.go

@@ -10,7 +10,7 @@ import (
 
 // BaseFromNationalStatisticsIndex 国统局-指标
 type BaseFromNationalStatisticsIndex struct {
-	BaseFromNationalStatisticsIndexId    int       `orm:"column(base_from_national_statistics_index_id);pk"`
+	BaseFromNationalStatisticsIndexId    int       `orm:"column(base_from_national_statistics_index_id);pk" gorm:"primaryKey" `
 	BaseFromNationalStatisticsClassifyId int       `description:"指标分类ID"`
 	Dbcode                               string    `description:"dbcode"`
 	IndexCode                            string    `description:"指标编码"`

+ 1 - 1
models/data_manage/base_from_oilchem.go

@@ -159,7 +159,7 @@ func GetOilchemIndexAndEdbInfoByCondition(condition string, pars []interface{})
 }
 
 type BaseFromOilchemIndexView struct {
-	BaseFromOilchemIndexId int    `orm:"pk"`
+	BaseFromOilchemIndexId int    `orm:"pk" gorm:"primaryKey" `
 	EdbInfoId              int    `description:"指标库id"`
 	ClassifyId             int    `description:"指标分类id"`
 	IndexCode              string `description:"指标编码"`

+ 3 - 3
models/data_manage/base_from_sci.go

@@ -8,7 +8,7 @@ import (
 )
 
 type BaseFromSci struct {
-	BaseFromSciId int `orm:"column(base_from_sci_id);pk"`
+	BaseFromSciId int `orm:"column(base_from_sci_id);pk" gorm:"primaryKey" `
 	Aid           int
 	Name          string
 	Interface     string
@@ -34,7 +34,7 @@ type BaseFromSci struct {
 }
 
 type BaseFromSciIndex struct {
-	BaseFromSciIndexId int `orm:"column(base_from_sci_index_id);pk"`
+	BaseFromSciIndexId int `orm:"column(base_from_sci_index_id);pk" gorm:"primaryKey" `
 	ClassifyId         int
 	Interface          string
 	IndexCode          string
@@ -47,7 +47,7 @@ type BaseFromSciIndex struct {
 }
 
 type BaseFromSciData struct {
-	SciDataId          int `orm:"column(sci_data_id);pk"`
+	SciDataId          int `orm:"column(sci_data_id);pk" gorm:"primaryKey" `
 	BaseFromSciIndexId int
 	IndexCode          string
 	DataTime           string

+ 1 - 1
models/data_manage/base_from_sci_classify.go

@@ -8,7 +8,7 @@ import (
 
 // BaseFromSciClassify SMM原始数据分类表
 type BaseFromSciClassify struct {
-	ClassifyId      int       `orm:"column(classify_id);pk"`
+	ClassifyId      int       `orm:"column(classify_id);pk" gorm:"primaryKey" `
 	ClassifyName    string    `description:"分类名称"`
 	ParentId        int       `description:"父级id"`
 	SysUserId       int       `description:"创建人id"`

+ 2 - 2
models/data_manage/base_from_sci_hq_classify.go

@@ -8,7 +8,7 @@ import (
 
 // BaseFromSciHqClassify 卓创红期原始数据分类表
 type BaseFromSciHqClassify struct {
-	ClassifyId     int       `orm:"column(classify_id);pk"`
+	ClassifyId     int       `orm:"column(classify_id);pk" gorm:"primaryKey" `
 	ClassifyName   string    `description:"分类名称"`
 	ParentId       int       `description:"父级id"`
 	Level          int       `description:"层级"`
@@ -19,7 +19,7 @@ type BaseFromSciHqClassify struct {
 }
 
 type BaseFromSciHqClassifyItem struct {
-	ClassifyId     int                          `orm:"column(classify_id);pk"`
+	ClassifyId     int                          `orm:"column(classify_id);pk" gorm:"primaryKey" `
 	ClassifyName   string                       `description:"分类名称"`
 	ParentId       int                          `description:"父级id"`
 	Level          int                          `description:"层级"`

+ 1 - 1
models/data_manage/base_from_sci_hq_data.go

@@ -8,7 +8,7 @@ import (
 )
 
 type BaseFromSciHqData struct {
-	SciHqDataId          int       `orm:"column(sci_hq_data_id);pk"`
+	SciHqDataId          int       `orm:"column(sci_hq_data_id);pk" gorm:"primaryKey" `
 	BaseFromSciHqIndexId int       `description:"指标id"`
 	IndexCode            string    `description:"指标编码"`
 	DataTime             string    `description:"数据日期"`

+ 2 - 2
models/data_manage/base_from_sci_hq_index.go

@@ -9,7 +9,7 @@ import (
 )
 
 type BaseFromSciHqIndex struct {
-	BaseFromSciHqIndexId int       `orm:"pk"`
+	BaseFromSciHqIndexId int       `orm:"pk" gorm:"primaryKey" `
 	ClassifyId           int       `description:"指标分类id"`
 	IndexCode            string    `description:"指标编码"`
 	IndexName            string    `description:"指标名称"`
@@ -27,7 +27,7 @@ type BaseFromSciHqIndex struct {
 }
 
 type BaseFromSciHqIndexView struct {
-	BaseFromSciHqIndexId int     `orm:"pk"`
+	BaseFromSciHqIndexId int     `orm:"pk" gorm:"primaryKey" `
 	EdbInfoId            int     `description:"指标库id"`
 	ClassifyId           int     `description:"指标分类id"`
 	IndexCode            string  `description:"指标编码"`

+ 4 - 4
models/data_manage/base_from_smm.go

@@ -9,7 +9,7 @@ import (
 )
 
 type BaseFromSmm struct {
-	BaseFromSmmId int `orm:"column(base_from_smm_id);pk"`
+	BaseFromSmmId int `orm:"column(base_from_smm_id);pk" gorm:"primaryKey" `
 	Aid           int
 	Name          string
 	Interface     string
@@ -51,7 +51,7 @@ func GetBaseFromSmmBySmmCode(smmCode string) (item *BaseFromSmm, err error) {
 }
 
 type BaseFromSmmIndex struct {
-	BaseFromSmmIndexId int `orm:"column(base_from_smm_index_id);pk"`
+	BaseFromSmmIndexId int `orm:"column(base_from_smm_index_id);pk" gorm:"primaryKey" `
 	ClassifyId         int
 	Interface          string
 	Name               string
@@ -94,7 +94,7 @@ func GetBaseFromSmmIndex() (list []*BaseFromSmmIndex, err error) {
 }
 
 type BaseFromSmmData struct {
-	SmmDataId          int `orm:"column(smm_data_id);pk"`
+	SmmDataId          int `orm:"column(smm_data_id);pk" gorm:"primaryKey" `
 	BaseFromSmmIndexId int
 	IndexCode          string
 	DataTime           string
@@ -386,7 +386,7 @@ type BaseFromSmmIndexListResp struct {
 }
 
 type BaseFromSmmIndexItem struct {
-	BaseFromSmmIndexId int `orm:"column(base_from_smm_index_id);pk"`
+	BaseFromSmmIndexId int `orm:"column(base_from_smm_index_id);pk" gorm:"primaryKey" `
 	ClassifyId         int
 	Interface          string
 	Name               string

+ 1 - 1
models/data_manage/base_from_smm_classify.go

@@ -8,7 +8,7 @@ import (
 
 // BaseFromSmmClassify SMM原始数据分类表
 type BaseFromSmmClassify struct {
-	ClassifyId      int       `orm:"column(classify_id);pk"`
+	ClassifyId      int       `orm:"column(classify_id);pk" gorm:"primaryKey" `
 	ClassifyName    string    `description:"分类名称"`
 	ParentId        int       `description:"父级id"`
 	SysUserId       int       `description:"创建人id"`

+ 1 - 1
models/data_manage/base_from_ths_hf.go

@@ -19,7 +19,7 @@ var (
 
 // BaseFromThsHfIndex 同花顺高频数据
 type BaseFromThsHfIndex struct {
-	BaseFromThsHfIndexId    int       `orm:"column(base_from_ths_hf_index_id);pk"`
+	BaseFromThsHfIndexId    int       `orm:"column(base_from_ths_hf_index_id);pk" gorm:"primaryKey" `
 	BaseFromThsHfClassifyId int       `description:"分类ID"`
 	IndexCode               string    `description:"指标编码"`
 	IndexName               string    `description:"指标名称"`

+ 1 - 1
models/data_manage/base_from_ths_hf_classify.go

@@ -10,7 +10,7 @@ import (
 
 // BaseFromThsHfClassify 同花顺高频数据-分类
 type BaseFromThsHfClassify struct {
-	BaseFromThsHfClassifyId int       `orm:"column(base_from_ths_hf_classify_id);pk"`
+	BaseFromThsHfClassifyId int       `orm:"column(base_from_ths_hf_classify_id);pk" gorm:"primaryKey" `
 	ClassifyName            string    `description:"分类名称"`
 	ClassifyNameEn          string    `description:"英文分类名称"`
 	ParentId                int       `description:"父级ID"`

+ 1 - 1
models/data_manage/base_from_ths_hf_data.go

@@ -10,7 +10,7 @@ import (
 
 // BaseFromThsHfData 同花顺高频数据-指标数据
 type BaseFromThsHfData struct {
-	BaseFromThsHfDataId  int       `orm:"column(base_from_ths_hf_data_id);pk"`
+	BaseFromThsHfDataId  int       `orm:"column(base_from_ths_hf_data_id);pk" gorm:"primaryKey" `
 	BaseFromThsHfIndexId int       `description:"指标ID"`
 	IndexCode            string    `description:"指标编码"`
 	DataTime             time.Time `description:"数据日期(至时分秒)"`

+ 11 - 11
models/data_manage/base_from_trade_index.go

@@ -8,7 +8,7 @@ import (
 )
 
 type BaseFromTradeShanghaiIndex struct {
-	BaseFromTradeShangHaiIndexId int `orm:"column(base_from_trade_shanghai_index_id);pk"`
+	BaseFromTradeShangHaiIndexId int `orm:"column(base_from_trade_shanghai_index_id);pk" gorm:"primaryKey" `
 	Rank                         int
 	DealShortName                string
 	DealName                     string
@@ -33,7 +33,7 @@ type BaseFromTradeShanghaiIndex struct {
 	DataTime                     string
 }
 type BaseFromTradeCffexIndex struct {
-	BaseFromTradeCffexIndexId int `orm:"column(base_from_trade_cffex_index_id);pk"`
+	BaseFromTradeCffexIndexId int `orm:"column(base_from_trade_cffex_index_id);pk" gorm:"primaryKey" `
 	Rank                      int
 	DealShortName             string
 	DealName                  string
@@ -59,7 +59,7 @@ type BaseFromTradeCffexIndex struct {
 }
 
 type BaseFromTradeIneIndex struct {
-	BaseFromTradeIneIndexId int `orm:"column(base_from_trade_ine_index_id);pk"`
+	BaseFromTradeIneIndexId int `orm:"column(base_from_trade_ine_index_id);pk" gorm:"primaryKey" `
 	Rank                    int
 	DealShortName           string
 	DealName                string
@@ -85,7 +85,7 @@ type BaseFromTradeIneIndex struct {
 }
 
 type BaseFromTradeEicIndex struct {
-	BaseFromEicIndexId     int `orm:"column(base_from_eic_index_id);pk"`
+	BaseFromEicIndexId     int `orm:"column(base_from_eic_index_id);pk" gorm:"primaryKey" `
 	Country                string
 	Type                   string
 	EicCode                string
@@ -213,7 +213,7 @@ func GetEicHistoryDateByDate(code, startDate, endDate string) (date []*BaseFromT
 }
 
 type BaseFromCoalmineJsmIndex struct {
-	BaseFromCoalmineJsmIndexId int    `orm:"column(base_from_coalmine_jsm_index_id);pk"`
+	BaseFromCoalmineJsmIndexId int    `orm:"column(base_from_coalmine_jsm_index_id);pk" gorm:"primaryKey" `
 	IndexName                  string `description:"持买单量指标名称"`
 	IndexCode                  string `description:"持买单量指标编码"`
 	Exchange                   string `description:"样本统计类别"`
@@ -229,7 +229,7 @@ type BaseFromCoalmineJsmIndex struct {
 }
 
 type BaseFromCoalmineCompanyIndex struct {
-	BaseFromCoalmineCompanyIndexId int    `orm:"column(base_from_coalmine_company_index_id);pk"`
+	BaseFromCoalmineCompanyIndexId int    `orm:"column(base_from_coalmine_company_index_id);pk" gorm:"primaryKey" `
 	IndexName                      string `description:"持买单量指标名称"`
 	IndexCode                      string `description:"持买单量指标编码"`
 	DealValue                      string `description:"成交量"`
@@ -246,7 +246,7 @@ type BaseFromCoalmineCompanyIndex struct {
 
 // BaseFromCoalmineFirmIndex 煤矿产量周度公司数据表
 type BaseFromCoalmineFirmIndex struct {
-	BaseFromCoalmineFirmIndexID int    `orm:"column(base_from_coalmine_firm_index_id);pk"`
+	BaseFromCoalmineFirmIndexID int    `orm:"column(base_from_coalmine_firm_index_id);pk" gorm:"primaryKey" `
 	IndexName                   string // 省份/企业名称
 	IndexCode                   string // 持买单量指标编码
 	DataTime                    string // 指标时间
@@ -261,7 +261,7 @@ type BaseFromCoalmineFirmIndex struct {
 
 // BaseFromCoalmineCoastalIndex 沿海八省动力煤用户供耗存数据指标表
 type BaseFromCoalmineCoastalIndex struct {
-	BaseFromCoalmineCoastalIndexID int    `orm:"column(base_from_coalmine_coastal_index_id);pk"`
+	BaseFromCoalmineCoastalIndexID int    `orm:"column(base_from_coalmine_coastal_index_id);pk" gorm:"primaryKey" `
 	IndexName                      string // 省份/企业名称
 	IndexCode                      string // 持买单量指标编码
 	DataTime                       string // 指标时间
@@ -285,7 +285,7 @@ func GetBaseFromCoalmineCoastalIndex(startDate, endDate string) (items []*BaseFr
 
 // BaseFromCoalmineInlandIndex 内陆动力煤用户供耗存数据指标表
 type BaseFromCoalmineInlandIndex struct {
-	BaseFromCoalmineInlandIndexID int    `orm:"column(base_from_coalmine_inland_index_id);pk"`
+	BaseFromCoalmineInlandIndexID int    `orm:"column(base_from_coalmine_inland_index_id);pk" gorm:"primaryKey" `
 	IndexName                     string // 省份/企业名称
 	IndexCode                     string // 持买单量指标编码
 	DataTime                      string // 指标时间
@@ -569,7 +569,7 @@ func GetBaseFromCoalmineInlandIndexByCode(indexCode string) (items []*BaseFromCo
 }
 
 type BaseFromTradeEicIndexV2 struct {
-	BaseFromEicIndexId     int `orm:"column(base_from_eic_index_id);pk"`
+	BaseFromEicIndexId     int `orm:"column(base_from_eic_index_id);pk" gorm:"primaryKey" `
 	Type                   string
 	EicCode                string
 	Name                   string
@@ -659,7 +659,7 @@ func GetFirstBaseFromTradeIndexByDate(exchange string) (item *BaseFromTradeShang
 }
 
 type BaseFromCoalmineClassify struct {
-	BaseFromCoalmineClassifyId int    `orm:"column(base_from_coalmine_classify_id);pk"`
+	BaseFromCoalmineClassifyId int    `orm:"column(base_from_coalmine_classify_id);pk" gorm:"primaryKey" `
 	ClassifyName               string // 分类名称
 	Suffix                     string // 表名后缀
 	CreateTime                 time.Time

+ 4 - 4
models/data_manage/base_from_yongyi.go

@@ -8,7 +8,7 @@ import (
 )
 
 type BaseFromYongyiIndex struct {
-	YongyiIndexId int `orm:"column(yongyi_index_id);pk"`
+	YongyiIndexId int `orm:"column(yongyi_index_id);pk" gorm:"primaryKey" `
 	ClassifyId    int
 	IndexCode     string
 	IndexName     string
@@ -20,7 +20,7 @@ type BaseFromYongyiIndex struct {
 }
 
 type BaseFromYongyiIndexList struct {
-	YongyiIndexId int `orm:"column(yongyi_index_id);pk"`
+	YongyiIndexId int `orm:"column(yongyi_index_id);pk" gorm:"primaryKey" `
 	ClassifyId    int
 	Interface     string
 	IndexCode     string
@@ -88,7 +88,7 @@ func GetYongyiIndexDataByCodes(indexCode []string) (items []*BaseFromYongyiData,
 }
 
 type BaseFromYongyiData struct {
-	YongyiDataId  int `orm:"column(yongyi_data_id);pk"`
+	YongyiDataId  int `orm:"column(yongyi_data_id);pk" gorm:"primaryKey" `
 	YongyiIndexId int
 	IndexCode     string
 	DataTime      string
@@ -99,7 +99,7 @@ type BaseFromYongyiData struct {
 }
 
 type BaseFromYongyiIndexSearchItem struct {
-	YongyiIndexId int `orm:"column(yongyi_index_id);pk"`
+	YongyiIndexId int `orm:"column(yongyi_index_id);pk" gorm:"primaryKey" `
 	ClassifyId    int
 	IndexCode     string
 	IndexName     string

+ 1 - 1
models/data_manage/base_from_yongyi_classify.go

@@ -7,7 +7,7 @@ import (
 
 // BaseFromYongyiClassify Yongyi原始数据分类表
 type BaseFromYongyiClassify struct {
-	ClassifyId      int       `orm:"column(classify_id);pk"`
+	ClassifyId      int       `orm:"column(classify_id);pk" gorm:"primaryKey" `
 	ClassifyName    string    `description:"分类名称"`
 	ParentId        int       `description:"父级id"`
 	SysUserId       int       `description:"创建人id"`

+ 1 - 1
models/data_manage/ccf_stock_classify.go

@@ -10,7 +10,7 @@ import (
 
 // CCFStockClassify CCF化纤-装置分类
 type CCFStockClassify struct {
-	CcfStockClassifyId int       `orm:"column(ccf_stock_classify_id);pk"`
+	CcfStockClassifyId int       `orm:"column(ccf_stock_classify_id);pk" gorm:"primaryKey" `
 	ClassifyName       string    `description:"分类名称"`
 	CreateTime         time.Time `description:"创建时间"`
 	ModifyTime         time.Time `description:"修改时间"`

+ 1 - 1
models/data_manage/ccf_stock_excel.go

@@ -12,7 +12,7 @@ import (
 
 // CCFStockExcel CCF化纤装置表格
 type CCFStockExcel struct {
-	CcfStockExcelId int       `orm:"column(ccf_stock_excel_id);pk"`
+	CcfStockExcelId int       `orm:"column(ccf_stock_excel_id);pk" gorm:"primaryKey" `
 	ClassifyId      int       `description:"分类ID"`
 	ExcelDate       time.Time `description:"表格日期"`
 	ExcelContent    string    `description:"表格HTML"`

+ 2 - 2
models/data_manage/chart_classify.go

@@ -8,7 +8,7 @@ import (
 )
 
 type ChartClassify struct {
-	ChartClassifyId     int       `orm:"column(chart_classify_id);pk"`
+	ChartClassifyId     int       `orm:"column(chart_classify_id);pk" gorm:"primaryKey" `
 	ChartClassifyName   string    `description:"分类名称"`
 	ParentId            int       `description:"父级id"`
 	HasData             int       `description:"是否含有指标数据"`
@@ -293,7 +293,7 @@ func GetChartClassifyMaxSort(parentId, source int) (sort int, err error) {
 }
 
 type ChartClassifyView struct {
-	ChartClassifyId   int    `orm:"column(chart_classify_id);pk"`
+	ChartClassifyId   int    `orm:"column(chart_classify_id);pk" gorm:"primaryKey" `
 	ChartClassifyName string `description:"分类名称"`
 	ParentId          int    `description:"父级id"`
 }

+ 1 - 1
models/data_manage/chart_edb_mapping.go

@@ -11,7 +11,7 @@ import (
 )
 
 type ChartEdbMapping struct {
-	ChartEdbMappingId int       `orm:"column(chart_edb_mapping_id);pk"`
+	ChartEdbMappingId int       `orm:"column(chart_edb_mapping_id);pk" gorm:"primaryKey" `
 	ChartInfoId       int       `description:"图表id"`
 	EdbInfoId         int       `description:"指标id"`
 	CreateTime        time.Time `description:"创建时间"`

+ 1 - 1
models/data_manage/chart_framework.go

@@ -10,7 +10,7 @@ import (
 
 // ChartFramework 图库框架表
 type ChartFramework struct {
-	ChartFrameworkId int       `orm:"column(chart_framework_id);pk"`
+	ChartFrameworkId int       `orm:"column(chart_framework_id);pk" gorm:"primaryKey" `
 	FrameworkCode    string    `description:"框架唯一编码"`
 	FrameworkName    string    `description:"框架名称"`
 	FrameworkImg     string    `description:"框架图片"`

+ 1 - 1
models/data_manage/chart_framework_node.go

@@ -10,7 +10,7 @@ import (
 
 // ChartFrameworkNode 图库框架节点表
 type ChartFrameworkNode struct {
-	ChartFrameworkNodeId int       `orm:"column(chart_framework_node_id);pk"`
+	ChartFrameworkNodeId int       `orm:"column(chart_framework_node_id);pk" gorm:"primaryKey" `
 	ChartFrameworkId     int       `description:"框架ID"`
 	FrameworkName        string    `description:"框架名称"`
 	NodeId               string    `description:"节点ID"`

+ 3 - 3
models/data_manage/chart_info.go

@@ -14,7 +14,7 @@ import (
 )
 
 type ChartInfo struct {
-	ChartInfoId       int    `orm:"column(chart_info_id);pk"`
+	ChartInfoId       int    `orm:"column(chart_info_id);pk" gorm:"primaryKey" `
 	ChartName         string `description:"图表名称"`
 	ChartNameEn       string `description:"英文图表名称"`
 	ChartClassifyId   int    `description:"图表分类id"`
@@ -379,7 +379,7 @@ func SetForumChartInfoId(chartInfoId, forumChartInfoId int) (err error) {
 }
 
 type ChartInfoList struct {
-	ChartInfoId          int    `orm:"column(chart_info_id);pk"`
+	ChartInfoId          int    `orm:"column(chart_info_id);pk" gorm:"primaryKey" `
 	ChartName            string `description:"来源名称"`
 	ChartChartClassifyId int    `description:"图表分类id"`
 	SysUserId            int
@@ -1908,7 +1908,7 @@ func (chartInfo *ChartInfo) Update(cols []string) (err error) {
 }
 
 type ChartInfoView struct {
-	ChartInfoId       int    `orm:"column(chart_info_id);pk"`
+	ChartInfoId       int    `orm:"column(chart_info_id);pk" gorm:"primaryKey" `
 	ChartName         string `description:"来源名称"`
 	ChartNameEn       string `description:"英文图表名称"`
 	Unit              string `description:"中文单位名称"`

+ 1 - 1
models/data_manage/chart_info_correlation.go

@@ -10,7 +10,7 @@ import (
 
 // ChartInfoCorrelation 相关性图表-扩展信息
 type ChartInfoCorrelation struct {
-	CorrelationChartInfoId int       `orm:"column(correlation_chart_info_id);pk" description:"相关性图表ID(chart_info表source=3的)"`
+	CorrelationChartInfoId int       `orm:"column(correlation_chart_info_id);pk" gorm:"primaryKey"  description:"相关性图表ID(chart_info表source=3的)"`
 	LeadValue              int       `description:"领先值"`
 	LeadUnit               string    `description:"领先单位"`
 	CalculateValue         int       `description:"计算窗口"`

+ 1 - 1
models/data_manage/chart_info_log.go

@@ -6,7 +6,7 @@ import (
 )
 
 type ChartInfoLog struct {
-	ChartInfoLogId  int    `orm:"column(chart_info_log_id);pk"`
+	ChartInfoLogId  int    `orm:"column(chart_info_log_id);pk" gorm:"primaryKey" `
 	ChartInfoId     int    `description:"图表id"`
 	ChartName       string `description:"来源名称"`
 	ChartClassifyId int    `description:"图表分类id"`

+ 1 - 1
models/data_manage/chart_series.go

@@ -9,7 +9,7 @@ import (
 )
 
 type ChartSeries struct {
-	ChartSeriesId int       `orm:"column(chart_series_id);pk"`
+	ChartSeriesId int       `orm:"column(chart_series_id);pk" gorm:"primaryKey" `
 	SeriesName    string    `description:"系列名称"`
 	SeriesNameEn  string    `description:"系列英文名称"`
 	ChartInfoId   int       `description:"图表ID"`

+ 1 - 1
models/data_manage/chart_series_edb_mapping.go

@@ -6,7 +6,7 @@ import (
 )
 
 type ChartSeriesEdbMapping struct {
-	ChartSeriesEdbMappingId int       `orm:"column(chart_series_edb_mapping_id);pk"`
+	ChartSeriesEdbMappingId int       `orm:"column(chart_series_edb_mapping_id);pk" gorm:"primaryKey" `
 	ChartSeriesId           int       `description:"系列ID"`
 	ChartInfoId             int       `description:"图表ID"`
 	EdbInfoId               int       `description:"指标id"`

+ 2 - 2
models/data_manage/chart_theme/chart_theme.go

@@ -9,7 +9,7 @@ import (
 // ChartTheme
 // @Description: 图表主题表
 type ChartTheme struct {
-	ChartThemeId     int       `description:"图表主题类型ID" orm:"column(chart_theme_id);pk"`
+	ChartThemeId     int       `description:"图表主题类型ID" orm:"column(chart_theme_id);pk" gorm:"primaryKey" `
 	ChartThemeName   string    `description:"图表主题名称"`
 	ChartThemeTypeId int       `description:"图表主题类型ID"`
 	ChartImage       string    `description:"缩略图"`
@@ -112,7 +112,7 @@ func GetAllChartThemeList() (list []*ChartTheme, err error) {
 // ChartThemeItem
 // @Description: 图表主题配置
 type ChartThemeItem struct {
-	ChartThemeId     int    `description:"图表主题类型ID" orm:"column(chart_theme_id);pk"`
+	ChartThemeId     int    `description:"图表主题类型ID" orm:"column(chart_theme_id);pk" gorm:"primaryKey" `
 	ChartThemeName   string `description:"图表主题名称"`
 	ChartThemeTypeId int    `description:"图表主题类型ID"`
 	Config           string `description:"配置"`

+ 1 - 1
models/data_manage/chart_theme/chart_theme_default_data.go

@@ -10,7 +10,7 @@ import (
 // ChartThemeDefaultData
 // @Description: 图表默认数据
 type ChartThemeDefaultData struct {
-	EdbDataId     int       `description:"指标数据ID" orm:"column(edb_data_id);pk"`
+	EdbDataId     int       `description:"指标数据ID" orm:"column(edb_data_id);pk" gorm:"primaryKey" `
 	EdbInfoId     int       `description:"指标ID"`
 	EdbCode       string    `description:"指标编码"`
 	DataTime      string    //`json:"-" description:"数据日期"`

+ 1 - 1
models/data_manage/chart_theme/chart_theme_type.go

@@ -8,7 +8,7 @@ import (
 // ChartThemeType
 // @Description: 图表主题类型表
 type ChartThemeType struct {
-	ChartThemeTypeId    int       `description:"图表主题类型ID" orm:"column(chart_theme_type_id);pk"`
+	ChartThemeTypeId    int       `description:"图表主题类型ID" orm:"column(chart_theme_type_id);pk" gorm:"primaryKey" `
 	ChartTypeName       string    `description:"类型名称"`
 	ChartType           int       `description:"图表类型"`
 	ChartSource         int       `description:"图表来源"`

+ 1 - 1
models/data_manage/chart_type.go

@@ -3,7 +3,7 @@ package data_manage
 import "eta_gn/eta_api/global"
 
 type ChartType struct {
-	ChartTypeId     int    `orm:"column(chart_type_id);pk"`
+	ChartTypeId     int    `orm:"column(chart_type_id);pk" gorm:"primaryKey" `
 	ChartTypeName   string `description:"图表类型名称"`
 	ChartTypeNameEn string `description:"英文图表类型名称"`
 	ParentId        int    `description:"父级ID"`

+ 1 - 1
models/data_manage/coal_data.go

@@ -7,7 +7,7 @@ import (
 )
 
 type BaseFromCoalmineMapping struct {
-	BaseFromCoalmineMappingId int    `orm:"column(base_from_coalmine_mapping_id);pk"`
+	BaseFromCoalmineMappingId int    `orm:"column(base_from_coalmine_mapping_id);pk" gorm:"primaryKey" `
 	IndexName                 string `description:"持买单量指标名称"`
 	IndexCode                 string `description:"持买单量指标编码"`
 	CreateTime                string `description:"时间"`

+ 1 - 1
models/data_manage/com_trade_country.go

@@ -7,7 +7,7 @@ import (
 
 // ComTradeCountry 联合国商品贸易数据库的国家编码表
 type ComTradeCountry struct {
-	Id         int       `orm:"column(id);pk"`
+	Id         int       `orm:"column(id);pk" gorm:"primaryKey" `
 	ThirdId    int       `description:"第三方的国家id"`
 	Name       string    `description:"国家名称(英文)"`
 	NameCn     string    `description:"国家名称(中文)"`

+ 2 - 2
models/data_manage/com_trade_data.go

@@ -8,7 +8,7 @@ import (
 
 // ComTradeData 联合国商品贸易数据表
 type ComTradeData struct {
-	ComTradeDataId     int       `orm:"column(com_trade_data_id);pk"`
+	ComTradeDataId     int       `orm:"column(com_trade_data_id);pk" gorm:"primaryKey" `
 	ComTradeId         int       `description:"指标id"`
 	IndexCode          string    `description:"联合国商品贸易编码"`
 	Flow               string    `description:"贸易流向:X(Export:出口);M(Import:进口)"`
@@ -30,7 +30,7 @@ type ComTradeData struct {
 
 // ComTradeDataListItem 联合国商品贸易数据列表数据
 type ComTradeDataListItem struct {
-	ComTradeDataId     int       `orm:"column(com_trade_data_id);pk"`
+	ComTradeDataId     int       `orm:"column(com_trade_data_id);pk" gorm:"primaryKey" `
 	ComTradeId         int       `description:"指标id"`
 	IndexCode          string    `description:"联合国商品贸易编码"`
 	IndexNameCn        string    `description:"联合国商品贸易名称(中文)"`

+ 2 - 2
models/data_manage/com_trade_index.go

@@ -8,7 +8,7 @@ import (
 
 // ComTradeIndex 联合国商品贸易数据指标表
 type ComTradeIndex struct {
-	ComTradeId  int       `orm:"column(com_trade_id);pk"`
+	ComTradeId  int       `orm:"column(com_trade_id);pk" gorm:"primaryKey" `
 	IndexCode   string    `description:"联合国商品贸易编码"`
 	IndexName   string    `description:"联合国商品名称"`
 	IndexNameCn string    `description:"联合国商品名称(中文)"`
@@ -52,7 +52,7 @@ func GetAllComTradeIndexList() (list []*ComTradeIndex, err error) {
 
 // ComTradeCodeMapping 联合国商品贸易数据指标编码与分类编码的关系表
 type ComTradeCodeMapping struct {
-	Code       int       `orm:"column(code);pk"`
+	Code       int       `orm:"column(code);pk" gorm:"primaryKey" `
 	IndexCode  string    `description:"联合国商品贸易编码"`
 	Type       int       `description:"1:价格;2:重量"`
 	Name       string    `description:"指标名称"`

+ 1 - 1
models/data_manage/cross_variety/chart_info_cross_variety.go

@@ -13,7 +13,7 @@ import (
 // ChartInfoCrossVariety
 // @Description: 跨品种分析配置表
 type ChartInfoCrossVariety struct {
-	Id             int       `orm:"column(id);pk"`
+	Id             int       `orm:"column(id);pk" gorm:"primaryKey" `
 	ChartInfoId    int       `description:"图表id"`
 	ChartXTagId    int       `description:"X轴的标签ID"`
 	ChartYTagId    int       `description:"X轴的标签ID"`

+ 2 - 2
models/data_manage/cross_variety/chart_tag.go

@@ -9,7 +9,7 @@ import (
 // ChartTag
 // @Description: chart_tag 图表标签表
 type ChartTag struct {
-	ChartTagId      int       `orm:"column(chart_tag_id);pk"`
+	ChartTagId      int       `orm:"column(chart_tag_id);pk" gorm:"primaryKey" `
 	ChartTagName    string    `description:"标签名称"`
 	ChartTagNameEn  string    `description:"标签名称(英文)"`
 	SysUserId       int       `description:"创建人id"`
@@ -133,7 +133,7 @@ func GetTagListByIdList(idList []int) (items []*ChartTag, err error) {
 // ChartTagItem
 // @Description: chart_tag 图表标签表
 type ChartTagItem struct {
-	ChartTagId      int       `orm:"column(chart_tag_id);pk"`
+	ChartTagId      int       `orm:"column(chart_tag_id);pk" gorm:"primaryKey" `
 	ChartTagName    string    `description:"标签名称"`
 	ChartTagNameEn  string    `description:"标签名称(英文)"`
 	SysUserId       int       `description:"创建人id"`

+ 2 - 2
models/data_manage/cross_variety/chart_tag_variety.go

@@ -12,7 +12,7 @@ import (
 // ChartTagVariety
 // @Description: chart_tag_variety 图表标签品种关系表
 type ChartTagVariety struct {
-	Id                        int       `orm:"column(id);pk"`
+	Id                        int       `orm:"column(id);pk" gorm:"primaryKey" `
 	ChartTagId                int       `description:"标签id"`
 	ChartVarietyId            int       `description:"品种id"`
 	EdbInfoId                 int       `description:"指标id"`
@@ -81,7 +81,7 @@ func GetChartTagVarietyListByTagAndVariety(chartTagId int, varietyIdList []int)
 // ChartTagVarietyItem
 // @Description: 图表标签/品种/指标数据
 type ChartTagVarietyItem struct {
-	Id             int     `orm:"column(id);pk"`
+	Id             int     `orm:"column(id);pk" gorm:"primaryKey" `
 	ChartTagId     int     `description:"标签id"`
 	ChartVarietyId int     `description:"品种id"`
 	EdbInfoId      int     `description:"指标id"`

+ 1 - 1
models/data_manage/cross_variety/chart_variety.go

@@ -9,7 +9,7 @@ import (
 // ChartVariety
 // @Description: chart_variety 图表品种表
 type ChartVariety struct {
-	ChartVarietyId     int       `orm:"column(chart_variety_id);pk"`
+	ChartVarietyId     int       `orm:"column(chart_variety_id);pk" gorm:"primaryKey" `
 	ChartVarietyName   string    `description:"品种名称"`
 	ChartVarietyNameEn string    `description:"品种名称(英文)"`
 	SysUserId          int       `description:"创建人id"`

+ 1 - 1
models/data_manage/cross_variety/chart_variety_mapping.go

@@ -9,7 +9,7 @@ import (
 // ChartVarietyMapping
 // @Description: 图表与品种的关系表
 type ChartVarietyMapping struct {
-	Id             int       `orm:"column(id);pk"`
+	Id             int       `orm:"column(id);pk" gorm:"primaryKey" `
 	ChartInfoId    int       `description:"图表id"`
 	ChartVarietyId int       `description:"品种id"`
 	ModifyTime     time.Time `description:"修改时间"`

+ 16 - 16
models/data_manage/data_manage_permission/chart.go

@@ -11,7 +11,7 @@ import (
 // ChartInfoPermission
 // @Description: 图表信息权限表
 type ChartInfoPermission struct {
-	ChartInfoPermissionId int64     `json:"chart_info_permission_id" orm:"column(chart_info_permission_id);pk"`
+	ChartInfoPermissionId int64     `json:"chart_info_permission_id" orm:"column(chart_info_permission_id);pk" gorm:"primaryKey" `
 	ChartInfoId           int32     `json:"chart_info_id"` // 图表id
 	Source                int32     `json:"source"`        // 1:ETA图库;2:商品价格曲线;3:相关性图
 	SysUserId             int32     `json:"sys_user_id"`   // 系统用户id
@@ -22,7 +22,7 @@ type ChartInfoPermission struct {
 // ChartClassifyPermission
 // @Description: 图表分类权限表
 type ChartClassifyPermission struct {
-	ChartClassifyPermissionId int64     `json:"chart_classify_permission_id" orm:"column(chart_classify_permission_id);pk"`
+	ChartClassifyPermissionId int64     `json:"chart_classify_permission_id" orm:"column(chart_classify_permission_id);pk" gorm:"primaryKey" `
 	ChartClassifyId           int32     `json:"chart_classify_id"` // 分类id
 	Source                    int32     `json:"source"`            // 分类来源: 1-图库; 2-商品价格曲线; 3-相关性图表; 6-拟合方程图表; 7-统计特征
 	SysUserId                 int32     `json:"sys_user_id"`       // 系统用户id
@@ -590,13 +590,13 @@ func InheritParentClassifyByChartClassifyId(dataSource, chartSource, classifyId,
 // ChartInfoPermissionNoAuthRecord
 // @Description: 图表数据权限未授权记录表
 type ChartInfoPermissionNoAuthRecord struct {
-	ChartInfoPermissionNoAuthRecordId int64     `json:"chart_info_permission_no_auth_record_id"  orm:"column(chart_info_permission_no_auth_record_id);pk"` // 资产数据操作记录id
-	OpUniqueCode                      string    `json:"op_unique_code"`                                                                                    // 操作的唯一编码,主要是记录统一操作的日志
-	Source                            int32     `json:"source"`                                                                                            // 1:ETA图库;2:商品价格曲线;3:相关性图
-	ChartInfoId                       int32     `json:"chart_info_id"`                                                                                     // 指标id
-	ChartName                         string    `json:"chart_name"`                                                                                        // 图表名称
-	SysUserId                         int32     `json:"sys_user_id"`                                                                                       // 系统用户id
-	CreateTime                        time.Time `json:"create_time"`                                                                                       // 创建时间
+	ChartInfoPermissionNoAuthRecordId int64     `json:"chart_info_permission_no_auth_record_id"  orm:"column(chart_info_permission_no_auth_record_id);pk" gorm:"primaryKey" ` // 资产数据操作记录id
+	OpUniqueCode                      string    `json:"op_unique_code"`                                                                                                       // 操作的唯一编码,主要是记录统一操作的日志
+	Source                            int32     `json:"source"`                                                                                                               // 1:ETA图库;2:商品价格曲线;3:相关性图
+	ChartInfoId                       int32     `json:"chart_info_id"`                                                                                                        // 指标id
+	ChartName                         string    `json:"chart_name"`                                                                                                           // 图表名称
+	SysUserId                         int32     `json:"sys_user_id"`                                                                                                          // 系统用户id
+	CreateTime                        time.Time `json:"create_time"`                                                                                                          // 创建时间
 }
 
 // AddChartInfoPermissionNoAuthRecordBySourceAndDataIdList
@@ -809,13 +809,13 @@ func GetChartInfoDataPermissionNoAuthRecordListByUserId(userId int32, chartSourc
 }
 
 type ChartInfoClassifyPermissionNoAuthRecord struct {
-	ChartInfoClassifyPermissionNoAuthRecordId int64     `json:"chart_info_classify_permission_no_auth_record_id" orm:"column(chart_info_classify_permission_no_auth_record_id);pk"` // 资产分类数据操作记录id
-	Source                                    int32     `json:"source"`                                                                                                             // 子来源 :ETA表格中的各种表格类型,以及图表的来源(这个是后续的扩展方向)
-	OpUniqueCode                              string    `json:"op_unique_code"`                                                                                                     // 操作的唯一编码,主要是记录统一操作的日志
-	ClassifyId                                string    `json:"classify_id"`                                                                                                        // 图表资产分类id
-	ClassifyName                              string    `json:"classify_name"`                                                                                                      // 图表资产分类名称
-	SysUserId                                 int32     `json:"sys_user_id"`                                                                                                        // 系统用户id
-	CreateTime                                time.Time `json:"create_time"`                                                                                                        // 创建时间
+	ChartInfoClassifyPermissionNoAuthRecordId int64     `json:"chart_info_classify_permission_no_auth_record_id" orm:"column(chart_info_classify_permission_no_auth_record_id);pk" gorm:"primaryKey" ` // 资产分类数据操作记录id
+	Source                                    int32     `json:"source"`                                                                                                                                // 子来源 :ETA表格中的各种表格类型,以及图表的来源(这个是后续的扩展方向)
+	OpUniqueCode                              string    `json:"op_unique_code"`                                                                                                                        // 操作的唯一编码,主要是记录统一操作的日志
+	ClassifyId                                string    `json:"classify_id"`                                                                                                                           // 图表资产分类id
+	ClassifyName                              string    `json:"classify_name"`                                                                                                                         // 图表资产分类名称
+	SysUserId                                 int32     `json:"sys_user_id"`                                                                                                                           // 系统用户id
+	CreateTime                                time.Time `json:"create_time"`                                                                                                                           // 创建时间
 }
 
 // AddChartInfoClassifyNoAuthRecordBySourceAndClassifyIdList

+ 8 - 8
models/data_manage/data_manage_permission/classify_no_auth_record.go

@@ -9,14 +9,14 @@ import (
 // DataPermissionClassifyNoAuthRecord
 // @Description: 资产分类数据权限未授权记录表
 type DataPermissionClassifyNoAuthRecord struct {
-	DataPermissionClassifyNoAuthRecordId int64     `json:"data_permission_classify_no_auth_record_id" orm:"column(data_permission_classify_no_auth_record_id);pk"` // 资产分类数据操作记录id
-	Source                               int32     `json:"source"`                                                                                                 // 数据来源,1:手工数据指标 2:钢联化工数据库 3:ETA指标库 4:ETA预测指标 5:图库 6:ETA表格
-	SubSource                            int32     `json:"sub_source"`                                                                                             // 子来源 :ETA表格中的各种表格类型,以及图表的来源(这个是后续的扩展方向)
-	OpUniqueCode                         string    `json:"op_unique_code"`                                                                                         // 操作的唯一编码,主要是记录统一操作的日志
-	ClassifyId                           string    `json:"classify_id"`                                                                                            // 资产分类id(指标、图表、表格)
-	ClassifyName                         string    `json:"classify_name"`                                                                                          // 资产分类名称(指标、图表、表格)
-	SysUserId                            int32     `json:"sys_user_id"`                                                                                            // 系统用户id
-	CreateTime                           time.Time `json:"create_time"`                                                                                            // 创建时间
+	DataPermissionClassifyNoAuthRecordId int64     `json:"data_permission_classify_no_auth_record_id" orm:"column(data_permission_classify_no_auth_record_id);pk" gorm:"primaryKey" ` // 资产分类数据操作记录id
+	Source                               int32     `json:"source"`                                                                                                                    // 数据来源,1:手工数据指标 2:钢联化工数据库 3:ETA指标库 4:ETA预测指标 5:图库 6:ETA表格
+	SubSource                            int32     `json:"sub_source"`                                                                                                                // 子来源 :ETA表格中的各种表格类型,以及图表的来源(这个是后续的扩展方向)
+	OpUniqueCode                         string    `json:"op_unique_code"`                                                                                                            // 操作的唯一编码,主要是记录统一操作的日志
+	ClassifyId                           string    `json:"classify_id"`                                                                                                               // 资产分类id(指标、图表、表格)
+	ClassifyName                         string    `json:"classify_name"`                                                                                                             // 资产分类名称(指标、图表、表格)
+	SysUserId                            int32     `json:"sys_user_id"`                                                                                                               // 系统用户id
+	CreateTime                           time.Time `json:"create_time"`                                                                                                               // 创建时间
 }
 
 type ClassifyDataItem struct {

+ 17 - 17
models/data_manage/data_manage_permission/edb.go

@@ -11,7 +11,7 @@ import (
 // EdbInfoPermission
 // @Description: 指标权限表
 type EdbInfoPermission struct {
-	EdbInfoPermissionId int64     `json:"edb_info_permission_id" orm:"column(edb_info_permission_id);pk"`
+	EdbInfoPermissionId int64     `json:"edb_info_permission_id" orm:"column(edb_info_permission_id);pk" gorm:"primaryKey" `
 	EdbInfoId           int32     `json:"edb_info_id"`   // 指标id
 	EdbInfoType         int32     `json:"edb_info_type"` // 指标类型,0:普通指标,1:预测指标
 	SysUserId           int32     `json:"sys_user_id"`   // 系统用户id
@@ -22,7 +22,7 @@ type EdbInfoPermission struct {
 // EdbClassifyPermission
 // @Description: 指标分类权限表
 type EdbClassifyPermission struct {
-	EdbClassifyPermissionId int64     `json:"edb_classify_permission_id" orm:"column(edb_classify_permission_id);pk"`
+	EdbClassifyPermissionId int64     `json:"edb_classify_permission_id" orm:"column(edb_classify_permission_id);pk" gorm:"primaryKey" `
 	EdbClassifyId           int32     `json:"edb_classify_id"`   // 分类id
 	EdbClassifyType         int32     `json:"edb_classify_type"` // 分类类型,0:普通指标分类,1:预测指标分类
 	SysUserId               int32     `json:"sys_user_id"`       // 系统用户id
@@ -602,14 +602,14 @@ func InheritParentClassifyByEdbClassifyId(source, classifyType, classifyId, pare
 // EdbInfoPermissionNoAuthRecord
 // @Description: 指标数据权限未授权记录表
 type EdbInfoPermissionNoAuthRecord struct {
-	EdbInfoPermissionNoAuthRecordId int64     `json:"edb_info_permission_no_auth_record_id"  orm:"column(edb_info_permission_no_auth_record_id);pk"` // 资产数据操作记录id
-	OpUniqueCode                    string    `json:"op_unique_code"`                                                                                // 操作的唯一编码,主要是记录统一操作的日志
-	EdbInfoType                     int32     `json:"edb_info_type"`                                                                                 // 指标类型,0:普通指标,1:预测指标
-	EdbInfoId                       int32     `json:"edb_info_id"`                                                                                   // 指标id
-	EdbCode                         string    `json:"edb_code"`                                                                                      // 指标编码
-	EdbName                         string    `json:"edb_name"`                                                                                      // 指标名称
-	SysUserId                       int32     `json:"sys_user_id"`                                                                                   // 系统用户id
-	CreateTime                      time.Time `json:"create_time"`                                                                                   // 创建时间
+	EdbInfoPermissionNoAuthRecordId int64     `json:"edb_info_permission_no_auth_record_id"  orm:"column(edb_info_permission_no_auth_record_id);pk" gorm:"primaryKey" ` // 资产数据操作记录id
+	OpUniqueCode                    string    `json:"op_unique_code"`                                                                                                   // 操作的唯一编码,主要是记录统一操作的日志
+	EdbInfoType                     int32     `json:"edb_info_type"`                                                                                                    // 指标类型,0:普通指标,1:预测指标
+	EdbInfoId                       int32     `json:"edb_info_id"`                                                                                                      // 指标id
+	EdbCode                         string    `json:"edb_code"`                                                                                                         // 指标编码
+	EdbName                         string    `json:"edb_name"`                                                                                                         // 指标名称
+	SysUserId                       int32     `json:"sys_user_id"`                                                                                                      // 系统用户id
+	CreateTime                      time.Time `json:"create_time"`                                                                                                      // 创建时间
 }
 
 // AddEdbInfoPermissionNoAuthRecordBySourceAndDataIdList
@@ -835,13 +835,13 @@ func GetEdbInfoDataPermissionNoAuthRecordListByUserId(userId int32, edbInfoType,
 }
 
 type EdbInfoClassifyPermissionNoAuthRecord struct {
-	EdbInfoClassifyPermissionNoAuthRecordId int64     `json:"edb_info_classify_permission_no_auth_record_id" orm:"column(edb_info_classify_permission_no_auth_record_id);pk"` // 资产分类数据操作记录id
-	EdbClassifyType                         int32     `json:"edb_classify_type"`                                                                                              // 子来源 :ETA表格中的各种表格类型,以及图表的来源(这个是后续的扩展方向)
-	OpUniqueCode                            string    `json:"op_unique_code"`                                                                                                 // 操作的唯一编码,主要是记录统一操作的日志
-	ClassifyId                              string    `json:"classify_id"`                                                                                                    // 资产分类id(指标、图表、表格)
-	ClassifyName                            string    `json:"classify_name"`                                                                                                  // 资产分类名称(指标、图表、表格)
-	SysUserId                               int32     `json:"sys_user_id"`                                                                                                    // 系统用户id
-	CreateTime                              time.Time `json:"create_time"`                                                                                                    // 创建时间
+	EdbInfoClassifyPermissionNoAuthRecordId int64     `json:"edb_info_classify_permission_no_auth_record_id" orm:"column(edb_info_classify_permission_no_auth_record_id);pk" gorm:"primaryKey" ` // 资产分类数据操作记录id
+	EdbClassifyType                         int32     `json:"edb_classify_type"`                                                                                                                 // 子来源 :ETA表格中的各种表格类型,以及图表的来源(这个是后续的扩展方向)
+	OpUniqueCode                            string    `json:"op_unique_code"`                                                                                                                    // 操作的唯一编码,主要是记录统一操作的日志
+	ClassifyId                              string    `json:"classify_id"`                                                                                                                       // 资产分类id(指标、图表、表格)
+	ClassifyName                            string    `json:"classify_name"`                                                                                                                     // 资产分类名称(指标、图表、表格)
+	SysUserId                               int32     `json:"sys_user_id"`                                                                                                                       // 系统用户id
+	CreateTime                              time.Time `json:"create_time"`                                                                                                                       // 创建时间
 }
 
 // AddEdbInfoClassifyNoAuthRecordBySourceAndClassifyIdList

+ 16 - 16
models/data_manage/data_manage_permission/excel.go

@@ -9,7 +9,7 @@ import (
 )
 
 type ExcelInfoPermission struct {
-	ExcelInfoPermissionId int64     `json:"excel_info_permission_id" orm:"column(excel_info_permission_id);pk"`
+	ExcelInfoPermissionId int64     `json:"excel_info_permission_id" orm:"column(excel_info_permission_id);pk" gorm:"primaryKey" `
 	ExcelInfoId           int32     `json:"excel_info_id"`   // ETA表格id
 	Source                int32     `json:"source"`          // 表格来源,1:excel插件的表格,2:自定义表格,3:混合表格,4:自定义分析,默认:1
 	SysUserId             int32     `json:"sys_user_id"`     // 系统用户id
@@ -19,7 +19,7 @@ type ExcelInfoPermission struct {
 }
 
 type ExcelClassifyPermission struct {
-	ExcelClassifyPermissionId int64     `json:"excel_classify_permission_id" orm:"column(excel_classify_permission_id);pk"`
+	ExcelClassifyPermissionId int64     `json:"excel_classify_permission_id" orm:"column(excel_classify_permission_id);pk" gorm:"primaryKey" `
 	ExcelClassifyId           int32     `json:"excel_classify_id"` // 分类id
 	Source                    int32     `json:"source"`            // 表格来源,1:excel插件的表格,2:自定义表格,3:混合表格,4:自定义分析,默认:1
 	SysUserId                 int32     `json:"sys_user_id"`       // 系统用户id
@@ -459,13 +459,13 @@ func InheritParentClassifyByExcelClassifyId(dataSource, excelSource, classifyId,
 // ExcelInfoPermissionNoAuthRecord
 // @Description: ETA表格数据权限未授权记录表
 type ExcelInfoPermissionNoAuthRecord struct {
-	ExcelInfoPermissionNoAuthRecordId int64     `json:"excel_info_permission_no_auth_record_id"  orm:"column(excel_info_permission_no_auth_record_id);pk"` // 资产数据操作记录id
-	OpUniqueCode                      string    `json:"op_unique_code"`                                                                                    // 操作的唯一编码,主要是记录统一操作的日志
-	Source                            int32     `json:"source"`                                                                                            // 表格来源,1:excel插件的表格,2:自定义表格,3:混合表格,4:自定义分析,默认:1
-	ExcelInfoId                       int32     `json:"excel_info_id"`                                                                                     // 指标id
-	ExcelName                         string    `json:"excel_name"`                                                                                        // 图表名称
-	SysUserId                         int32     `json:"sys_user_id"`                                                                                       // 系统用户id
-	CreateTime                        time.Time `json:"create_time"`                                                                                       // 创建时间
+	ExcelInfoPermissionNoAuthRecordId int64     `json:"excel_info_permission_no_auth_record_id"  orm:"column(excel_info_permission_no_auth_record_id);pk" gorm:"primaryKey" ` // 资产数据操作记录id
+	OpUniqueCode                      string    `json:"op_unique_code"`                                                                                                       // 操作的唯一编码,主要是记录统一操作的日志
+	Source                            int32     `json:"source"`                                                                                                               // 表格来源,1:excel插件的表格,2:自定义表格,3:混合表格,4:自定义分析,默认:1
+	ExcelInfoId                       int32     `json:"excel_info_id"`                                                                                                        // 指标id
+	ExcelName                         string    `json:"excel_name"`                                                                                                           // 图表名称
+	SysUserId                         int32     `json:"sys_user_id"`                                                                                                          // 系统用户id
+	CreateTime                        time.Time `json:"create_time"`                                                                                                          // 创建时间
 }
 
 // AddExcelInfoPermissionNoAuthRecordBySourceAndDataIdList
@@ -635,13 +635,13 @@ func GetExcelInfoDataPermissionNoAuthRecordListByUserId(userId, excelSource int3
 }
 
 type ExcelInfoClassifyPermissionNoAuthRecord struct {
-	ExcelInfoClassifyPermissionNoAuthRecordId int64     `json:"excel_info_classify_permission_no_auth_record_id" orm:"column(excel_info_classify_permission_no_auth_record_id);pk"` // 资产分类数据操作记录id
-	Source                                    int32     `json:"source"`                                                                                                             // 子来源 :ETA表格中的各种表格类型,以及图表的来源(这个是后续的扩展方向)
-	OpUniqueCode                              string    `json:"op_unique_code"`                                                                                                     // 操作的唯一编码,主要是记录统一操作的日志
-	ClassifyId                                string    `json:"classify_id"`                                                                                                        // ETA表格资产分类id
-	ClassifyName                              string    `json:"classify_name"`                                                                                                      // ETA表格资产分类名称
-	SysUserId                                 int32     `json:"sys_user_id"`                                                                                                        // 系统用户id
-	CreateTime                                time.Time `json:"create_time"`                                                                                                        // 创建时间
+	ExcelInfoClassifyPermissionNoAuthRecordId int64     `json:"excel_info_classify_permission_no_auth_record_id" orm:"column(excel_info_classify_permission_no_auth_record_id);pk" gorm:"primaryKey" ` // 资产分类数据操作记录id
+	Source                                    int32     `json:"source"`                                                                                                                                // 子来源 :ETA表格中的各种表格类型,以及图表的来源(这个是后续的扩展方向)
+	OpUniqueCode                              string    `json:"op_unique_code"`                                                                                                                        // 操作的唯一编码,主要是记录统一操作的日志
+	ClassifyId                                string    `json:"classify_id"`                                                                                                                           // ETA表格资产分类id
+	ClassifyName                              string    `json:"classify_name"`                                                                                                                         // ETA表格资产分类名称
+	SysUserId                                 int32     `json:"sys_user_id"`                                                                                                                           // 系统用户id
+	CreateTime                                time.Time `json:"create_time"`                                                                                                                           // 创建时间
 }
 
 // AddExcelInfoClassifyNoAuthRecordBySourceAndClassifyIdList

+ 1 - 1
models/data_manage/data_manage_permission/message.go

@@ -11,7 +11,7 @@ import (
 // DataPermissionMessage
 // @Description: 数据权限变更消息表
 type DataPermissionMessage struct {
-	DataPermissionMessageId int64     `json:"data_permission_message_id" orm:"column(data_permission_message_id);pk"`
+	DataPermissionMessageId int64     `json:"data_permission_message_id" orm:"column(data_permission_message_id);pk" gorm:"primaryKey" `
 	SendUserId              int32     `json:"send_user_id"`    // 发送人ID
 	ReceiveUserId           int32     `json:"receive_user_id"` // 接收者ID
 	Content                 string    `json:"content"`         // 消息内容

+ 12 - 12
models/data_manage/data_manage_permission/move_record.go

@@ -9,18 +9,18 @@ import (
 // DataPermissionMoveRecord
 // @Description: 数据资产转移记录表
 type DataPermissionMoveRecord struct {
-	DataPermissionMoveRecordId int64     `json:"data_permission_move_record_id" orm:"column(data_permission_move_record_id);pk"` // 数据操作记录id
-	Source                     int32     `json:"source"`                                                                         // 数据来源,1:手工数据指标 2:钢联化工数据库 3:ETA指标库 4:ETA预测指标 5:图库 6:ETA表格
-	SubSource                  int32     `json:"sub_source"`                                                                     // 子来源 :ETA表格中的各种表格类型,以及图表的来源(这个是后续的扩展方向)
-	OpUniqueCode               string    `json:"op_unique_code"`                                                                 // 操作的唯一编码,主要是记录统一操作的日志
-	DataId                     string    `json:"data_id"`                                                                        // 资产id(指标、图表、表格)
-	DataCode                   string    `json:"data_code"`                                                                      // 资产code(指标、图表、表格)
-	DataName                   string    `json:"data_name"`                                                                      // 资产名称(指标、图表、表格)
-	OriginalUserId             int32     `json:"original_user_id"`                                                               // 原创建人id
-	OriginalUserName           string    `json:"original_user_name"`                                                             // 原创建人名称
-	NewUserId                  int32     `json:"new_user_id"`                                                                    // 新创建人id
-	NewUserName                string    `json:"new_user_name"`                                                                  // 新创建人名称
-	CreateTime                 time.Time `json:"create_time"`                                                                    // 创建时间
+	DataPermissionMoveRecordId int64     `json:"data_permission_move_record_id" orm:"column(data_permission_move_record_id);pk" gorm:"primaryKey" ` // 数据操作记录id
+	Source                     int32     `json:"source"`                                                                                            // 数据来源,1:手工数据指标 2:钢联化工数据库 3:ETA指标库 4:ETA预测指标 5:图库 6:ETA表格
+	SubSource                  int32     `json:"sub_source"`                                                                                        // 子来源 :ETA表格中的各种表格类型,以及图表的来源(这个是后续的扩展方向)
+	OpUniqueCode               string    `json:"op_unique_code"`                                                                                    // 操作的唯一编码,主要是记录统一操作的日志
+	DataId                     string    `json:"data_id"`                                                                                           // 资产id(指标、图表、表格)
+	DataCode                   string    `json:"data_code"`                                                                                         // 资产code(指标、图表、表格)
+	DataName                   string    `json:"data_name"`                                                                                         // 资产名称(指标、图表、表格)
+	OriginalUserId             int32     `json:"original_user_id"`                                                                                  // 原创建人id
+	OriginalUserName           string    `json:"original_user_name"`                                                                                // 原创建人名称
+	NewUserId                  int32     `json:"new_user_id"`                                                                                       // 新创建人id
+	NewUserName                string    `json:"new_user_name"`                                                                                     // 新创建人名称
+	CreateTime                 time.Time `json:"create_time"`                                                                                       // 创建时间
 }
 
 // AddDataPermissionMoveRecord

+ 9 - 9
models/data_manage/data_manage_permission/no_auth_record.go

@@ -9,15 +9,15 @@ import (
 // DataPermissionNoAuthRecord
 // @Description: 资产数据权限设置记录表
 type DataPermissionNoAuthRecord struct {
-	DataPermissionNoAuthRecordId int64     `json:"data_permission_no_auth_record_id" orm:"column(data_permission_no_auth_record_id);pk"` // 资产数据操作记录id
-	Source                       int32     `json:"source"`                                                                               // 数据来源,1:手工数据指标 2:钢联化工数据库 3:ETA指标库 4:ETA预测指标 5:图库 6:ETA表格
-	SubSource                    int32     `json:"sub_source"`                                                                           // 子来源 :ETA表格中的各种表格类型,以及图表的来源(这个是后续的扩展方向)
-	OpUniqueCode                 string    `json:"op_unique_code"`                                                                       // 操作的唯一编码,主要是记录统一操作的日志
-	DataId                       string    `json:"data_id"`                                                                              // 资产id(指标、图表、表格)
-	DataCode                     string    `json:"data_code"`                                                                            // 资产code(指标、图表、表格)
-	DataName                     string    `json:"data_name"`                                                                            // 资产名称(指标、图表、表格)
-	SysUserId                    int32     `json:"sys_user_id"`                                                                          // 系统用户id
-	CreateTime                   time.Time `json:"create_time"`                                                                          // 创建时间
+	DataPermissionNoAuthRecordId int64     `json:"data_permission_no_auth_record_id" orm:"column(data_permission_no_auth_record_id);pk" gorm:"primaryKey" ` // 资产数据操作记录id
+	Source                       int32     `json:"source"`                                                                                                  // 数据来源,1:手工数据指标 2:钢联化工数据库 3:ETA指标库 4:ETA预测指标 5:图库 6:ETA表格
+	SubSource                    int32     `json:"sub_source"`                                                                                              // 子来源 :ETA表格中的各种表格类型,以及图表的来源(这个是后续的扩展方向)
+	OpUniqueCode                 string    `json:"op_unique_code"`                                                                                          // 操作的唯一编码,主要是记录统一操作的日志
+	DataId                       string    `json:"data_id"`                                                                                                 // 资产id(指标、图表、表格)
+	DataCode                     string    `json:"data_code"`                                                                                               // 资产code(指标、图表、表格)
+	DataName                     string    `json:"data_name"`                                                                                               // 资产名称(指标、图表、表格)
+	SysUserId                    int32     `json:"sys_user_id"`                                                                                             // 系统用户id
+	CreateTime                   time.Time `json:"create_time"`                                                                                             // 创建时间
 }
 
 type DataItem struct {

+ 1 - 1
models/data_manage/data_manage_permission/req_and_resp.go

@@ -56,7 +56,7 @@ type SetEdbChartClassifyPermissionReq struct {
 // DataPermissionMessageItem
 // @Description: 数据权限变更消息结构体
 type DataPermissionMessageItem struct {
-	DataPermissionMessageId int64  `orm:"column(data_permission_message_id);pk"`
+	DataPermissionMessageId int64  `orm:"column(data_permission_message_id);pk" gorm:"primaryKey" `
 	SendUserId              int32  // 发送人ID
 	ReceiveUserId           int32  // 接收者ID
 	Content                 string // 消息内容

+ 2 - 2
models/data_manage/edb_classify.go

@@ -9,7 +9,7 @@ import (
 )
 
 type EdbClassify struct {
-	ClassifyId             int       `orm:"column(classify_id);pk"`
+	ClassifyId             int       `orm:"column(classify_id);pk" gorm:"primaryKey" `
 	ClassifyType           uint8     `description:"分类类型,0:普通指标分类,1:预测指标分类"`
 	ClassifyName           string    `description:"分类名称"`
 	ParentId               int       `description:"父级id"`
@@ -316,7 +316,7 @@ type ClassifyDeleteCheckResp struct {
 	TableList    []*ExcelBaseInfo `description:"关联的表格"`
 }
 type ExcelBaseInfo struct {
-	ExcelInfoId     int    `orm:"column(excel_info_id);pk"`
+	ExcelInfoId     int    `orm:"column(excel_info_id);pk" gorm:"primaryKey" `
 	Source          int    `description:"表格来源,1:excel插件的表格,2:自定义表格,3:混合表格,4:自定义分析,默认:1"`
 	ExcelType       int    `description:"表格类型,1:指标列,2:日期列,默认:1"`
 	ExcelName       string `description:"表格名称"`

+ 1 - 1
models/data_manage/edb_data_baiinfo.go

@@ -5,7 +5,7 @@ import (
 )
 
 type BaseFromBaiinfoDataSimple struct {
-	BaiinfoDataId          int `orm:"column(baiinfo_data_id);pk"`
+	BaiinfoDataId          int `orm:"column(baiinfo_data_id);pk" gorm:"primaryKey" `
 	BaseFromBaiinfoIndexId int
 	IndexCode              string
 	DataTime               string

+ 1 - 1
models/data_manage/edb_data_base.go

@@ -214,7 +214,7 @@ func GetEdbDataTableName(source, subSource int) (tableName string) {
 //}
 
 type EdbDataBase struct {
-	EdbDataId     int `orm:"column(edb_data_id);pk"`
+	EdbDataId     int `orm:"column(edb_data_id);pk" gorm:"primaryKey" `
 	EdbInfoId     int
 	EdbCode       string
 	DataTime      string

+ 2 - 2
models/data_manage/edb_data_cffex.go

@@ -12,7 +12,7 @@ type CffexData struct {
 }
 
 type BaseFromCffexDataSimple struct {
-	Id        int `orm:"column(base_from_trade_cffex_index_id);pk"`
+	Id        int `orm:"column(base_from_trade_cffex_index_id);pk" gorm:"primaryKey" `
 	DealCode  string
 	BuyCode   string
 	SoldCode  string
@@ -29,7 +29,7 @@ type BaseInfoFromCffex struct {
 }
 
 type BaseFromTradeCFFEXIndex struct {
-	BaseFromTradeCffexIndexId int `orm:"column(base_from_trade_cffex_index_id);pk"`
+	BaseFromTradeCffexIndexId int `orm:"column(base_from_trade_cffex_index_id);pk" gorm:"primaryKey" `
 	Rank                      int
 	DealShortName             string
 	DealName                  string

+ 2 - 2
models/data_manage/edb_data_coal.go

@@ -12,7 +12,7 @@ type CoalData struct {
 }
 
 type BaseFromCoalDataSimple struct {
-	Id        int `orm:"column(base_from_trade_coal_index_id);pk"`
+	Id        int `orm:"column(base_from_trade_coal_index_id);pk" gorm:"primaryKey" `
 	DealCode  string
 	BuyCode   string
 	SoldCode  string
@@ -29,7 +29,7 @@ type BaseInfoFromCoal struct {
 }
 
 type BaseFromTradeCoalIndex struct {
-	BaseFromTradeCoalIndexId int `orm:"column(base_from_trade_coal_index_id);pk"`
+	BaseFromTradeCoalIndexId int `orm:"column(base_from_trade_coal_index_id);pk" gorm:"primaryKey" `
 	Rank                     int
 	DealShortName            string
 	DealName                 string

+ 2 - 2
models/data_manage/edb_data_dl.go

@@ -12,7 +12,7 @@ type DlData struct {
 }
 
 type BaseFromDlDataSimple struct {
-	Id        int `orm:"column(base_from_trade_dalian_index_id);pk"`
+	Id        int `orm:"column(base_from_trade_dalian_index_id);pk" gorm:"primaryKey" `
 	DealCode  string
 	BuyCode   string
 	SoldCode  string
@@ -29,7 +29,7 @@ type BaseInfoFromDl struct {
 }
 
 type BaseFromTradeDalianIndex struct {
-	BaseFromTradeDalianIndexId int `orm:"column(base_from_trade_dalian_index_id);pk"`
+	BaseFromTradeDalianIndexId int `orm:"column(base_from_trade_dalian_index_id);pk" gorm:"primaryKey" `
 	Rank                       int
 	DealShortName              string
 	DealName                   string

+ 1 - 1
models/data_manage/edb_data_from_python.go

@@ -6,7 +6,7 @@ import (
 
 // EdbDataPython python指标数据结构体
 type EdbDataPython struct {
-	EdbDataId     int `orm:"column(edb_data_id);pk"`
+	EdbDataId     int `orm:"column(edb_data_id);pk" gorm:"primaryKey" `
 	EdbInfoId     int
 	EdbCode       string
 	DataTime      string

+ 1 - 1
models/data_manage/edb_data_gie.go

@@ -27,7 +27,7 @@ func GetEdbDataGieMaxOrMinDate(edbCode string) (minDate, maxDate string, err err
 }
 
 type EicIndexV2 struct {
-	BaseFromEicIndexId     int `orm:"column(base_from_eic_index_id);pk"`
+	BaseFromEicIndexId     int `orm:"column(base_from_eic_index_id);pk" gorm:"primaryKey" `
 	Type                   string
 	EicCode                string
 	Name                   string

+ 1 - 1
models/data_manage/edb_data_insert_config.go

@@ -15,7 +15,7 @@ import (
 
 // EdbDataInsertConfig 指标数据插入配置表
 type EdbDataInsertConfig struct {
-	EdbInfoId  int       `orm:"column(edb_info_id);pk" description:"指标id"`
+	EdbInfoId  int       `orm:"column(edb_info_id);pk" gorm:"primaryKey"  description:"指标id"`
 	Date       time.Time `description:"插入的日期"`
 	Value      string    `description:"插入的值"`
 	RealDate   time.Time `description:"实际数据的值日期"`

+ 1 - 1
models/data_manage/edb_data_manual.go

@@ -21,7 +21,7 @@ func GetEdbDataManualMaxOrMinDate(edbCode string) (minDate, maxDate string, err
 }
 
 type ManualEdbdata struct {
-	TradeCode  string    `orm:"column(TRADE_CODE);pk" description:"指标编码"`
+	TradeCode  string    `orm:"column(TRADE_CODE);pk" gorm:"primaryKey"  description:"指标编码"`
 	Dt         string    `orm:"column(DT)" description:"日期"`
 	Close      string    `orm:"column(CLOSE)" description:"值"`
 	ModifyTime time.Time `orm:"column(modify_time)" description:"修改时间"`

+ 1 - 1
models/data_manage/edb_data_oilchem.go

@@ -26,7 +26,7 @@ func GetEdbDataOilchemMaxOrMinDate(edbCode string) (minDate, maxDate string, err
 }
 
 type BaseFromOilchemIndexItem struct {
-	BaseFromSciIndexId int    `orm:"column(base_from_oilchem_index_id);pk"` // 主键,自动递增
+	BaseFromSciIndexId int    `orm:"column(base_from_oilchem_index_id);pk" gorm:"primaryKey" ` // 主键,自动递增
 	IndexCode          string // 指标编码
 	IndexName          string // 指标名称
 	ClassifyId         int    // 分类Id

+ 1 - 1
models/data_manage/edb_data_pb.go

@@ -6,7 +6,7 @@ import (
 )
 
 type EdbDataPb struct {
-	EdbDataId     int `orm:"column(edb_data_id);pk"`
+	EdbDataId     int `orm:"column(edb_data_id);pk" gorm:"primaryKey" `
 	EdbInfoId     int
 	EdbCode       string
 	DataTime      string

+ 1 - 1
models/data_manage/edb_data_sci99.go

@@ -26,7 +26,7 @@ func GetEdbDataSci99MaxOrMinDate(edbCode string) (minDate, maxDate string, err e
 }
 
 type BaseFromSci99IndexItem struct {
-	BaseFromSciIndexId int    `orm:"column(base_from_sci99_index_id);pk"` // 主键,自动递增
+	BaseFromSciIndexId int    `orm:"column(base_from_sci99_index_id);pk" gorm:"primaryKey" ` // 主键,自动递增
 	IndexCode          string // 指标编码
 	IndexName          string // 指标名称
 	ClassifyId         int    // 分类Id

+ 2 - 2
models/data_manage/edb_data_sh.go

@@ -12,7 +12,7 @@ type ShData struct {
 }
 
 type BaseFromShDataSimple struct {
-	Id        int `orm:"column(base_from_trade_shanghai_index_id);pk"`
+	Id        int `orm:"column(base_from_trade_shanghai_index_id);pk" gorm:"primaryKey" `
 	DealCode  string
 	BuyCode   string
 	SoldCode  string
@@ -29,7 +29,7 @@ type BaseInfoFromSh struct {
 }
 
 type BaseFromTradeShIndex struct {
-	BaseFromTradeShIndexId int `orm:"column(base_from_trade_shanghai_index_id);pk"`
+	BaseFromTradeShIndexId int `orm:"column(base_from_trade_shanghai_index_id);pk" gorm:"primaryKey" `
 	Rank                   int
 	DealShortName          string
 	DealName               string

+ 2 - 2
models/data_manage/edb_data_shfe.go

@@ -12,7 +12,7 @@ type ShfeData struct {
 }
 
 type BaseFromShfeDataSimple struct {
-	Id        int `orm:"column(base_from_trade_ine_index_id);pk"`
+	Id        int `orm:"column(base_from_trade_ine_index_id);pk" gorm:"primaryKey" `
 	DealCode  string
 	BuyCode   string
 	SoldCode  string
@@ -29,7 +29,7 @@ type BaseInfoFromShfe struct {
 }
 
 type BaseFromTradeShfeIndex struct {
-	BaseFromTradeShfeIndexId int `orm:"column(base_from_trade_ine_index_id);pk"`
+	BaseFromTradeShfeIndexId int `orm:"column(base_from_trade_ine_index_id);pk" gorm:"primaryKey" `
 	Rank                     int
 	DealShortName            string
 	DealName                 string

+ 1 - 1
models/data_manage/edb_data_ths.go

@@ -6,7 +6,7 @@ import (
 )
 
 type EdbDataThs struct {
-	EdbDataId     int `orm:"column(edb_data_id);pk"`
+	EdbDataId     int `orm:"column(edb_data_id);pk" gorm:"primaryKey" `
 	EdbInfoId     int
 	EdbCode       string
 	DataTime      string

+ 1 - 1
models/data_manage/edb_data_wind.go

@@ -7,7 +7,7 @@ import (
 )
 
 type EdbDataWind struct {
-	EdbDataId     int `orm:"column(edb_data_id);pk"`
+	EdbDataId     int `orm:"column(edb_data_id);pk" gorm:"primaryKey" `
 	EdbInfoId     int
 	EdbCode       string
 	DataTime      string

+ 1 - 1
models/data_manage/edb_data_ys.go

@@ -22,7 +22,7 @@ import (
 )
 
 type BaseFromSmmDataSimple struct {
-	SmmDataId          int `orm:"column(smm_data_id);pk"`
+	SmmDataId          int `orm:"column(smm_data_id);pk" gorm:"primaryKey" `
 	BaseFromSmmIndexId int
 	IndexCode          string
 	DataTime           string

+ 2 - 2
models/data_manage/edb_data_zz.go

@@ -12,7 +12,7 @@ type ZzData struct {
 }
 
 type BaseFromZzDataSimple struct {
-	Id        int `orm:"column(base_from_trade_zhengzhou_index_id);pk"`
+	Id        int `orm:"column(base_from_trade_zhengzhou_index_id);pk" gorm:"primaryKey" `
 	DealCode  string
 	BuyCode   string
 	SoldCode  string
@@ -29,7 +29,7 @@ type BaseInfoFromZz struct {
 }
 
 type BaseFromTradeZhengzhouIndex struct {
-	BaseFromTradeZhengzhouIndexId int `orm:"column(base_from_trade_zhengzhou_index_id);pk"`
+	BaseFromTradeZhengzhouIndexId int `orm:"column(base_from_trade_zhengzhou_index_id);pk" gorm:"primaryKey" `
 	Rank                          int
 	DealShortName                 string
 	DealName                      string

+ 4 - 4
models/data_manage/edb_info.go

@@ -19,7 +19,7 @@ import (
 )
 
 type EdbInfo struct {
-	EdbInfoId        int    `orm:"column(edb_info_id);pk"`
+	EdbInfoId        int    `orm:"column(edb_info_id);pk" gorm:"primaryKey" `
 	EdbInfoType      int    `description:"指标类型,0:普通指标,1:预测指标"`
 	SourceName       string `description:"来源名称"`
 	Source           int    `description:"来源id"`
@@ -413,7 +413,7 @@ func ModifyEdbEnInfo(item *EditEdbEnInfoReq) (err error) {
 }
 
 type EdbInfoList struct {
-	EdbInfoId        int                     `orm:"column(edb_info_id);pk"`
+	EdbInfoId        int                     `orm:"column(edb_info_id);pk" gorm:"primaryKey" `
 	EdbInfoType      int                     `description:"指标类型,0:普通指标,1:预测指标"`
 	SourceName       string                  `description:"来源名称"`
 	Source           int                     `description:"来源id"`
@@ -465,7 +465,7 @@ type EdbDataInsertConfigItem struct {
 }
 
 type EdbData struct {
-	EdbDataId int `orm:"column(edb_data_id);pk"`
+	EdbDataId int `orm:"column(edb_data_id);pk" gorm:"primaryKey" `
 	EdbInfoId int
 	DataTime  string
 	Value     float64
@@ -1201,7 +1201,7 @@ func ReplaceChartEdb(oldEdbInfo, newEdbInfo *EdbInfo) (relationEdbInfoIdList []i
 }
 
 type EdbInfoView struct {
-	EdbInfoId        int    `orm:"column(edb_info_id);pk"`
+	EdbInfoId        int    `orm:"column(edb_info_id);pk" gorm:"primaryKey" `
 	EdbInfoType      int    `description:"指标类型,0:普通指标,1:预测指标"`
 	SourceName       string `description:"来源名称"`
 	Source           int    `description:"来源id"`

+ 2 - 2
models/data_manage/edb_info_calculate.go

@@ -28,7 +28,7 @@ type EdbInfoFromTag struct {
 }
 
 type EdbInfoCalculate struct {
-	EdbInfoCalculateId int       `orm:"column(edb_info_calculate_id);pk"`
+	EdbInfoCalculateId int       `orm:"column(edb_info_calculate_id);pk" gorm:"primaryKey" `
 	EdbInfoId          int       `description:"指标id"`
 	EdbCode            string    `description:"指标编码"`
 	FromEdbInfoId      int       `description:"计算指标id"`
@@ -49,7 +49,7 @@ type FromEdbInfoData struct {
 }
 
 type EdbInfoCalculateDetail struct {
-	EdbInfoCalculateId int       `orm:"column(edb_info_calculate_id);pk"`
+	EdbInfoCalculateId int       `orm:"column(edb_info_calculate_id);pk" gorm:"primaryKey" `
 	EdbInfoId          int       `description:"指标id"`
 	EdbCode            string    `description:"指标编码"`
 	FromEdbInfoId      int       `description:"计算指标id"`

+ 3 - 3
models/data_manage/edb_info_calculate_mapping.go

@@ -8,7 +8,7 @@ import (
 
 // EdbInfoCalculateMapping 计算指标于基础指标,关系表
 type EdbInfoCalculateMapping struct {
-	EdbInfoCalculateMappingId int       `orm:"column(edb_info_calculate_mapping_id);pk"`
+	EdbInfoCalculateMappingId int       `orm:"column(edb_info_calculate_mapping_id);pk" gorm:"primaryKey" `
 	EdbInfoId                 int       `description:"计算指标id"`
 	Source                    int       `description:"计算指标来源"`
 	SourceName                string    `description:"计算指标来源名称"`
@@ -33,7 +33,7 @@ func GetEdbInfoCalculateMappingCount(edbInfoId int) (count int, err error) {
 }
 
 type EdbInfoCalculateMappingView struct {
-	EdbInfoCalculateMappingId int       `orm:"column(edb_info_calculate_mapping_id);pk"`
+	EdbInfoCalculateMappingId int       `orm:"column(edb_info_calculate_mapping_id);pk" gorm:"primaryKey" `
 	EdbInfoId                 int       `description:"计算指标id"`
 	Source                    int       `description:"计算指标来源"`
 	SourceName                string    `description:"计算指标来源名称"`
@@ -67,7 +67,7 @@ func GetEdbInfoCalculateMappingDetail(edbInfoId int) (item *EdbInfoCalculateMapp
 // EdbInfoCalculateMappingInfo
 // @Description: 计算指标与基础指标关系表
 type EdbInfoCalculateMappingInfo struct {
-	EdbInfoCalculateMappingId int       `orm:"column(edb_info_calculate_mapping_id);pk"`
+	EdbInfoCalculateMappingId int       `orm:"column(edb_info_calculate_mapping_id);pk" gorm:"primaryKey" `
 	EdbInfoId                 int       `description:"计算指标id"`
 	Source                    int       `description:"计算指标来源"`
 	SourceName                string    `description:"计算指标来源名称"`

+ 1 - 1
models/data_manage/edb_info_log.go

@@ -6,7 +6,7 @@ import (
 )
 
 type EdbInfoLog struct {
-	EdbInfoLogId    int `orm:"column(edb_info_log_id);pk"`
+	EdbInfoLogId    int `orm:"column(edb_info_log_id);pk" gorm:"primaryKey" `
 	EdbInfoId       int
 	SourceName      string `description:"来源名称"`
 	Source          int    `description:"来源id"`

Some files were not shown because too many files changed in this diff