Browse Source

为了兼容AfterFind钩子函数,把Scan改成find

xyxie 5 tháng trước cách đây
mục cha
commit
07d016c431
32 tập tin đã thay đổi với 33 bổ sung33 xóa
  1. 2 2
      models/edb_data_base.go
  2. 1 1
      models/edb_data_calculate_bp.go
  3. 1 1
      models/edb_data_calculate_cjjx.go
  4. 1 1
      models/edb_data_calculate_hbz.go
  5. 1 1
      models/edb_data_calculate_hcz.go
  6. 1 1
      models/edb_data_calculate_ljz.go
  7. 1 1
      models/edb_data_calculate_ljznczj.go
  8. 1 1
      models/edb_data_calculate_ljzzj.go
  9. 1 1
      models/edb_data_calculate_ljzzy.go
  10. 1 1
      models/edb_data_calculate_percentile.go
  11. 1 1
      models/edb_data_calculate_rjz.go
  12. 1 1
      models/edb_data_calculate_standard_deviation.go
  13. 1 1
      models/edb_data_calculate_tbz.go
  14. 1 1
      models/edb_data_calculate_tcz.go
  15. 1 1
      models/edb_data_calculate_time_shift.go
  16. 1 1
      models/edb_data_calculate_zdyfx.go
  17. 1 1
      models/edb_data_calculate_zsxy.go
  18. 1 1
      models/predict_edb_data_base.go
  19. 1 1
      models/predict_edb_data_calculate_cjjx.go
  20. 1 1
      models/predict_edb_data_calculate_hbz.go
  21. 1 1
      models/predict_edb_data_calculate_hcz.go
  22. 1 1
      models/predict_edb_data_calculate_ljz.go
  23. 1 1
      models/predict_edb_data_calculate_ljznczj.go
  24. 1 1
      models/predict_edb_data_calculate_ljzzj.go
  25. 1 1
      models/predict_edb_data_calculate_ljzzy.go
  26. 1 1
      models/predict_edb_data_calculate_nszydbpjjs.go
  27. 1 1
      models/predict_edb_data_calculate_percentile.go
  28. 1 1
      models/predict_edb_data_calculate_standard_deviation.go
  29. 1 1
      models/predict_edb_data_calculate_tbz.go
  30. 1 1
      models/predict_edb_data_calculate_tcz.go
  31. 1 1
      models/predict_edb_data_calculate_time_shift.go
  32. 1 1
      models/predict_edb_data_calculate_zsxy.go

+ 2 - 2
models/edb_data_base.go

@@ -142,7 +142,7 @@ func GetAllEdbDataList(edbInfoId, source, subSource int) (existDataList []*EdbDa
 	fmt.Println("dataTableName:", dataTableName)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? order by data_time asc`
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, edbInfoId).Find(&existDataList).Error
 	return
 }
 
@@ -152,7 +152,7 @@ func GetAllEdbDataListByTo(to *gorm.DB, edbInfoId, source, subSource int) (exist
 	fmt.Println("dataTableName:", dataTableName)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? order by data_time asc`
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	return
 }
 

+ 1 - 1
models/edb_data_calculate_bp.go

@@ -219,7 +219,7 @@ func RefreshAllCalculateBpBak(edbInfoId, source, subSource int, fromEdbInfo *Edb
 	fmt.Println("dataTableName:", dataTableName)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return err
 	}

+ 1 - 1
models/edb_data_calculate_cjjx.go

@@ -243,7 +243,7 @@ func refreshAllCalculateCjjx(to *gorm.DB, edbInfoId, source, subSource int, from
 	dataTableName := GetEdbDataTableName(source, subSource)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return err
 	}

+ 1 - 1
models/edb_data_calculate_hbz.go

@@ -216,7 +216,7 @@ func refreshAllCalculateHbz(to *gorm.DB, edbInfoId, source, subSource int, fromE
 	fmt.Println("dataTableName:", dataTableName)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return err
 	}

+ 1 - 1
models/edb_data_calculate_hcz.go

@@ -222,7 +222,7 @@ func refreshAllCalculateHcz(to *gorm.DB, edbInfoId, source, subSource int, fromE
 	//	existPars = append(existPars, startDate)
 	//}
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId, existPars).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId, existPars).Find(&existDataList).Error
 	if err != nil {
 		return err
 	}

+ 1 - 1
models/edb_data_calculate_ljz.go

@@ -637,7 +637,7 @@ func (obj Ljz) refresh(to *gorm.DB, edbInfoId, source, subSource int, edbInfo, f
 	existDataList := make([]*EdbData, 0)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return err
 	}

+ 1 - 1
models/edb_data_calculate_ljznczj.go

@@ -364,7 +364,7 @@ func (obj LjzNczj) refresh(to *gorm.DB, edbInfoId, source, subSource int, edbInf
 	existDataList := make([]*EdbData, 0)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return err
 	}

+ 1 - 1
models/edb_data_calculate_ljzzj.go

@@ -268,7 +268,7 @@ func (obj Ljzzj) refresh(to *gorm.DB, edbInfoId, source, subSource int, fromEdbI
 	existDataList := make([]*EdbData, 0)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return err
 	}

+ 1 - 1
models/edb_data_calculate_ljzzy.go

@@ -237,7 +237,7 @@ func refreshAllCalculateLjzzy(to *gorm.DB, edbInfoId, source, subSource int, fro
 	dataTableName := GetEdbDataTableName(source, subSource)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return err
 	}

+ 1 - 1
models/edb_data_calculate_percentile.go

@@ -255,7 +255,7 @@ func (obj Percentile) refresh(to *gorm.DB, edbInfo, fromEdbInfo *EdbInfo, edbCod
 	existDataList := make([]*EdbData, 0)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return
 	}

+ 1 - 1
models/edb_data_calculate_rjz.go

@@ -216,7 +216,7 @@ func refreshAllCalculateRjz(to *gorm.DB, edbInfoId, source int, fromEdbInfo *Edb
 	fmt.Println("dataTableName:", dataTableName)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return err
 	}

+ 1 - 1
models/edb_data_calculate_standard_deviation.go

@@ -245,7 +245,7 @@ func (obj StandardDeviation) refresh(to *gorm.DB, edbInfo, fromEdbInfo *EdbInfo,
 	existDataList := make([]*EdbData, 0)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return err
 	}

+ 1 - 1
models/edb_data_calculate_tbz.go

@@ -226,7 +226,7 @@ func refreshAllCalculateTbz(to *gorm.DB, edbInfoId, source, subSource int, fromE
 	//fmt.Println("dataTableName:", dataTableName)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return err
 	}

+ 1 - 1
models/edb_data_calculate_tcz.go

@@ -215,7 +215,7 @@ func refreshAllCalculateTcz(to *gorm.DB, edbInfoId, source, subSource int, fromE
 	dataTableName := GetEdbDataTableName(source, subSource)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return err
 	}

+ 1 - 1
models/edb_data_calculate_time_shift.go

@@ -249,7 +249,7 @@ func refreshAllCalculateTimeShift(to *gorm.DB, edbInfoId, source, subSource, for
 	fmt.Println("dataTableName:", dataTableName)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return err
 	}

+ 1 - 1
models/edb_data_calculate_zdyfx.go

@@ -197,7 +197,7 @@ func (obj CustomAnalysis) refresh(to *gorm.DB, edbInfo *EdbInfo, dateList []stri
 	existDataList := make([]*EdbData, 0)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return err
 	}

+ 1 - 1
models/edb_data_calculate_zsxy.go

@@ -238,7 +238,7 @@ func (obj ExponentialSmoothing) refresh(to *gorm.DB, edbInfo, fromEdbInfo *EdbIn
 	existDataList := make([]*EdbData, 0)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return err
 	}

+ 1 - 1
models/predict_edb_data_base.go

@@ -363,7 +363,7 @@ func (obj PredictStandardBase) refresh(to *gorm.DB, edbInfo *EdbInfo, predictEdb
 	existDataList := make([]*EdbData, 0)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return
 	}

+ 1 - 1
models/predict_edb_data_calculate_cjjx.go

@@ -217,7 +217,7 @@ func refreshAllPredictCalculateCjjx(to *gorm.DB, edbInfoId, source, subSource in
 	dataTableName := GetEdbDataTableName(source, subSource)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return
 	}

+ 1 - 1
models/predict_edb_data_calculate_hbz.go

@@ -197,7 +197,7 @@ func refreshAllPredictCalculateHbz(to *gorm.DB, edbInfoId, source, subSource int
 	fmt.Println("dataTableName:", dataTableName)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return
 	}

+ 1 - 1
models/predict_edb_data_calculate_hcz.go

@@ -203,7 +203,7 @@ func refreshAllPredictCalculateHcz(to *gorm.DB, edbInfoId, source, subSource int
 	//	existPars = append(existPars, startDate)
 	//}
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId, existPars).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId, existPars).Find(&existDataList).Error
 	if err != nil {
 		return
 	}

+ 1 - 1
models/predict_edb_data_calculate_ljz.go

@@ -512,7 +512,7 @@ func (obj PredictLjz) refresh(to *gorm.DB, edbInfoId, source, subSource int, edb
 	existDataList := make([]*EdbData, 0)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return
 	}

+ 1 - 1
models/predict_edb_data_calculate_ljznczj.go

@@ -359,7 +359,7 @@ func (obj PredictLjzNczj) refresh(to *gorm.DB, edbInfoId, source, subSource int,
 	existDataList := make([]*EdbData, 0)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return
 	}

+ 1 - 1
models/predict_edb_data_calculate_ljzzj.go

@@ -268,7 +268,7 @@ func (obj PredictLjzzj) refresh(to *gorm.DB, edbInfoId, source, subSource int, f
 	existDataList := make([]*EdbData, 0)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return
 	}

+ 1 - 1
models/predict_edb_data_calculate_ljzzy.go

@@ -211,7 +211,7 @@ func refreshAllPredictCalculateLjzzy(to *gorm.DB, edbInfoId, source, subSource i
 	dataTableName := GetEdbDataTableName(source, subSource)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return
 	}

+ 1 - 1
models/predict_edb_data_calculate_nszydbpjjs.go

@@ -224,7 +224,7 @@ func refreshAllPredictCalculateNszydpjjs(to *gorm.DB, edbInfoId, source, subSour
 
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 
 	existDataMap := make(map[string]*EdbData)
 	removeDataTimeMap := make(map[string]int) //需要移除的日期数据

+ 1 - 1
models/predict_edb_data_calculate_percentile.go

@@ -268,7 +268,7 @@ func (obj PredictPercentile) refresh(to *gorm.DB, edbInfo, fromEdbInfo *EdbInfo,
 	existDataList := make([]*EdbData, 0)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return
 	}

+ 1 - 1
models/predict_edb_data_calculate_standard_deviation.go

@@ -278,7 +278,7 @@ func (obj PredictStandardDeviation) refresh(to *gorm.DB, edbInfo, fromEdbInfo *E
 	existDataList := make([]*EdbData, 0)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return
 	}

+ 1 - 1
models/predict_edb_data_calculate_tbz.go

@@ -284,7 +284,7 @@ func (obj PredictTb) refresh(to *gorm.DB, edbInfo, fromEdbInfo *EdbInfo, edbCode
 
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return
 	}

+ 1 - 1
models/predict_edb_data_calculate_tcz.go

@@ -386,7 +386,7 @@ func RefreshAllPredictCalculateTcz(edbInfoId, source, subSource int, fromEdbInfo
 	dataTableName := GetEdbDataTableName(source, subSource)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return
 	}

+ 1 - 1
models/predict_edb_data_calculate_time_shift.go

@@ -229,7 +229,7 @@ func refreshAllPredictCalculateTimeShift(to *gorm.DB, edbInfoId, source, subSour
 	fmt.Println("dataTableName:", dataTableName)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return
 	}

+ 1 - 1
models/predict_edb_data_calculate_zsxy.go

@@ -261,7 +261,7 @@ func (obj PredictExponentialSmoothing) refresh(to *gorm.DB, edbInfo, fromEdbInfo
 	existDataList := make([]*EdbData, 0)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	err = to.Raw(sql, edbInfoId).Scan(&existDataList).Error
+	err = to.Raw(sql, edbInfoId).Find(&existDataList).Error
 	if err != nil {
 		return
 	}