xyxie 5 months ago
parent
commit
09e7375ff2

+ 1 - 1
models/future_good/future_good_edb_data.go

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

+ 1 - 1
models/future_good/future_good_edb_info.go

@@ -8,7 +8,7 @@ import (
 )
 
 type FutureGoodEdbInfo struct {
-	FutureGoodEdbInfoId int       `orm:"column(future_good_edb_info_id);pk"`
+	FutureGoodEdbInfoId int       `gorm:"primaryKey;autoIncrement;column:future_good_edb_info_id"`
 	FutureGoodEdbCode   string    `description:"期货指标code"`
 	FutureGoodEdbName   string    `description:"期货指标名称"`
 	FutureGoodEdbNameEn string    `description:"期货指标英文名称"`

+ 2 - 2
models/supply_analysis/variety.go

@@ -112,7 +112,7 @@ func EditVariety(item *Variety, adminIdList []int) (err error) {
 
 // VarietyItem 列表页返回的数据结构
 type VarietyItem struct {
-	VarietyId                 int           `orm:"column(variety_id);pk"`
+	VarietyId                 int           `gorm:"primaryKey;autoIncrement;column:variety_id"`
 	VarietyName               string        `description:"品种名称"`
 	LastUpdateSysUserId       int           `description:"最后更新人id"`
 	LastUpdateSysUserRealName string        `description:"最后更新人名称"`
@@ -189,7 +189,7 @@ func GetVarietyMaxSort(parentId int) (sort int, err error) {
 }
 
 type VarietyView struct {
-	VarietyId   int    `orm:"column(future_good_chart_classify_id);pk"`
+	VarietyId   int    `gorm:"primaryKey;autoIncrement;column:future_good_chart_classify_id"`
 	VarietyName string `description:"分类名称"`
 	ParentId    int    `description:"父级id"`
 }

+ 1 - 1
models/supply_analysis/variety_edb_info.go

@@ -70,7 +70,7 @@ func GetCountVarietyEdbInfoByVarietyId(varietyId int) (total int, err error) {
 
 // VarietyEdbInfoItem 品种指标表(展示使用)
 type VarietyEdbInfoItem struct {
-	VarietyEdbId int                  `orm:"column(variety_edb_id);pk"`
+	VarietyEdbId int                  `gorm:"primaryKey;autoIncrement;column:variety_edb_id"`
 	VarietyId    int                  `description:"品种id"`
 	EdbName      string               `description:"品种指标名称"`
 	Frequency    string               `description:"频度"`

+ 1 - 1
models/supply_analysis/variety_plant.go

@@ -59,7 +59,7 @@ func GetVarietyPlantById(id int) (item *VarietyPlant, err error) {
 
 // VarietyPlantItem 品种装置数据(展示使用)
 type VarietyPlantItem struct {
-	VarietyPlantId                int                `orm:"column(variety_plant_id);pk"`
+	VarietyPlantId                int                `gorm:"primaryKey;autoIncrement;column:variety_plant_id"`
 	VarietyId                     int                `description:"品种id"`
 	Province                      string             `description:"所属省份"`
 	City                          string             `description:"所属城市"`

+ 2 - 2
models/trade_analysis/trade_analysis.go

@@ -457,7 +457,7 @@ func GetLastTradeZhengzhouDataByClassify(exchange string, contracts []string) (i
 }
 
 type BaseFromTradeGuangzhouIndex struct {
-	BaseFromTradeGuangzhouIndexId    int       `orm:"column(base_from_trade_guangzhou_index_id);pk"`
+	BaseFromTradeGuangzhouIndexId    int       `gorm:"primaryKey;autoIncrement;column:base_from_trade_guangzhou_index_id"`
 	BaseFromTradeGuangzhouClassifyId int       `description:"分类id"`
 	IndexCode                        string    `description:"指标编码"`
 	IndexName                        string    `description:"指标名称"`
@@ -477,7 +477,7 @@ func GetBaseFromTradeGuangzhouIndexByClassifyId(classifyId int) (list []*BaseFro
 }
 
 type BaseFromTradeGuangzhouData struct {
-	BaseFromTradeGuangzhouDataId  int       `orm:"column(base_from_trade_guangzhou_data_id);pk"`
+	BaseFromTradeGuangzhouDataId  int       `gorm:"primaryKey;autoIncrement;column:base_from_trade_guangzhou_data_id"`
 	BaseFromTradeGuangzhouIndexId int       `description:"指标id"`
 	IndexCode                     string    `description:"指标编码"`
 	DataTime                      time.Time `description:"数据日期"`

+ 2 - 1
utils/common.go

@@ -215,7 +215,8 @@ func GetToken() string {
 
 // 数据没有记录
 func ErrNoRow() string {
-	return "<QuerySeter> no row found"
+	//return "<QuerySeter> no row found"
+	return "record not found"
 }
 
 // 判断文件是否存在