Browse Source

change gorm

Roc 1 month ago
parent
commit
d636844f7e

+ 1 - 1
models/edb_data_calculate_ljztbpj.go

@@ -23,7 +23,7 @@ type EdbDataCalculateLjztbpj struct {
 	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:"数据日期时间戳"`
+	DataTimestamp int64     `gorm:"column:data_timestamp" description:"数据日期时间戳"`
 }
 
 func (e *EdbDataCalculateLjztbpj) AfterFind(db *gorm.DB) (err error) {

+ 25 - 21
models/edb_data_calculate_zjpj.go

@@ -20,7 +20,7 @@ type EdbDataCalculateZjpj struct {
 	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:"数据日期时间戳"`
+	DataTimestamp int64     `gorm:"column:data_timestamp" description:"数据日期时间戳"`
 }
 
 func (e *EdbDataCalculateZjpj) AfterFind(db *gorm.DB) (err error) {
@@ -492,26 +492,30 @@ func refreshAllCalculateZjpj(to *gorm.DB, edbInfo *EdbInfo, existItemA, existIte
 
 	//数据入库
 	if len(addDataList) > 0 {
-		tmpAddDataList := make([]*EdbDataCalculateZjpj, 0)
-		i := 0
-		for _, v := range addDataList {
-			tmpAddDataList = append(tmpAddDataList, v)
-			i++
-			if i >= 500 {
-				err = to.CreateInBatches(tmpAddDataList, utils.MultiAddNum).Error
-				if err != nil {
-					return
-				}
-				i = 0
-				tmpAddDataList = make([]*EdbDataCalculateZjpj, 0)
-			}
-		}
-
-		if len(tmpAddDataList) > 0 {
-			err = to.CreateInBatches(tmpAddDataList, utils.MultiAddNum).Error
-			if err != nil {
-				return
-			}
+		//tmpAddDataList := make([]*EdbDataCalculateZjpj, 0)
+		//i := 0
+		//for _, v := range addDataList {
+		//	tmpAddDataList = append(tmpAddDataList, v)
+		//	i++
+		//	if i >= 500 {
+		//		err = to.CreateInBatches(tmpAddDataList, utils.MultiAddNum).Error
+		//		if err != nil {
+		//			return
+		//		}
+		//		i = 0
+		//		tmpAddDataList = make([]*EdbDataCalculateZjpj, 0)
+		//	}
+		//}
+		//
+		//if len(tmpAddDataList) > 0 {
+		//	err = to.CreateInBatches(tmpAddDataList, utils.MultiAddNum).Error
+		//	if err != nil {
+		//		return
+		//	}
+		//}
+		err = to.CreateInBatches(addDataList, utils.MultiAddNum).Error
+		if err != nil {
+			return
 		}
 	}
 

+ 1 - 1
models/edb_data_trade_analysis.go

@@ -18,7 +18,7 @@ type EdbDataTradeAnalysis struct {
 	Value         float64   `gorm:"column:value" description:"数据值"`
 	CreateTime    time.Time `gorm:"column:status" description:"创建时间"`
 	ModifyTime    time.Time `gorm:"column:create_time" description:"修改时间"`
-	DataTimestamp int64     `gorm:"column:modify_time" description:"数据日期时间戳"`
+	DataTimestamp int64     `gorm:"column:data_timestamp" description:"数据日期时间戳"`
 }
 
 func (m *EdbDataTradeAnalysis) TableName() string {

+ 1 - 1
models/predict_edb_data_calculate_ljztbpj.go

@@ -22,7 +22,7 @@ type EdbDataPredictCalculateLjztbpj struct {
 	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:"数据日期时间戳"`
+	DataTimestamp int64     `gorm:"column:data_timestamp" description:"数据日期时间戳"`
 }
 
 func (e *EdbDataPredictCalculateLjztbpj) AfterFind(db *gorm.DB) (err error) {

+ 1 - 1
models/predict_edb_data_calculate_nhcc.go

@@ -22,7 +22,7 @@ type EdbDataPredictCalculateNhcc struct {
 	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:"数据日期时间戳"`
+	DataTimestamp int64     `gorm:"column:data_timestamp" description:"数据日期时间戳"`
 }
 
 func (e *EdbDataPredictCalculateNhcc) AfterFind(db *gorm.DB) (err error) {