xyxie 7 hónapja
szülő
commit
a9fc3f7458

+ 6 - 6
models/future_good/chart_info_future_good_profit.go

@@ -10,12 +10,12 @@ import (
 // ChartInfoFutureGoodProfit 商品利润图表-扩展信息
 type ChartInfoFutureGoodProfit struct {
 	ChartInfoId  int       `gorm:"primaryKey;autoIncrement;column:chart_info_id" description:"商品利润图表ID(chart_info表source=5的)"`
-	ProfitName   string    `description:"利润名称"`
-	ProfitNameEn string    `description:"利润英文名称"`
-	XValue       string    `description:"X轴数据值"`
-	YValue       string    `description:"Y轴数据值"`
-	CreateTime   time.Time `description:"创建时间"`
-	ModifyTime   time.Time `description:"更新时间"`
+	ProfitName   string    `gorm:"column:profit_name" description:"利润名称"`
+	ProfitNameEn string    `gorm:"column:profit_name_en" description:"利润英文名称"`
+	XValue       string    `gorm:"column:x_value" description:"X轴数据值"`
+	YValue       string    `gorm:"column:y_value" description:"Y轴数据值"`
+	CreateTime   time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime   time.Time `gorm:"column:modify_time" description:"更新时间"`
 }
 
 type CorrelationInfo struct {

+ 31 - 31
models/future_good/future_good_edb_data.go

@@ -12,41 +12,41 @@ import (
 // FutureGoodEdbData 期货指标数据的表
 type FutureGoodEdbData struct {
 	FutureGoodEdbDataId int       `gorm:"primaryKey;autoIncrement;column:future_good_edb_data_id"`
-	FutureGoodEdbInfoId int       `description:"期货指标id"`
-	FutureGoodEdbCode   string    `description:"期货指标code"`
-	DataTime            time.Time `description:"数据日期"`
-	TradeCode           string    `description:"证券代码"`
-	Open                float64   `description:"开盘价"`
-	High                float64   `description:"最高价"`
-	Low                 float64   `description:"最低价"`
-	Close               float64   `description:"收盘价"`
-	Volume              float64   `description:"成交量"`
-	Amt                 float64   `description:"成交额"`
-	Oi                  float64   `description:"持仓量"`
-	Settle              float64   `description:"结算价"`
-	DataTimestamp       int64     `description:"数据日期时间戳"`
-	ModifyTime          time.Time
-	CreateTime          time.Time
+	FutureGoodEdbInfoId int       `gorm:"column:future_good_edb_info_id" description:"期货指标id"`
+	FutureGoodEdbCode   string    `gorm:"column:future_good_edb_code" description:"期货指标code"`
+	DataTime            time.Time `gorm:"column:data_time" description:"数据日期"`
+	TradeCode           string    `gorm:"column:trade_code" description:"证券代码"`
+	Open                float64   `gorm:"column:open" description:"开盘价"`
+	High                float64   `gorm:"column:high" description:"最高价"`
+	Low                 float64   `gorm:"column:low" description:"最低价"`
+	Close               float64   `gorm:"column:close" description:"收盘价"`
+	Volume              float64   `gorm:"column:volume" description:"成交量"`
+	Amt                 float64   `gorm:"column:amt" description:"成交额"`
+	Oi                  float64   `gorm:"column:oi" description:"持仓量"`
+	Settle              float64   `gorm:"column:settle" description:"结算价"`
+	DataTimestamp       int64     `gorm:"column:data_timestamp" description:"数据日期时间戳"`
+	ModifyTime          time.Time `gorm:"column:modify_time"`
+	CreateTime          time.Time `gorm:"column:create_time"`
 }
 
 // FutureGoodEdbDataItem 期货指标数据的表
 type FutureGoodEdbDataItem struct {
-	FutureGoodEdbDataId int     `gorm:"primaryKey;autoIncrement;column:future_good_edb_data_id"`
-	FutureGoodEdbInfoId int     `description:"期货指标id"`
-	FutureGoodEdbCode   string  `description:"期货指标code"`
-	DataTime            string  `description:"数据日期"`
-	TradeCode           string  `description:"证券代码"`
-	Open                float64 `description:"开盘价"`
-	High                float64 `description:"最高价"`
-	Low                 float64 `description:"最低价"`
-	Close               float64 `description:"收盘价"`
-	Volume              float64 `description:"成交量"`
-	Amt                 float64 `description:"成交额"`
-	Oi                  float64 `description:"持仓量"`
-	Settle              float64 `description:"结算价"`
-	DataTimestamp       int64   `description:"数据日期时间戳"`
-	ModifyTime          time.Time
-	CreateTime          time.Time
+	FutureGoodEdbDataId int       `gorm:"primaryKey;autoIncrement;column:future_good_edb_data_id"`
+	FutureGoodEdbInfoId int       `gorm:"column:future_good_edb_info_id" description:"期货指标id"`
+	FutureGoodEdbCode   string    `gorm:"column:future_good_edb_code" description:"期货指标code"`
+	DataTime            string    `gorm:"column:data_time" description:"数据日期"`
+	TradeCode           string    `gorm:"column:trade_code" description:"证券代码"`
+	Open                float64   `gorm:"column:open" description:"开盘价"`
+	High                float64   `gorm:"column:high" description:"最高价"`
+	Low                 float64   `gorm:"column:low" description:"最低价"`
+	Close               float64   `gorm:"column:close" description:"收盘价"`
+	Volume              float64   `gorm:"column:volume" description:"成交量"`
+	Amt                 float64   `gorm:"column:amt" description:"成交额"`
+	Oi                  float64   `gorm:"column:oi" description:"持仓量"`
+	Settle              float64   `gorm:"column:settle" description:"结算价"`
+	DataTimestamp       int64     `gorm:"column:data_timestamp" description:"数据日期时间戳"`
+	ModifyTime          time.Time `gorm:"column:modify_time"`
+	CreateTime          time.Time `gorm:"column:create_time"`
 }
 
 // FutureGoodDataFromThs 同花顺期货数据

+ 20 - 20
models/future_good/future_good_edb_info.go

@@ -9,26 +9,26 @@ import (
 
 type FutureGoodEdbInfo struct {
 	FutureGoodEdbInfoId int       `gorm:"primaryKey;autoIncrement;column:future_good_edb_info_id"`
-	FutureGoodEdbCode   string    `description:"期货指标code"`
-	FutureGoodEdbName   string    `description:"期货指标名称"`
-	FutureGoodEdbNameEn string    `description:"期货指标英文名称"`
-	ParentId            int       `description:"上级期货id"`
-	RegionType          string    `description:"交易所来源,海外还是国内"`
-	Exchange            string    `description:"所属交易所"`
-	FutureGoodEdbType   int       `description:"指标类型,1:年月是固定的合约;2:只有M+N期的合约,未固定年月"`
-	DateSourceId        int       `description:"画图时,日期来源的指标id"`
-	Year                int       `description:"所属年份"`
-	Month               int       `description:"所属月份"`
-	StartDate           string    `description:"起始日期"`
-	EndDate             string    `description:"终止日期"`
-	MinValue            float64   `description:"最小值"`
-	MaxValue            float64   `description:"最大值"`
-	LatestValue         float64   `description:"数据最新的值"`
-	LatestDate          time.Time `description:"数据最新的日期"`
-	ServerUrl           string    `description:"服务器地址"`
-	TerminalCode        string    `description:"终端编码,用于配置在机器上"`
-	CreateTime          time.Time
-	ModifyTime          time.Time
+	FutureGoodEdbCode   string    `gorm:"column:future_good_edb_code" description:"期货指标code"`
+	FutureGoodEdbName   string    `gorm:"column:future_good_edb_name" description:"期货指标名称"`
+	FutureGoodEdbNameEn string    `gorm:"column:future_good_edb_name_en" description:"期货指标英文名称"`
+	ParentId            int       `gorm:"column:parent_id" description:"上级期货id"`
+	RegionType          string    `gorm:"column:region_type" description:"交易所来源,海外还是国内"`
+	Exchange            string    `gorm:"column:exchange" description:"所属交易所"`
+	FutureGoodEdbType   int       `gorm:"column:future_good_edb_type" description:"指标类型,1:年月是固定的合约;2:只有M+N期的合约,未固定年月"`
+	DateSourceId        int       `gorm:"column:date_source_id" description:"画图时,日期来源的指标id"`
+	Year                int       `gorm:"column:year" description:"所属年份"`
+	Month               int       `gorm:"column:month" description:"所属月份"`
+	StartDate           string    `gorm:"column:start_date" description:"起始日期"`
+	EndDate             string    `gorm:"column:end_date" description:"终止日期"`
+	MinValue            float64   `gorm:"column:min_value" description:"最小值"`
+	MaxValue            float64   `gorm:"column:max_value" description:"最大值"`
+	LatestValue         float64   `gorm:"column:latest_value" description:"数据最新的值"`
+	LatestDate          time.Time `gorm:"column:latest_date" description:"数据最新的日期"`
+	ServerUrl           string    `gorm:"column:server_url" description:"服务器地址"`
+	TerminalCode        string    `gorm:"column:terminal_code" description:"终端编码,用于配置在机器上"`
+	CreateTime          time.Time `gorm:"column:create_time"`
+	ModifyTime          time.Time `gorm:"column:modify_time"`
 }
 
 // GetFutureGoodEdbInfo 期货指标

+ 9 - 9
models/predict_edb_data_calculate_ljztbpj.go

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

+ 9 - 9
models/predict_edb_data_calculate_nhcc.go

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

+ 7 - 7
models/supply_analysis/base_from_stock_plant_data.go

@@ -11,13 +11,13 @@ import (
 
 // BaseFromStockPlantData base_from_stock_plant_data 存量装置的指标的计算数据
 type BaseFromStockPlantData struct {
-	StockPlantDataId int       `gorm:"primaryKey;autoIncrement;column:stock_plant_data_id"`
-	VarietyEdbId     int       `description:"指标id"`
-	DataTime         time.Time `description:"数据日期"`
-	Value            float64   `description:"数据值"`
-	ModifyTime       time.Time `description:"修改时间"`
-	CreateTime       time.Time `description:"创建时间"`
-	DataTimestamp    int64     `description:"数据日期时间戳"`
+	StockPlantDataId int       `gorm:"primaryKey;autoIncrement;column:stock_plant_data_id" description:"指标数据ID"`
+	VarietyEdbId     int       `gorm:"column:variety_edb_id" description:"指标id"`
+	DataTime         time.Time `gorm:"column:data_time" description:"数据日期"`
+	Value            float64   `gorm:"column:value" description:"数据值"`
+	ModifyTime       time.Time `gorm:"column:modify_time" description:"修改时间"`
+	CreateTime       time.Time `gorm:"column:create_time" description:"创建时间"`
+	DataTimestamp    int64     `gorm:"column:data_timestamp" description:"数据日期时间戳"`
 }
 
 // CalculateVarietyReq 重新计算请求

+ 9 - 9
models/supply_analysis/variety.go

@@ -7,15 +7,15 @@ import (
 
 // Variety variety 品种表
 type Variety struct {
-	VarietyId                 int       `gorm:"primaryKey;autoIncrement;column:variety_id"`
-	VarietyName               string    `description:"品种名称"`
-	LastUpdateSysUserId       int       `description:"最后更新人id"`
-	LastUpdateSysUserRealName string    `description:"最后更新人名称"`
-	ProductionDay             int       `description:"生产天数"`
-	SysUserId                 int       `description:"创建人id"`
-	SysUserRealName           string    `description:"创建人姓名"`
-	ModifyTime                time.Time `description:"修改时间"`
-	CreateTime                time.Time `description:"创建时间"`
+	VarietyId                 int       `gorm:"primaryKey;autoIncrement;column:variety_id" description:"品种ID"`
+	VarietyName               string    `gorm:"column:variety_name" description:"品种名称"`
+	LastUpdateSysUserId       int       `gorm:"column:last_update_sys_user_id" description:"最后更新人id"`
+	LastUpdateSysUserRealName string    `gorm:"column:last_update_sys_user_real_name" description:"最后更新人名称"`
+	ProductionDay             int       `gorm:"column:production_day" description:"生产天数"`
+	SysUserId                 int       `gorm:"column:sys_user_id" description:"创建人id"`
+	SysUserRealName           string    `gorm:"column:sys_user_real_name" description:"创建人姓名"`
+	ModifyTime                time.Time `gorm:"column:modify_time" description:"修改时间"`
+	CreateTime                time.Time `gorm:"column:create_time" description:"创建时间"`
 }
 
 // GetVarietyById 根据品种id获取品种详情

+ 4 - 4
models/supply_analysis/variety_admin_permission.go

@@ -7,10 +7,10 @@ import (
 
 // VarietyAdminPermission variety_admin_permission 品种权限表
 type VarietyAdminPermission struct {
-	Id         int       `gorm:"primaryKey;autoIncrement;column:id"`
-	VarietyId  int       `description:"品种id"`
-	SysUserId  int       `description:"用户id"`
-	CreateTime time.Time `description:"添加时间"`
+	Id         int       `gorm:"primaryKey;autoIncrement;column:id" description:"ID"`
+	VarietyId  int       `gorm:"column:variety_id" description:"品种id"`
+	SysUserId  int       `gorm:"column:sys_user_id" description:"用户id"`
+	CreateTime time.Time `gorm:"column:create_time" description:"添加时间"`
 }
 
 // GetVarietyPermissionByVarietyIdAndUserId 根据品种id和用户id获取权限记录表

+ 12 - 12
models/supply_analysis/variety_edb_info.go

@@ -7,18 +7,18 @@ import (
 
 // VarietyEdbInfo variety_edb_info 品种指标表
 type VarietyEdbInfo struct {
-	VarietyEdbId int       `gorm:"primaryKey;autoIncrement;column:variety_edb_id"`
-	VarietyId    int       `description:"品种id"`
-	EdbName      string    `description:"品种指标名称"`
-	Frequency    string    `description:"频度"`
-	StartDate    time.Time `description:"开始日期"`
-	EndDate      time.Time `description:"结束日期"`
-	LatestValue  float64   `description:"最新值"`
-	EdbInfoId    int       `description:"指标id"`
-	EdbCode      string    `description:"品种编码"`
-	Source       int       `description:"来源,1:影响周度产量;2:周度产量变动;3:影响月度产量;4:月度产量变动"`
-	ModifyTime   time.Time `description:"更新时间"`
-	CreateTime   time.Time `description:"添加时间"`
+	VarietyEdbId int       `gorm:"primaryKey;autoIncrement;column:variety_edb_id" description:"品种指标ID"`
+	VarietyId    int       `gorm:"column:variety_id" description:"品种id"`
+	EdbName      string    `gorm:"column:edb_name" description:"品种指标名称"`
+	Frequency    string    `gorm:"column:frequency" description:"频度"`
+	StartDate    time.Time `gorm:"column:start_date" description:"开始日期"`
+	EndDate      time.Time `gorm:"column:end_date" description:"结束日期"`
+	LatestValue  float64   `gorm:"column:latest_value" description:"最新值"`
+	EdbInfoId    int       `gorm:"column:edb_info_id" description:"指标id"`
+	EdbCode      string    `gorm:"column:edb_code" description:"品种编码"`
+	Source       int       `gorm:"column:source" description:"来源,1:影响周度产量;2:周度产量变动;3:影响月度产量;4:月度产量变动"`
+	ModifyTime   time.Time `gorm:"column:modify_time" description:"更新时间"`
+	CreateTime   time.Time `gorm:"column:create_time" description:"添加时间"`
 }
 
 // GetAllVarietyEdbInfoByVarietyId 根据品种id获取所有的指标

+ 17 - 17
models/supply_analysis/variety_plant.go

@@ -7,23 +7,23 @@ import (
 
 // VarietyPlant variety_plant 品种装置表
 type VarietyPlant struct {
-	VarietyPlantId                int       `gorm:"primaryKey;autoIncrement;column:variety_plant_id"`
-	VarietyId                     int       `description:"品种id"`
-	Province                      string    `description:"所属省份"`
-	City                          string    `description:"所属城市"`
-	FactoryName                   string    `description:"工厂名称"`
-	PlantName                     string    `description:"装置/产线名称"`
-	MaintenanceDate               time.Time `description:"检修日期"`
-	ResumptionDate                time.Time `description:"复产日期"`
-	AnnualCapacity                float64   `description:"年产能"`
-	Coefficient                   float64   `description:"降负系数"`
-	AverageDailyCapacityReduction float64   `description:"日均产量减量"`
-	IsStop                        int       `description:"是否停产,0:未停产;1:停产;默认未停产"`
-	Sort                          int       `description:"排序字段,越小越靠前"`
-	SysUserId                     int       `description:"添加人id"`
-	SysUserRealName               string    `description:"添加人真实姓名"`
-	ModifyTime                    time.Time `description:"最近一次更新时间"`
-	CreateTime                    time.Time `description:"添加时间"`
+	VarietyPlantId                int       `gorm:"primaryKey;autoIncrement;column:variety_plant_id" description:"品种装置ID"`
+	VarietyId                     int       `gorm:"column:variety_id" description:"品种id"`
+	Province                      string    `gorm:"column:province" description:"所属省份"`
+	City                          string    `gorm:"column:city" description:"所属城市"`
+	FactoryName                   string    `gorm:"column:factory_name" description:"工厂名称"`
+	PlantName                     string    `gorm:"column:plant_name" description:"装置/产线名称"`
+	MaintenanceDate               time.Time `gorm:"column:maintenance_date" description:"检修日期"`
+	ResumptionDate                time.Time `gorm:"column:resumption_date" description:"复产日期"`
+	AnnualCapacity                float64   `gorm:"column:annual_capacity" description:"年产能"`
+	Coefficient                   float64   `gorm:"column:coefficient" description:"降负系数"`
+	AverageDailyCapacityReduction float64   `gorm:"column:average_daily_capacity_reduction" description:"日均产量减量"`
+	IsStop                        int       `gorm:"column:is_stop" description:"是否停产,0:未停产;1:停产;默认未停产"`
+	Sort                          int       `gorm:"column:sort" description:"排序字段,越小越靠前"`
+	SysUserId                     int       `gorm:"column:sys_user_id" description:"添加人id"`
+	SysUserRealName               string    `gorm:"column:sys_user_real_name" description:"添加人真实姓名"`
+	ModifyTime                    time.Time `gorm:"column:modify_time" description:"最近一次更新时间"`
+	CreateTime                    time.Time `gorm:"column:create_time" description:"添加时间"`
 }
 
 // GetAllVarietyPlantByVarietyId 根据品种id获取所有的装置

+ 11 - 11
models/trade_analysis/trade_futures_company.go

@@ -11,17 +11,17 @@ const TradeFuturesCompanyTop20 = "TOP20"
 
 // TradeFuturesCompany 期货公司表
 type TradeFuturesCompany struct {
-	TradeFuturesCompanyId int       `gorm:"primaryKey;autoIncrement;column:trade_futures_company_id"`
-	CompanyName           string    `description:"标准公司名称"`
-	ZhengzhouName         string    `description:"郑商所下的名称"`
-	DalianName            string    `description:"大商所下的名称"`
-	ShanghaiName          string    `description:"上期所下的名称"`
-	IneName               string    `description:"上期能源下的名称"`
-	GuangzhouName         string    `description:"广期所下的名称"`
-	CffexName             string    `description:"中金所下的名称"`
-	Sort                  int       `description:"排序"`
-	CreateTime            time.Time `description:"创建时间"`
-	ModifyTime            time.Time `description:"修改时间"`
+	TradeFuturesCompanyId int       `gorm:"primaryKey;autoIncrement;column:trade_futures_company_id" description:"标准公司名称ID"`
+	CompanyName           string    `gorm:"column:company_name" description:"标准公司名称"`
+	ZhengzhouName         string    `gorm:"column:zhengzhou_name" description:"郑商所下的名称"`
+	DalianName            string    `gorm:"column:dalian_name" description:"大商所下的名称"`
+	ShanghaiName          string    `gorm:"column:shanghai_name" description:"上期所下的名称"`
+	IneName               string    `gorm:"column:ine_name" description:"上期能源下的名称"`
+	GuangzhouName         string    `gorm:"column:guangzhou_name" description:"广期所下的名称"`
+	CffexName             string    `gorm:"column:cffex_name" description:"中金所下的名称"`
+	Sort                  int       `gorm:"column:sort" description:"排序"`
+	CreateTime            time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime            time.Time `gorm:"column:modify_time" description:"修改时间"`
 }
 
 func (m *TradeFuturesCompany) TableName() string {

+ 7 - 7
models/trade_analysis/warehouse.go

@@ -2,13 +2,13 @@ package trade_analysis
 
 // WarehouseExtraConfig 建仓图表配置
 type WarehouseExtraConfig struct {
-	MultipleGraphConfigId int      `description:"多图配置ID"`
-	WarehouseChartType    int      `description:"图表类型: 1-多单图; 2-空单图; 3-净多单图"`
-	Exchange              string   `description:"交易所标识"`
-	ClassifyName          string   `description:"品种名称"`
-	Contracts             []string `description:"合约代码"`
-	Companies             []string `description:"期货公司, 不超过5个"`
-	PredictRatio          float64  `description:"预估参数, 0-1之间"`
+	MultipleGraphConfigId int      `gorm:"primaryKey;autoIncrement;column:multiple_graph_config_id" description:"多图配置ID"`
+	WarehouseChartType    int      `gorm:"column:warehouse_chart_type" description:"图表类型: 1-多单图; 2-空单图; 3-净多单图"`
+	Exchange              string   `gorm:"column:exchange" description:"交易所标识"`
+	ClassifyName          string   `gorm:"column:classify_name" description:"品种名称"`
+	Contracts             []string `gorm:"-" description:"合约代码"`        // 通常不直接映射slice到数据库列
+	Companies             []string `gorm:"-" description:"期货公司, 不超过5个"` // 同上
+	PredictRatio          float64  `gorm:"column:predict_ratio" description:"预估参数, 0-1之间"`
 }
 
 // WarehouseChartPars 建仓单表配置