317699326@qq.com преди 1 месец
родител
ревизия
ba94a1dbf3
променени са 100 файла, в които са добавени 328 реда и са изтрити 256 реда
  1. 14 3
      controllers/data_manage/edb_info.go
  2. 1 1
      models/ai_predict_model/ai_predict_model_classify.go
  3. 1 1
      models/ai_predict_model/ai_predict_model_dashboard.go
  4. 1 1
      models/ai_predict_model/ai_predict_model_dashboard_detail.go
  5. 1 1
      models/ai_predict_model/ai_predict_model_data.go
  6. 1 1
      models/ai_predict_model/ai_predict_model_framework.go
  7. 1 1
      models/ai_predict_model/ai_predict_model_framework_node.go
  8. 1 1
      models/ai_predict_model/ai_predict_model_index.go
  9. 2 3
      models/ai_summary/ai_pormpt.go
  10. 1 1
      models/ai_summary/ai_summary.go
  11. 1 1
      models/ai_summary/ai_summary_classify.go
  12. 2 2
      models/aimod/ai.go
  13. 1 1
      models/aimod/file_upload_record.go
  14. 1 1
      models/bi_dashboard/bi_dashboard.go
  15. 11 12
      models/bi_dashboard/bi_dashboard_detail.go
  16. 5 5
      models/bi_dashboard/bi_dashboard_grant.go
  17. 1 1
      models/bi_dashboard/bi_dashboard_home_page.go
  18. 1 1
      models/binlog/business_sys_interaction_log.go
  19. 1 1
      models/business_conf.go
  20. 1 1
      models/business_conf_operation_record.go
  21. 1 1
      models/chart_permission.go
  22. 1 1
      models/classify.go
  23. 3 3
      models/classify_menu.go
  24. 1 1
      models/classify_menu_relation.go
  25. 2 2
      models/cloud_disk_menu.go
  26. 1 1
      models/cloud_disk_resource.go
  27. 1 1
      models/company/company.go
  28. 3 3
      models/data_manage/base_from_baiinfo.go
  29. 1 1
      models/data_manage/base_from_baiinfo_classify.go
  30. 1 1
      models/data_manage/base_from_clarksons_classify.go
  31. 7 7
      models/data_manage/base_from_clarksons_data.go
  32. 37 36
      models/data_manage/base_from_clarksons_index.go
  33. 1 1
      models/data_manage/base_from_edb_mapping.go
  34. 2 2
      models/data_manage/base_from_eia_stero.go
  35. 3 3
      models/data_manage/base_from_sci.go
  36. 1 1
      models/data_manage/base_from_sci_classify.go
  37. 1 1
      models/data_manage/base_from_sci_hq_classify.go
  38. 1 1
      models/data_manage/base_from_sci_hq_data.go
  39. 1 1
      models/data_manage/base_from_sci_hq_index.go
  40. 3 3
      models/data_manage/base_from_smm.go
  41. 1 1
      models/data_manage/base_from_smm_classify.go
  42. 1 1
      models/data_manage/base_from_ths_hf.go
  43. 1 1
      models/data_manage/base_from_ths_hf_classify.go
  44. 1 1
      models/data_manage/base_from_ths_hf_data.go
  45. 1 1
      models/data_manage/chart_classify.go
  46. 1 1
      models/data_manage/chart_edb_mapping.go
  47. 1 1
      models/data_manage/chart_framework.go
  48. 1 1
      models/data_manage/chart_framework_node.go
  49. 1 1
      models/data_manage/chart_info.go
  50. 1 1
      models/data_manage/chart_info_correlation.go
  51. 1 1
      models/data_manage/chart_info_log.go
  52. 1 1
      models/data_manage/chart_series.go
  53. 1 1
      models/data_manage/chart_series_edb_mapping.go
  54. 1 1
      models/data_manage/chart_theme/chart_theme.go
  55. 1 1
      models/data_manage/chart_theme/chart_theme_default_data.go
  56. 1 1
      models/data_manage/chart_theme/chart_theme_type.go
  57. 1 1
      models/data_manage/com_trade_country.go
  58. 1 1
      models/data_manage/com_trade_data.go
  59. 1 1
      models/data_manage/cross_variety/chart_info_cross_variety.go
  60. 1 1
      models/data_manage/cross_variety/chart_tag.go
  61. 1 1
      models/data_manage/cross_variety/chart_tag_variety.go
  62. 1 1
      models/data_manage/cross_variety/chart_variety.go
  63. 1 1
      models/data_manage/cross_variety/chart_variety_mapping.go
  64. 16 16
      models/data_manage/data_manage_permission/chart.go
  65. 8 8
      models/data_manage/data_manage_permission/classify_no_auth_record.go
  66. 17 17
      models/data_manage/data_manage_permission/edb.go
  67. 16 16
      models/data_manage/data_manage_permission/excel.go
  68. 1 1
      models/data_manage/data_manage_permission/message.go
  69. 12 12
      models/data_manage/data_manage_permission/move_record.go
  70. 9 9
      models/data_manage/data_manage_permission/no_auth_record.go
  71. 1 1
      models/data_manage/edb_classify.go
  72. 2 2
      models/data_manage/edb_data_insert_config.go
  73. 1 1
      models/data_manage/edb_data_pb.go
  74. 1 1
      models/data_manage/edb_data_ths.go
  75. 1 1
      models/data_manage/edb_data_wind.go
  76. 65 3
      models/data_manage/edb_info.go
  77. 1 1
      models/data_manage/edb_info_calculate.go
  78. 1 1
      models/data_manage/edb_info_calculate_mapping.go
  79. 1 1
      models/data_manage/edb_info_log.go
  80. 1 1
      models/data_manage/edb_info_no_permission_admin.go
  81. 1 1
      models/data_manage/edb_info_record.go
  82. 1 1
      models/data_manage/edb_info_relation.go
  83. 1 1
      models/data_manage/edb_refresh/edb_refresh_config.go
  84. 1 1
      models/data_manage/edb_refresh/edb_refresh_default_config.go
  85. 1 1
      models/data_manage/edb_refresh/edb_refresh_mapping.go
  86. 9 9
      models/data_manage/edb_refresh/edb_refresh_source.go
  87. 1 1
      models/data_manage/edb_terminal.go
  88. 1 1
      models/data_manage/excel/excel_chart_data.go
  89. 1 1
      models/data_manage/excel/excel_chart_edb.go
  90. 2 2
      models/data_manage/excel/excel_classify.go
  91. 1 1
      models/data_manage/excel/excel_draft.go
  92. 1 1
      models/data_manage/excel/excel_edb_mapping.go
  93. 1 1
      models/data_manage/excel/excel_info.go
  94. 1 1
      models/data_manage/excel/excel_info_rule_mapping.go
  95. 1 1
      models/data_manage/excel/excel_sheet.go
  96. 1 1
      models/data_manage/excel/excel_sheet_data.go
  97. 1 1
      models/data_manage/excel/excel_worker.go
  98. 2 2
      models/data_manage/excel_style.go
  99. 1 1
      models/data_manage/factor_edb_series.go
  100. 1 1
      models/data_manage/factor_edb_series_calculate_data.go

+ 14 - 3
controllers/data_manage/edb_info.go

@@ -3889,6 +3889,19 @@ func (this *ChartInfoController) EdbInfoData() {
 		return
 	}
 
+	edbInfoExt, err := data_manage.GetEdbInfoByIdExt(edbInfoId)
+	if err != nil {
+		if err.Error() == utils.ErrNoRow() {
+			br.Ret = 200
+			return
+		}
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败,Err:" + err.Error()
+		return
+	}
+
+	fmt.Println("ModifyTime:", edbInfo.ModifyTime)
+	fmt.Println("StartDate:", edbInfoExt.StartDate)
 	// 分类
 	classifyList, err, errMsg := data.GetFullClassifyByClassifyId(edbInfo.ClassifyId)
 	if err != nil {
@@ -6799,7 +6812,6 @@ func (this *EdbInfoController) ModifyEdbList() {
 
 	classifyIds := strings.Split(req.EdbClassifyIds, ",")
 
-
 	if !req.SelectAll && req.EdbInfoIds == "" {
 		br.Msg = "请选择图表"
 		return
@@ -6918,7 +6930,6 @@ func (this *EdbInfoController) ModifyEdbList() {
 			return
 		}
 
-
 		for _, v := range list {
 			edbInfoIds = append(edbInfoIds, v.EdbInfoId)
 		}
@@ -6952,4 +6963,4 @@ func (this *EdbInfoController) ModifyEdbList() {
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "操作成功"
-}
+}

+ 1 - 1
models/ai_predict_model/ai_predict_model_classify.go

@@ -10,7 +10,7 @@ import (
 
 // AiPredictModelClassify 同花顺高频数据-分类
 type AiPredictModelClassify struct {
-	AiPredictModelClassifyId int       `orm:"column(ai_predict_model_classify_id);pk"`
+	AiPredictModelClassifyId int       `orm:"column(ai_predict_model_classify_id);pk;auto"`
 	UniqueCode               string    `description:"唯一编码"`
 	ClassifyName             string    `description:"分类名称"`
 	ClassifyNameEn           string    `description:"英文分类名称"`

+ 1 - 1
models/ai_predict_model/ai_predict_model_dashboard.go

@@ -10,7 +10,7 @@ import (
 
 // AiPredictModelDashboard AI预测模型-BI看板
 type AiPredictModelDashboard struct {
-	AiPredictModelDashboardId int       `orm:"column(ai_predict_model_dashboard_id);pk"`
+	AiPredictModelDashboardId int       `orm:"column(ai_predict_model_dashboard_id);pk;auto"`
 	AiPredictModelIndexId     int       `description:"标的ID"`
 	DashboardName             string    `description:"看板名称"`
 	Sort                      int       `description:"排序"`

+ 1 - 1
models/ai_predict_model/ai_predict_model_dashboard_detail.go

@@ -10,7 +10,7 @@ import (
 
 // AiPredictModelDashboardDetail AI预测模型-BI看板
 type AiPredictModelDashboardDetail struct {
-	AiPredictModelDashboardDetailId int       `orm:"column(ai_predict_model_dashboard_detail_id);pk"`
+	AiPredictModelDashboardDetailId int       `orm:"column(ai_predict_model_dashboard_detail_id);pk;auto"`
 	AiPredictModelDashboardId       int       `description:"看板ID"`
 	Type                            int       `description:"类型:1-图表;2-表格"`
 	UniqueCode                      string    `description:"图表/表格唯一编码"`

+ 1 - 1
models/ai_predict_model/ai_predict_model_data.go

@@ -16,7 +16,7 @@ const (
 
 // AiPredictModelData AI预测模型标的数据
 type AiPredictModelData struct {
-	AiPredictModelDataId  int             `orm:"column(ai_predict_model_data_id);pk"`
+	AiPredictModelDataId  int             `orm:"column(ai_predict_model_data_id);pk;auto"`
 	AiPredictModelIndexId int             `description:"标的ID"`
 	IndexCode             string          `description:"标的编码"`
 	DataTime              time.Time       `description:"数据日期"`

+ 1 - 1
models/ai_predict_model/ai_predict_model_framework.go

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

+ 1 - 1
models/ai_predict_model/ai_predict_model_framework_node.go

@@ -10,7 +10,7 @@ import (
 
 // AiPredictModelFrameworkNode 图库框架节点表
 type AiPredictModelFrameworkNode struct {
-	AiPredictModelFrameworkNodeId int       `orm:"column(ai_predict_model_framework_node_id);pk"`
+	AiPredictModelFrameworkNodeId int       `orm:"column(ai_predict_model_framework_node_id);pk;auto"`
 	AiPredictModelFrameworkId     int       `description:"框架ID"`
 	FrameworkName                 string    `description:"框架名称"`
 	NodeId                        string    `description:"节点ID"`

+ 1 - 1
models/ai_predict_model/ai_predict_model_index.go

@@ -12,7 +12,7 @@ import (
 
 // AiPredictModelIndex AI预测模型标的
 type AiPredictModelIndex struct {
-	AiPredictModelIndexId int       `orm:"column(ai_predict_model_index_id);pk"`
+	AiPredictModelIndexId int       `orm:"column(ai_predict_model_index_id);pk;auto"`
 	IndexName             string    `description:"标的名称"`
 	IndexCode             string    `description:"自生成的指标编码"`
 	ClassifyId            int       `description:"分类ID"`

+ 2 - 3
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;auto"` // 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
-}
+}

+ 1 - 1
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;auto"` // ai纪要id
 	SaDocId         int       // 文档ID
 	OriginContent   string    // 原始内容
 	SummaryContent  string    // 纪要内容

+ 1 - 1
models/ai_summary/ai_summary_classify.go

@@ -9,7 +9,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;auto"` // ai纪要分类id
 	ClassifyName        string    // 分类名称
 	ParentId            int       // 父级id
 	CreateTime          time.Time // 创建时间

+ 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;auto"`
 	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;auto"`
 	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;auto"`
 	AdminId             int       `description:"用户id"`
 	FileUrl             string    `description:"文件地址"`
 	FileName            string    `description:"文件名称"`

+ 1 - 1
models/bi_dashboard/bi_dashboard.go

@@ -6,7 +6,7 @@ import (
 )
 
 type BiDashboard struct {
-	BiDashboardId         int       `orm:"column(bi_dashboard_id);pk"`         // bi看板id
+	BiDashboardId         int       `orm:"column(bi_dashboard_id);pk;auto"`    // bi看板id
 	BiDashboardClassifyId int       `gorm:"column:bi_dashboard_classify_id" `  // 看板分类id
 	BiDashboardName       string    `gorm:"column:bi_dashboard_name;size:255"` // 看板名称
 	SysAdminId            int       `gorm:"column:sys_admin_id" `              // 创建人ID

+ 11 - 12
models/bi_dashboard/bi_dashboard_detail.go

@@ -6,13 +6,13 @@ import (
 )
 
 type BiDashboardDetail struct {
-	BiDashboardDetailId int       `orm:"column(bi_dashboard_detail_id);pk" ` // bi看板id
-	BiDashboardId       int       `gorm:"column:bi_dashboard_id" `                                 // 看板id
-	Type                int       `gorm:"column:type" `                                            // 1图表 2表格
-	UniqueCode          string    `gorm:"column:unique_code;size:32;not null" `                    // 报告唯一编码
-	Sort                int       `gorm:"column:sort" `                                            // 排序字段
-	CreateTime          time.Time `gorm:"column:create_time" `                                     // 创建时间
-	ModifyTime          time.Time `gorm:"column:modify_time" `                                     // 更新时间
+	BiDashboardDetailId int       `orm:"column(bi_dashboard_detail_id);pk;auto" ` // bi看板id
+	BiDashboardId       int       `gorm:"column:bi_dashboard_id" `                // 看板id
+	Type                int       `gorm:"column:type" `                           // 1图表 2表格
+	UniqueCode          string    `gorm:"column:unique_code;size:32;not null" `   // 报告唯一编码
+	Sort                int       `gorm:"column:sort" `                           // 排序字段
+	CreateTime          time.Time `gorm:"column:create_time" `                    // 创建时间
+	ModifyTime          time.Time `gorm:"column:modify_time" `                    // 更新时间
 }
 
 // tableName
@@ -22,8 +22,8 @@ func (m *BiDashboardDetail) TableName() string {
 
 // add
 //func AddBiDashboardDetail(item *BiDashboardDetail) (err error) {
-	//err = global.DEFAULT_DmSQL.Create(item).Error
-	//return
+//err = global.DEFAULT_DmSQL.Create(item).Error
+//return
 //}
 
 func GetBiDashboardDetailById(id int) (list []*BiDashboardDetail, err error) {
@@ -56,7 +56,7 @@ type MoveDashboardDetailReq struct {
 }
 
 // update
-func EditBiDashboardDetail(item *BiDashboardDetail) (err error){
+func EditBiDashboardDetail(item *BiDashboardDetail) (err error) {
 	//return global.DEFAULT_DmSQL.Model(item).Where("bi_dashboard_detail_id = ?", item.BiDashboardDetailId).Updates(item).Error
 	o := orm.NewOrm()
 	_, err = o.Raw("UPDATE bi_dashboard_detail SET bi_dashboard_id=?,type=?,unique_code=?,sort=?,modify_time=? WHERE bi_dashboard_detail_id=?", item.BiDashboardId, item.Type, item.UniqueCode, item.Sort, item.ModifyTime, item.BiDashboardDetailId).Exec()
@@ -67,11 +67,10 @@ type DelDashboardDetailReq struct {
 	BiDashboardDetailId int `description:"看板详情id"`
 }
 
-
 // del
 func DeleteBiDashboardDetailByDetailId(id int) (err error) {
 	//return global.DEFAULT_DmSQL.Where("bi_dashboard_detail_id = ?", id).Delete(&BiDashboardDetail{}).Error
 	o := orm.NewOrm()
 	_, err = o.Raw("DELETE from bi_dashboard_detail where bi_dashboard_detail_id=?", id).Exec()
 	return
-}
+}

+ 5 - 5
models/bi_dashboard/bi_dashboard_grant.go

@@ -6,10 +6,10 @@ import (
 )
 
 type BiDashboardGrant struct {
-	GrantId       int       `orm:"column(grant_id);pk"` // 授权id
-	BiDashboardId int       `gorm:"column:bi_dashboard_id" `                  // 看板id
-	GrantAdminId  int       `gorm:"column:grant_admin_id"`                    // 授权的用户id
-	CreateTime    time.Time `gorm:"column:create_time"`                       // 授权时间
+	GrantId       int       `orm:"column(grant_id);pk;auto"` // 授权id
+	BiDashboardId int       `gorm:"column:bi_dashboard_id" ` // 看板id
+	GrantAdminId  int       `gorm:"column:grant_admin_id"`   // 授权的用户id
+	CreateTime    time.Time `gorm:"column:create_time"`      // 授权时间
 }
 
 // tableName
@@ -72,4 +72,4 @@ func GetDashboardGrantInfo(biDashboardId int) (list []*BiDashboardGrant, err err
 	o := orm.NewOrm()
 	_, err = o.Raw("SELECT * FROM bi_dashboard_grant where bi_dashboard_id=?", biDashboardId).QueryRows(&list)
 	return
-}
+}

+ 1 - 1
models/bi_dashboard/bi_dashboard_home_page.go

@@ -6,7 +6,7 @@ import (
 )
 
 type BiDashboardHomePage struct {
-	BiDashboardHomePageId int       `orm:"column(bi_dashboard_home_page_id);pk"`
+	BiDashboardHomePageId int       `orm:"column(bi_dashboard_home_page_id);pk;auto"`
 	BiDashboardId         int       `gorm:"type:int(10);default:null;comment:'看板id'"`
 	AdminId               int       `gorm:"type:int(10);default:null;"`
 	CreateTime            time.Time `gorm:"type:datetime;comment:'创建时间'"`

+ 1 - 1
models/binlog/business_sys_interaction_log.go

@@ -8,7 +8,7 @@ import (
 
 // BusinessSysInteractionLog 商家系统交互记录表
 type BusinessSysInteractionLog struct {
-	ID             uint32    `orm:"column(id);pk"`
+	ID             uint32    `orm:"column(id);pk;auto"`
 	InteractionKey string    // 记录Key
 	InteractionVal string    // 记录值
 	Remark         string    // 备注

+ 1 - 1
models/business_conf.go

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

+ 1 - 1
models/business_conf_operation_record.go

@@ -9,7 +9,7 @@ import (
 
 // BusinessConfOperationRecord 商户配置操作记录表
 type BusinessConfOperationRecord struct {
-	Id          int       `orm:"column(id);pk"`
+	Id          int       `orm:"column(id);pk;auto"`
 	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       `orm:"column(chart_permission_id);pk" description:"问题ID" json:"chart_permission_id"`
+	ChartPermissionId     int       `orm:"column(chart_permission_id);pk;auto" description:"问题ID" json:"chart_permission_id"`
 	ChartPermissionName   string    `description:"名称" json:"chart_permission_name"`
 	PermissionName        string    `description:"权限名" json:"permission_name"`
 	Sort                  int       `description:"排序" json:"sort"`

+ 1 - 1
models/classify.go

@@ -10,7 +10,7 @@ import (
 )
 
 type Classify struct {
-	Id                   int       `orm:"column(id);pk"`
+	Id                   int       `orm:"column(id);pk;auto"`
 	ClassifyName         string    `description:"分类名称"`
 	Sort                 int       `json:"-"`
 	ParentId             int       `description:"父级分类id"`

+ 3 - 3
models/classify_menu.go

@@ -8,7 +8,7 @@ import (
 
 // ClassifyMenu 报告分类-子目录表
 type ClassifyMenu struct {
-	MenuId     int       `orm:"column(menu_id);pk"`
+	MenuId     int       `orm:"column(menu_id);pk;auto"`
 	MenuName   string    `description:"子目录名称"`
 	ClassifyId int       `description:"一级分类ID"`
 	Sort       int       `description:"排序"`
@@ -62,8 +62,8 @@ func GetClassifyMenuList(condition string, pars []interface{}) (list []*Classify
 
 // ClassifyMenuSaveReq 保存分类子目录请求体
 type ClassifyMenuSaveReq struct {
-	MenuId     int    `description:"子目录ID, 0为新增, 大于0为编辑"`
-	MenuName   string `description:"子目录名称"`
+	MenuId   int    `description:"子目录ID, 0为新增, 大于0为编辑"`
+	MenuName string `description:"子目录名称"`
 	//ClassifyId int    `description:"一级分类ID"`
 }
 

+ 1 - 1
models/classify_menu_relation.go

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

+ 2 - 2
models/cloud_disk_menu.go

@@ -1,15 +1,15 @@
 package models
 
 import (
+	"eta/eta_api/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
-	"eta/eta_api/utils"
 	"strings"
 	"time"
 )
 
 type CloudDiskMenu struct {
-	MenuId     int       `orm:"column(menu_id);pk" description:"目录ID"`
+	MenuId     int       `orm:"column(menu_id);pk;auto" description:"目录ID"`
 	MenuName   string    `description:"目录名称"`
 	ParentId   int       `description:"父级ID"`
 	Size       int64     `description:"目录大小"`

+ 1 - 1
models/cloud_disk_resource.go

@@ -15,7 +15,7 @@ const (
 )
 
 type CloudDiskResource struct {
-	ResourceId     int       `orm:"column(resource_id);pk" description:"资源ID"`
+	ResourceId     int       `orm:"column(resource_id);pk;auto" 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;auto"`
 	CompanyName     string    `description:"客户名称"`
 	CompanyType     int       `orm:"column(type)"`
 	CreditCode      string    `description:"社会统一信用码"`

+ 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;auto"`
 	Aid               int
 	Name              string
 	Interface         string
@@ -54,7 +54,7 @@ func GetBaseFromBaiinfoByBaiinfoCode(baiinfoCode string) (item *BaseFromBaiinfo,
 }
 
 type BaseFromBaiinfoIndex struct {
-	BaseFromBaiinfoIndexId int `orm:"column(base_from_baiinfo_index_id);pk"`
+	BaseFromBaiinfoIndexId int `orm:"column(base_from_baiinfo_index_id);pk;auto"`
 	ClassifyId             int
 	Interface              string
 	IndexCode              string
@@ -80,7 +80,7 @@ func GetBaseFromBaiinfoIndex() (list []*BaseFromBaiinfoIndex, err error) {
 }
 
 type BaseFromBaiinfoData struct {
-	BaiinfoDataId          int `orm:"column(baiinfo_data_id);pk"`
+	BaiinfoDataId          int `orm:"column(baiinfo_data_id);pk;auto"`
 	BaseFromBaiinfoIndexId int
 	IndexCode              string
 	DataTime               string

+ 1 - 1
models/data_manage/base_from_baiinfo_classify.go

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

+ 1 - 1
models/data_manage/base_from_clarksons_classify.go

@@ -10,7 +10,7 @@ import (
 
 // BaseFromClarksonsClassify 卓创红期原始数据分类表
 type BaseFromClarksonsClassify struct {
-	BaseFromClassifyId int       `orm:"column(base_from_clarksons_classify_id);pk"`
+	BaseFromClassifyId int       `orm:"column(base_from_clarksons_classify_id);pk;auto"`
 	ClassifyName       string    `description:"分类名称"`
 	ParentId           int       `description:"父级id"`
 	Level              int       `description:"层级"`

+ 7 - 7
models/data_manage/base_from_clarksons_data.go

@@ -8,14 +8,14 @@ import (
 )
 
 type BaseFromClarksonsData struct {
-	BaseFromClarksonsDataId          int       `orm:"column(base_from_clarksons_data_id);pk"`
+	BaseFromClarksonsDataId  int       `orm:"column(base_from_clarksons_data_id);pk;auto"`
 	BaseFromClarksonsIndexId int       `description:"指标id"`
-	IndexCode            string    `description:"指标编码"`
-	DataTime             string    `description:"数据日期"`
-	Value                float64   `description:"数据值"`
-	CreateTime           time.Time `description:"创建时间"`
-	ModifyTime           time.Time `description:"修改时间"`
-	DataTimestamp        int64     `description:"数据时间戳"`
+	IndexCode                string    `description:"指标编码"`
+	DataTime                 string    `description:"数据日期"`
+	Value                    float64   `description:"数据值"`
+	CreateTime               time.Time `description:"创建时间"`
+	ModifyTime               time.Time `description:"修改时间"`
+	DataTimestamp            int64     `description:"数据时间戳"`
 }
 
 // GetClarksonsDataByIndexId 根据指标id获取指标数据

+ 37 - 36
models/data_manage/base_from_clarksons_index.go

@@ -9,49 +9,50 @@ import (
 )
 
 type BaseFromClarksonsIndex struct {
-	BaseFromClarksonsIndexId int       `orm:"pk"`
-	ClassifyId           int       `description:"指标分类id"`
-	IndexCode            string    `description:"指标编码"`
-	IndexName            string    `description:"指标名称"`
-	Unit                 string    `description:"单位"`
-	Frequency            string    `description:"频度"`
-	StartDate            string    `description:"开始日期"`
-	EndDate              string    `description:"结束日期"`
-	Sort                 int       `description:"排序"`
-	CreateTime           time.Time
-	ModifyTime           time.Time
+	BaseFromClarksonsIndexId int    `orm:"column(base_from_clarksons_index_id);pk;auto"`
+	ClassifyId               int    `description:"指标分类id"`
+	IndexCode                string `description:"指标编码"`
+	IndexName                string `description:"指标名称"`
+	Unit                     string `description:"单位"`
+	Frequency                string `description:"频度"`
+	StartDate                string `description:"开始日期"`
+	EndDate                  string `description:"结束日期"`
+	Sort                     int    `description:"排序"`
+	CreateTime               time.Time
+	ModifyTime               time.Time
 }
 
 type BaseFromClarksonsIndexView struct {
-	BaseFromClarksonsIndexId int     `orm:"pk"`
-	EdbInfoId            int     `description:"指标库id"`
-	ClassifyId           int     `description:"指标分类id"`
-	IndexCode            string  `description:"指标编码"`
-	IndexName            string  `description:"指标名称"`
-	UniqueCode           string  `description:"唯一code"`
-	Frequency            string  `description:"频度"`
-	Unit                 string  `description:"单位"`
-	StartDate            string  `description:"开始日期"`
-	EndDate              string  `description:"结束日期"`
-	Sort                 int     `description:"排序"`
-	LatestDate           string  `description:"最后更新时间"`
-	EdbExist             int     `description:"edb是否存在"`
-	ModifyTime           string
+	BaseFromClarksonsIndexId int    `orm:"pk"`
+	EdbInfoId                int    `description:"指标库id"`
+	ClassifyId               int    `description:"指标分类id"`
+	IndexCode                string `description:"指标编码"`
+	IndexName                string `description:"指标名称"`
+	UniqueCode               string `description:"唯一code"`
+	Frequency                string `description:"频度"`
+	Unit                     string `description:"单位"`
+	StartDate                string `description:"开始日期"`
+	EndDate                  string `description:"结束日期"`
+	Sort                     int    `description:"排序"`
+	LatestDate               string `description:"最后更新时间"`
+	EdbExist                 int    `description:"edb是否存在"`
+	ModifyTime               string
 }
 
 type BaseFromClarksonsIndexList struct {
-	BaseFromClarksonsIndexId int     `orm:"pk"`
-	IndexCode          string    // 指标编码
-	IndexName          string    // 指标名称
-	ClassifyId         int       // 分类Id
-	Unit               string    // 单位
-	Frequency          string    // 频度
-	Describe           string    // 指标描述
-	CreateTime         string // 创建时间
-	ModifyTime         string // 修改时间
-	DataList           []*BaseFromClarksonsData
-	Paging             *paging.PagingItem `description:"分页数据"`
+	BaseFromClarksonsIndexId int    `orm:"pk"`
+	IndexCode                string // 指标编码
+	IndexName                string // 指标名称
+	ClassifyId               int    // 分类Id
+	Unit                     string // 单位
+	Frequency                string // 频度
+	Describe                 string // 指标描述
+	CreateTime               string // 创建时间
+	ModifyTime               string // 修改时间
+	DataList                 []*BaseFromClarksonsData
+	Paging                   *paging.PagingItem `description:"分页数据"`
 }
+
 func (b *BaseFromClarksonsIndex) Update(cols []string) (err error) {
 	o := orm.NewOrmUsingDB("data")
 	_, err = o.Update(b, cols...)

+ 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;auto"`
 	BaseFromIndexId int       `description:"源指标ID"`
 	BaseIndexCode   string    `description:"源指标编码"`
 	EdbInfoId       int       `description:"指标ID"`

+ 2 - 2
models/data_manage/base_from_eia_stero.go

@@ -10,7 +10,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;auto"`
 	BaseFromEiaSteoClassifyId int       `description:"指标分类id"`
 	IndexCode                 string    `description:"指标编码"`
 	IndexName                 string    `description:"指标名称(中文名称)"`
@@ -43,7 +43,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;auto"`
 	ClassifyName              string    `description:"分类名称(中文名称)"`
 	ClassifyNameOriginal      string    `description:"分类名称(原始名称)"`
 	ParentId                  int       `description:"父级id"`

+ 3 - 3
models/data_manage/base_from_sci.go

@@ -9,7 +9,7 @@ import (
 )
 
 type BaseFromSci struct {
-	BaseFromSciId int `orm:"column(base_from_sci_id);pk"`
+	BaseFromSciId int `orm:"column(base_from_sci_id);pk;auto"`
 	Aid           int
 	Name          string
 	Interface     string
@@ -55,7 +55,7 @@ func GetBaseFromSciBySciCode(sciCode string) (item *BaseFromSci, err error) {
 }
 
 type BaseFromSciIndex struct {
-	BaseFromSciIndexId int `orm:"column(base_from_sci_index_id);pk"`
+	BaseFromSciIndexId int `orm:"column(base_from_sci_index_id);pk;auto"`
 	ClassifyId         int
 	Interface          string
 	IndexCode          string
@@ -83,7 +83,7 @@ func GetBaseFromSciIndex() (list []*BaseFromSciIndex, err error) {
 }
 
 type BaseFromSciData struct {
-	SciDataId          int `orm:"column(sci_data_id);pk"`
+	SciDataId          int `orm:"column(sci_data_id);pk;auto"`
 	BaseFromSciIndexId int
 	IndexCode          string
 	DataTime           string

+ 1 - 1
models/data_manage/base_from_sci_classify.go

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

+ 1 - 1
models/data_manage/base_from_sci_hq_classify.go

@@ -9,7 +9,7 @@ import (
 
 // BaseFromSciHqClassify 卓创红期原始数据分类表
 type BaseFromSciHqClassify struct {
-	ClassifyId     int       `orm:"column(classify_id);pk"`
+	ClassifyId     int       `orm:"column(classify_id);pk;auto"`
 	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;auto"`
 	BaseFromSciHqIndexId int       `description:"指标id"`
 	IndexCode            string    `description:"指标编码"`
 	DataTime             string    `description:"数据日期"`

+ 1 - 1
models/data_manage/base_from_sci_hq_index.go

@@ -8,7 +8,7 @@ import (
 )
 
 type BaseFromSciHqIndex struct {
-	BaseFromSciHqIndexId int       `orm:"pk"`
+	BaseFromSciHqIndexId int       `orm:"column(base_from_sci_index_id);pk;auto"`
 	ClassifyId           int       `description:"指标分类id"`
 	IndexCode            string    `description:"指标编码"`
 	IndexName            string    `description:"指标名称"`

+ 3 - 3
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;auto"`
 	Aid           int
 	Name          string
 	Interface     string
@@ -55,7 +55,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;auto"`
 	ClassifyId         int
 	Interface          string
 	Name               string
@@ -95,7 +95,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;auto"`
 	BaseFromSmmIndexId int
 	IndexCode          string
 	DataTime           string

+ 1 - 1
models/data_manage/base_from_smm_classify.go

@@ -9,7 +9,7 @@ import (
 
 // BaseFromSmmClassify SMM原始数据分类表
 type BaseFromSmmClassify struct {
-	ClassifyId      int       `orm:"column(classify_id);pk"`
+	ClassifyId      int       `orm:"column(classify_id);pk;auto"`
 	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;auto"`
 	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;auto"`
 	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;auto"`
 	BaseFromThsHfIndexId int       `description:"指标ID"`
 	IndexCode            string    `description:"指标编码"`
 	DataTime             time.Time `description:"数据日期(至时分秒)"`

+ 1 - 1
models/data_manage/chart_classify.go

@@ -9,7 +9,7 @@ import (
 )
 
 type ChartClassify struct {
-	ChartClassifyId     int       `orm:"column(chart_classify_id);pk"`
+	ChartClassifyId     int       `orm:"column(chart_classify_id);pk;auto"`
 	ChartClassifyName   string    `description:"分类名称"`
 	ParentId            int       `description:"父级id"`
 	HasData             int       `description:"是否含有指标数据"`

+ 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;auto"`
 	ChartInfoId       int       `description:"图表id"`
 	EdbInfoId         int       `description:"指标id"`
 	CreateTime        time.Time `description:"创建时间"`

+ 1 - 1
models/data_manage/chart_framework.go

@@ -11,7 +11,7 @@ import (
 
 // ChartFramework 图库框架表
 type ChartFramework struct {
-	ChartFrameworkId int       `orm:"column(chart_framework_id);pk"`
+	ChartFrameworkId int       `orm:"column(chart_framework_id);pk;auto"`
 	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;auto"`
 	ChartFrameworkId     int       `description:"框架ID"`
 	FrameworkName        string    `description:"框架名称"`
 	NodeId               string    `description:"节点ID"`

+ 1 - 1
models/data_manage/chart_info.go

@@ -15,7 +15,7 @@ import (
 )
 
 type ChartInfo struct {
-	ChartInfoId       int    `orm:"column(chart_info_id);pk"`
+	ChartInfoId       int    `orm:"column(chart_info_id);pk;auto"`
 	ChartName         string `description:"图表名称"`
 	ChartNameEn       string `description:"英文图表名称"`
 	ChartClassifyId   int    `description:"图表分类id"`

+ 1 - 1
models/data_manage/chart_info_correlation.go

@@ -9,7 +9,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;auto" 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;auto"`
 	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;auto"`
 	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;auto"`
 	ChartSeriesId           int       `description:"系列ID"`
 	ChartInfoId             int       `description:"图表ID"`
 	EdbInfoId               int       `description:"指标id"`

+ 1 - 1
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;auto"`
 	ChartThemeName   string    `description:"图表主题名称"`
 	ChartThemeTypeId int       `description:"图表主题类型ID"`
 	ChartImage       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;auto"`
 	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;auto"`
 	ChartTypeName       string    `description:"类型名称"`
 	ChartType           int       `description:"图表类型"`
 	ChartSource         int       `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;auto"`
 	ThirdId    int       `description:"第三方的国家id"`
 	Name       string    `description:"国家名称(英文)"`
 	NameCn     string    `description:"国家名称(中文)"`

+ 1 - 1
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;auto"`
 	ComTradeId         int       `description:"指标id"`
 	IndexCode          string    `description:"联合国商品贸易编码"`
 	Flow               string    `description:"贸易流向:X(Export:出口);M(Import:进口)"`

+ 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;auto"`
 	ChartInfoId    int       `description:"图表id"`
 	ChartXTagId    int       `description:"X轴的标签ID"`
 	ChartYTagId    int       `description:"X轴的标签ID"`

+ 1 - 1
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;auto"`
 	ChartTagName    string    `description:"标签名称"`
 	ChartTagNameEn  string    `description:"标签名称(英文)"`
 	SysUserId       int       `description:"创建人id"`

+ 1 - 1
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;auto"`
 	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;auto"`
 	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;auto"`
 	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;auto"`
 	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;auto"`
 	ChartClassifyId           int32     `json:"chart_classify_id"` // 分类id
 	Source                    int32     `json:"source"`            // 分类来源: 1-图库; 2-商品价格曲线; 3-相关性图表; 6-拟合方程图表; 7-统计特征
 	SysUserId                 int32     `json:"sys_user_id"`       // 系统用户id
@@ -470,13 +470,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;auto"` // 资产数据操作记录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
@@ -649,13 +649,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;auto"` // 资产分类数据操作记录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;auto"` // 资产分类数据操作记录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;auto"`
 	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;auto"`
 	EdbClassifyId           int32     `json:"edb_classify_id"`   // 分类id
 	EdbClassifyType         int32     `json:"edb_classify_type"` // 分类类型,0:普通指标分类,1:预测指标分类
 	SysUserId               int32     `json:"sys_user_id"`       // 系统用户id
@@ -490,14 +490,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;auto"` // 资产数据操作记录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
@@ -683,13 +683,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;auto"` // 资产分类数据操作记录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;auto"`
 	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;auto"`
 	ExcelClassifyId           int32     `json:"excel_classify_id"` // 分类id
 	Source                    int32     `json:"source"`            // 表格来源,1:excel插件的表格,2:自定义表格,3:混合表格,4:自定义分析,默认:1
 	SysUserId                 int32     `json:"sys_user_id"`       // 系统用户id
@@ -467,13 +467,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;auto"` // 资产数据操作记录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
@@ -646,13 +646,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;auto"` // 资产分类数据操作记录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;auto"`
 	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

@@ -8,18 +8,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;auto"` // 数据操作记录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;auto"` // 资产数据操作记录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/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;auto"`
 	ClassifyType           uint8     `description:"分类类型,0:普通指标分类,1:预测指标分类"`
 	ClassifyName           string    `description:"分类名称"`
 	ParentId               int       `description:"父级id"`

+ 2 - 2
models/data_manage/edb_data_insert_config.go

@@ -14,7 +14,7 @@ import (
 
 // EdbDataInsertConfig 指标数据插入配置表
 type EdbDataInsertConfig struct {
-	EdbInfoId  int       `orm:"column(edb_info_id);pk" description:"指标id"`
+	EdbInfoId  int       `orm:"column(edb_info_id);pk;auto" description:"指标id"`
 	Date       time.Time `description:"插入的日期"`
 	Value      string    `description:"插入的值"`
 	RealDate   time.Time `description:"实际数据的值日期"`
@@ -436,4 +436,4 @@ func updateThsHfInsertConfigValueByMongo(to orm.TxOrmer, edbInfo *EdbInfo, oldCo
 	err = mogDataObj.UpdateDataByColl(coll, bson.M{"_id": edbDateData.ID}, updateData)
 
 	return
-}
+}

+ 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;auto"`
 	EdbInfoId     int
 	EdbCode       string
 	DataTime      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;auto"`
 	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;auto"`
 	EdbInfoId     int
 	EdbCode       string
 	DataTime      string

+ 65 - 3
models/data_manage/edb_info.go

@@ -18,7 +18,7 @@ import (
 )
 
 type EdbInfo struct {
-	EdbInfoId        int    `orm:"column(edb_info_id);pk"`
+	EdbInfoId        int    `orm:"column(edb_info_id);pk;auto"`
 	EdbInfoType      int    `description:"指标类型,0:普通指标,1:预测指标"`
 	SourceName       string `description:"来源名称"`
 	Source           int    `description:"来源id"`
@@ -191,6 +191,67 @@ func GetEdbInfoById(edbInfoId int) (item *EdbInfo, err error) {
 	return
 }
 
+type EdbInfoExt struct {
+	EdbInfoId        int       `orm:"column(edb_info_id);pk"`
+	EdbInfoType      int       `description:"指标类型,0:普通指标,1:预测指标"`
+	SourceName       string    `description:"来源名称"`
+	Source           int       `description:"来源id"`
+	EdbCode          string    `description:"指标编码"`
+	EdbName          string    `description:"指标名称"`
+	EdbNameEn        string    `description:"英文指标名称"`
+	EdbNameSource    string    `description:"指标名称来源"`
+	Frequency        string    `description:"频率"`
+	Unit             string    `description:"单位"`
+	UnitEn           string    `description:"英文单位"`
+	StartDate        time.Time `description:"起始日期"`
+	EndDate          string    `description:"终止日期"`
+	ClassifyId       int       `description:"分类id"`
+	SysUserId        int
+	SysUserRealName  string
+	UniqueCode       string `description:"指标唯一编码"`
+	CreateTime       time.Time
+	ModifyTime       time.Time
+	BaseModifyTime   time.Time
+	MinValue         float64   `description:"指标最小值"`
+	MaxValue         float64   `description:"指标最大值"`
+	CalculateFormula string    `description:"计算公式"`
+	EdbType          int       `description:"指标类型:1:基础指标,2:计算指标"`
+	Sort             int       `description:"排序字段"`
+	LatestDate       string    `description:"数据最新日期(实际日期)"`
+	LatestValue      float64   `description:"数据最新值(实际值)"`
+	EndValue         float64   `description:"数据的最新值(预测日期的最新值)"`
+	MoveType         int       `description:"移动方式:1:领先(默认),2:滞后"`
+	MoveFrequency    string    `description:"移动频度"`
+	NoUpdate         int8      `description:"是否停止更新,0:继续更新;1:停止更新"`
+	ServerUrl        string    `description:"服务器地址"`
+	ChartImage       string    `description:"图表图片"`
+	Calendar         string    `description:"公历/农历" orm:"default(公历);"`
+	DataDateType     string    `orm:"column(data_date_type);size(255);null;default(交易日)"`
+	ManualSave       int       `description:"是否有手动保存过上下限: 0-否; 1-是"`
+	EmptyType        int       `description:"空值处理类型(0查找前后35天,1不计算,2前值填充,3后值填充,4等于0)"`
+	MaxEmptyType     int       `description:"MAX、MIN公式空值处理类型(1、等于0;2、跳过空值)"`
+	TerminalCode     string    `description:"终端编码,用于配置在机器上"`
+	DataUpdateTime   string    `description:"最近一次数据发生变化的时间"`
+	ErDataUpdateDate string    `description:"本次更新,数据发生变化的最早日期"`
+	SourceIndexName  string    `description:"数据源中的指标名称"`
+	SubSource        int       `description:"子数据来源:0:经济数据库,1:日期序列"`
+	SubSourceName    string    `description:"子数据来源名称"`
+	IndicatorCode    string    `description:"指标代码"`
+	StockCode        string    `description:"证券代码"`
+	Extra            string    `description:"指标额外配置"`
+	IsJoinPermission int       `description:"是否加入权限管控,0:不加入;1:加入;默认:0"`
+	IsStaticData     int       `description:"是否是静态指标,0否,1是"`
+	SetUpdateTime    time.Time `description:"设置启用/禁用刷新状态的时间"`
+	EndDateType      int       `description:"预测指标截止日期类型:0:未来日期,1未来期数"`
+}
+
+func GetEdbInfoByIdExt(edbInfoId int) (item *EdbInfoExt, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := ` SELECT * FROM edb_info WHERE edb_info_id=? `
+	err = o.Raw(sql, edbInfoId).QueryRow(&item)
+	return
+}
+
 // GetEdbInfoByUniqueCode
 // @Description: 根据uniqueCode获取指标详情
 // @author: Roc
@@ -878,8 +939,9 @@ type EdbInfoDataResp struct {
 }
 
 type EdbInfoDataFullClassifyResp struct {
-	EdbInfo  *EdbInfoFullClassify
-	DataList []*EdbDataList
+	EdbInfoExtItem *EdbInfoExt
+	EdbInfo        *EdbInfoFullClassify
+	DataList       []*EdbDataList
 }
 
 type EdbInfoReplaceReq struct {

+ 1 - 1
models/data_manage/edb_info_calculate.go

@@ -31,7 +31,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;auto"`
 	EdbInfoId          int       `description:"指标id"`
 	EdbCode            string    `description:"指标编码"`
 	FromEdbInfoId      int       `description:"计算指标id"`

+ 1 - 1
models/data_manage/edb_info_calculate_mapping.go

@@ -9,7 +9,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;auto"`
 	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;auto"`
 	EdbInfoId       int
 	SourceName      string `description:"来源名称"`
 	Source          int    `description:"来源id"`

+ 1 - 1
models/data_manage/edb_info_no_permission_admin.go

@@ -7,7 +7,7 @@ import (
 
 // EdbInfoNoPermissionAdmin 指标不可见用户配置表
 type EdbInfoNoPermissionAdmin struct {
-	Id         int `orm:"column(id);pk"`
+	Id         int `orm:"column(id);pk;auto"`
 	EdbInfoId  int `orm:"column(edb_info_id);"`
 	AdminId    int `orm:"column(admin_id);"`
 	CreateTime time.Time

+ 1 - 1
models/data_manage/edb_info_record.go

@@ -7,7 +7,7 @@ import (
 )
 
 type EdbInfoRecord struct {
-	EdbInfoRecordId     int       `orm:"column(edb_info_record_id);pk"`
+	EdbInfoRecordId     int       `orm:"column(edb_info_record_id);pk;auto"`
 	EdbInfoId           int       `orm:"column(edb_info_id)"`
 	OldEdbName          string    `description:"旧的指标名称"`
 	OldFrequency        string    `description:"旧的频率"`

+ 1 - 1
models/data_manage/edb_info_relation.go

@@ -8,7 +8,7 @@ import (
 )
 
 type EdbInfoRelation struct {
-	EdbInfoRelationId  int       `orm:"column(edb_info_relation_id);pk"`
+	EdbInfoRelationId  int       `orm:"column(edb_info_relation_id);pk;auto"`
 	EdbInfoId          int       `description:"指标id"`
 	Source             int       `description:"来源:1:同花顺,2:wind,3:彭博,4:指标运算,5:累计值转月,6:同比值,7:同差值,8:N数值移动平均计算,9:手工指标,10:隆众"`
 	EdbName            string    `description:"指标名称"`

+ 1 - 1
models/data_manage/edb_refresh/edb_refresh_config.go

@@ -10,7 +10,7 @@ import (
 // EdbRefreshConfig
 // @Description: 指标的刷新时间配置表
 type EdbRefreshConfig struct {
-	EdbRefreshConfigId  int       `orm:"column(edb_refresh_config_id);pk"`
+	EdbRefreshConfigId  int       `orm:"column(edb_refresh_config_id);pk;auto"`
 	RefreshFrequency    string    `description:"刷新频率"`
 	RefreshFrequencyDay int       `description:"具体刷新的日期"`
 	RefreshTime         string    `description:"刷新时间"`

+ 1 - 1
models/data_manage/edb_refresh/edb_refresh_default_config.go

@@ -9,7 +9,7 @@ import (
 // EdbRefreshDefaultConfig
 // @Description: 指标的默认刷新时间配置表
 type EdbRefreshDefaultConfig struct {
-	Id                  int       `orm:"column(id);pk"`
+	Id                  int       `orm:"column(id);pk;auto"`
 	Source              int       `description:"来源"`
 	SubSource           int       `description:"来源名称"`
 	Frequency           string    `description:"频度"`

+ 1 - 1
models/data_manage/edb_refresh/edb_refresh_mapping.go

@@ -9,7 +9,7 @@ import (
 // EdbRefreshMapping
 // @Description: 指标刷新时间配置关系表
 type EdbRefreshMapping struct {
-	EdbRefreshMappingId int       `orm:"column(edb_refresh_mapping_id);pk"`
+	EdbRefreshMappingId int       `orm:"column(edb_refresh_mapping_id);pk;auto"`
 	Source              int       `description:"来源"`
 	SubSource           int       `description:"来源名称"`
 	EdbInfoId           int       `description:"指标id,如果是数据源(钢联、有色)的,那么就是数据源里面的id"`

+ 9 - 9
models/data_manage/edb_refresh/edb_refresh_source.go

@@ -8,7 +8,7 @@ import (
 // EdbRefreshSource
 // @Description: 刷新的数据源表
 type EdbRefreshSource struct {
-	Id              int       `orm:"column(id);pk"`
+	Id              int       `orm:"column(id);pk;auto"`
 	Source          int       `orm:"column(source)" description:"来源"`
 	SourceName      string    `description:"来源名称"`
 	SubSource       int       `description:"子数据来源:0:经济数据库,1:日期序列"`
@@ -23,14 +23,14 @@ type EdbRefreshSource struct {
 // EdbRefreshSourceList
 // @Description: 获取刷新的数据源列表
 type EdbRefreshSourceList struct {
-	Source        int                    `orm:"column(source)" description:"来源"`
-	SourceName    string                 `description:"来源名称"`
-	SubSource     int                    `description:"子数据来源:0:经济数据库,1:日期序列"`
-	SubSourceName string                 `description:"子来源名称"`
-	Child         []EdbRefreshSourceList `description:"子来源"`
-	HasChild      int                    `description:"是否有子来源,0:否,1:是"`
-	SourceNameEn    string    `description:"英文来源名称"`
-	SubSourceNameEn string    `description:"英文子来源名称"`
+	Source          int                    `orm:"column(source)" description:"来源"`
+	SourceName      string                 `description:"来源名称"`
+	SubSource       int                    `description:"子数据来源:0:经济数据库,1:日期序列"`
+	SubSourceName   string                 `description:"子来源名称"`
+	Child           []EdbRefreshSourceList `description:"子来源"`
+	HasChild        int                    `description:"是否有子来源,0:否,1:是"`
+	SourceNameEn    string                 `description:"英文来源名称"`
+	SubSourceNameEn string                 `description:"英文子来源名称"`
 }
 
 // GetAllList

+ 1 - 1
models/data_manage/edb_terminal.go

@@ -8,7 +8,7 @@ import (
 
 // EdbTerminal 指标终端
 type EdbTerminal struct {
-	TerminalId   int       `orm:"column(terminal_id);pk"`
+	TerminalId   int       `orm:"column(terminal_id);pk;auto"`
 	Source       int       `orm:"column(source)" description:"指标来源类型"`
 	Name         string    `description:"终端名称"`
 	TerminalCode string    `description:"终端编码,用于配置在机器上"`

+ 1 - 1
models/data_manage/excel/excel_chart_data.go

@@ -8,7 +8,7 @@ import (
 )
 
 type ExcelChartData struct {
-	ExcelChartDataId int `orm:"column(excel_chart_data_id);pk"`
+	ExcelChartDataId int `orm:"column(excel_chart_data_id);pk;auto"`
 	ExcelInfoId      int `description:"表格id"`
 	ExcelChartEdbId  int `description:"指标ID"`
 	ChartInfoId      int `description:"图表id"`

+ 1 - 1
models/data_manage/excel/excel_chart_edb.go

@@ -11,7 +11,7 @@ import (
 )
 
 type ExcelChartEdb struct {
-	ExcelChartEdbId int       `orm:"column(excel_chart_edb_id);pk"`
+	ExcelChartEdbId int       `orm:"column(excel_chart_edb_id);pk;auto"`
 	ExcelInfoId     int       `description:"表格id"`
 	ChartInfoId     int       `description:"图表id"`
 	EdbCode         string    `description:"指标编码"`

+ 2 - 2
models/data_manage/excel/excel_classify.go

@@ -14,7 +14,7 @@ const (
 
 // ExcelClassify excel表格分类
 type ExcelClassify struct {
-	ExcelClassifyId   int       `orm:"column(excel_classify_id);pk"`
+	ExcelClassifyId   int       `orm:"column(excel_classify_id);pk;auto"`
 	Source            int       `description:"表格来源,1:excel插件的表格,2:自定义表格,3:混合表格,4:自定义分析,默认:1"`
 	ExcelClassifyName string    `description:"分类名称"`
 	ParentId          int       `description:"父级id"`
@@ -253,4 +253,4 @@ func GetCustomAnalysisExcelClassifyCount(classifyName string, parentId, source,
 	sql := `SELECT COUNT(1) AS count FROM excel_classify WHERE parent_id = ? AND source = ? AND excel_classify_name = ? AND is_delete = 0 AND sys_user_id = ?`
 	err = o.Raw(sql, parentId, source, classifyName, adminId).QueryRow(&count)
 	return
-}
+}

+ 1 - 1
models/data_manage/excel/excel_draft.go

@@ -7,7 +7,7 @@ import (
 
 // ExcelDraft 沙盘推演草稿表
 type ExcelDraft struct {
-	ExcelDraftId int       `orm:"column(excel_draft_id);pk" description:"excel表格草稿记录id"`
+	ExcelDraftId int       `orm:"column(excel_draft_id);pk;auto" description:"excel表格草稿记录id"`
 	ExcelId      int       `description:"excel表格id"`
 	Name         string    `description:"excel表格名称"`
 	Content      string    `description:"excel数据"`

+ 1 - 1
models/data_manage/excel/excel_edb_mapping.go

@@ -9,7 +9,7 @@ import (
 
 // ExcelEdbMapping excel与指标的关系表
 type ExcelEdbMapping struct {
-	ExcelEdbMappingId int       `orm:"column(excel_edb_mapping_id);pk"`
+	ExcelEdbMappingId int       `orm:"column(excel_edb_mapping_id);pk;auto"`
 	ExcelInfoId       int       `description:"excel的id"`
 	Source            int       `description:"表格来源,1:excel插件的表格,2:自定义表格,3:混合表格,4:自定义分析,默认:1"`
 	EdbInfoId         int       `description:"计算指标id"`

+ 1 - 1
models/data_manage/excel/excel_info.go

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

+ 1 - 1
models/data_manage/excel/excel_info_rule_mapping.go

@@ -7,7 +7,7 @@ import (
 )
 
 type ExcelInfoRuleMapping struct {
-	ExcelInfoRuleMappingId int       `orm:"pk" description:"主键"`
+	ExcelInfoRuleMappingId int       `orm:"column(excel_info_rule_mapping_id);pk;auto" description:"主键"`
 	ExcelInfoId            int       `description:"Excel信息ID"`
 	RuleType               int       `description:"规则类型"`
 	LeftValue              string    `description:"左值"`

+ 1 - 1
models/data_manage/excel/excel_sheet.go

@@ -7,7 +7,7 @@ import (
 
 // ExcelSheet excel表格详情表
 type ExcelSheet struct {
-	ExcelSheetId int       `orm:"column(excel_sheet_id);pk"`
+	ExcelSheetId int       `orm:"column(excel_sheet_id);pk;auto"`
 	ExcelInfoId  int       `description:"excel的id"`
 	SheetName    string    `description:"sheet名称"`
 	PageNum      int       `description:"总页码数"`

+ 1 - 1
models/data_manage/excel/excel_sheet_data.go

@@ -8,7 +8,7 @@ import (
 
 // ExcelSheetData excel表格详情表
 type ExcelSheetData struct {
-	ExcelDataId  int       `orm:"column(excel_data_id);pk"`
+	ExcelDataId  int       `orm:"column(excel_data_id);pk;auto"`
 	ExcelInfoId  int       `description:"数据归属的excel_info的id"`
 	ExcelSheetId int       `description:"数据归属sheet"`
 	Sort         int       `description:"数据排序"`

+ 1 - 1
models/data_manage/excel/excel_worker.go

@@ -7,7 +7,7 @@ import (
 )
 
 type ExcelWorker struct {
-	ExcelWorkerId   int       `orm:"column(excel_worker_id);pk"`
+	ExcelWorkerId   int       `orm:"column(excel_worker_id);pk;auto"`
 	ExcelInfoId     int       `description:"表格id"`
 	SysUserId       int       `description:"创建人"`
 	SysUserRealName string    `description:"创建人姓名"`

+ 2 - 2
models/data_manage/excel_style.go

@@ -7,7 +7,7 @@ import (
 )
 
 type ExcelStyle struct {
-	ExcelId          int `orm:"column(excel_id);pk"`
+	ExcelId          int `orm:"column(excel_id);pk;auto"`
 	Name             string
 	Color            string
 	Row              int
@@ -164,7 +164,7 @@ type Rowlen struct {
 }
 
 type ExcelEdbdataMapping struct {
-	MappingId  int `orm:"column(mapping_id);pk"`
+	MappingId  int `orm:"column(mapping_id);pk;auto"`
 	ExcelId    int64
 	ClassifyId int
 	Frequency  string

+ 1 - 1
models/data_manage/factor_edb_series.go

@@ -17,7 +17,7 @@ const (
 
 // FactorEdbSeries 因子指标系列表
 type FactorEdbSeries struct {
-	FactorEdbSeriesId int       `orm:"column(factor_edb_series_id);pk"`
+	FactorEdbSeriesId int       `orm:"column(factor_edb_series_id);pk;auto"`
 	SeriesName        string    `description:"系列名称"`
 	EdbInfoType       int       `description:"关联指标类型:0-普通指标;1-预测指标"`
 	CalculateStep     string    `description:"计算步骤-JSON"`

+ 1 - 1
models/data_manage/factor_edb_series_calculate_data.go

@@ -10,7 +10,7 @@ import (
 
 // FactorEdbSeriesCalculateData 因子指标系列-指标计算数据表
 type FactorEdbSeriesCalculateData struct {
-	FactorEdbSeriesCalculateDataId int       `orm:"column(factor_edb_series_calculate_data_id);pk"`
+	FactorEdbSeriesCalculateDataId int       `orm:"column(factor_edb_series_calculate_data_id);pk;auto"`
 	FactorEdbSeriesId              int       `description:"因子指标系列ID"`
 	EdbInfoId                      int       `description:"指标ID"`
 	EdbCode                        string    `description:"指标编码"`

Някои файлове не бяха показани, защото твърде много файлове са промени