Browse Source

change gorm

Roc 2 months ago
parent
commit
dfc9fb6ca8
40 changed files with 68 additions and 71 deletions
  1. 1 1
      models/base_from_business_data.go
  2. 2 2
      models/base_from_calculate.go
  3. 1 4
      models/base_from_clarksons.go
  4. 1 1
      models/base_from_mtjh.go
  5. 2 2
      models/base_from_mysteel_chemical.go
  6. 1 1
      models/base_from_oilchem.go
  7. 2 2
      models/base_from_python.go
  8. 1 1
      models/base_from_sci_hq.go
  9. 1 1
      models/base_from_smm.go
  10. 2 2
      models/base_predict_from_calculate.go
  11. 2 2
      models/edb_data_calculate_avg.go
  12. 2 2
      models/edb_data_calculate_correlation.go
  13. 2 2
      models/edb_data_calculate_hbz.go
  14. 2 2
      models/edb_data_calculate_kszs.go
  15. 1 1
      models/edb_data_calculate_ljztbpj.go
  16. 2 2
      models/edb_data_calculate_ljzzj.go
  17. 2 2
      models/edb_data_calculate_ljzzy.go
  18. 2 2
      models/edb_data_calculate_nhcc.go
  19. 2 2
      models/edb_data_calculate_rjz.go
  20. 2 2
      models/edb_data_calculate_sum.go
  21. 2 2
      models/edb_data_calculate_tcz.go
  22. 2 2
      models/edb_data_calculate_zjpj.go
  23. 1 1
      models/edb_data_trade_analysis.go
  24. 1 1
      models/edb_info_calculate_mapping.go
  25. 1 1
      models/edb_info_relation.go
  26. 3 3
      models/factor_edb_series.go
  27. 1 1
      models/factor_edb_series_calculate_data.go
  28. 1 1
      models/factor_edb_series_calculate_data_qjjs.go
  29. 1 1
      models/factor_edb_series_calculate_func.go
  30. 1 1
      models/factor_edb_series_chart_mapping.go
  31. 1 1
      models/factor_edb_series_mapping.go
  32. 2 2
      models/predict_edb.go
  33. 6 6
      models/predict_edb_data_base.go
  34. 2 2
      models/predict_edb_data_calculate_kszs.go
  35. 1 1
      models/predict_edb_data_calculate_ljztbpj.go
  36. 2 2
      models/predict_edb_data_calculate_ljzzj.go
  37. 2 2
      models/predict_edb_data_calculate_ljzzy.go
  38. 2 2
      models/predict_edb_data_calculate_nhcc.go
  39. 2 2
      models/predict_edb_data_calculate_tcz.go
  40. 1 1
      models/predict_edb_data_calculate_zjpj.go

+ 1 - 1
models/base_from_business_data.go

@@ -240,7 +240,7 @@ func (m *BaseFromBusinessData) HandleData(addDataList, updateDataList []*BaseFro
 	// 插入数据
 	if len(addDataList) > 0 {
 		//_, err = to.InsertMulti(500, addDataList)
-		err = to.CreateInBatches(&addDataList, 500).Error
+		err = to.CreateInBatches(&addDataList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}

+ 2 - 2
models/base_from_calculate.go

@@ -556,8 +556,8 @@ func refreshAllCalculate(to *gorm.DB, edbInfoIdArr []*EdbInfo, edbInfoTag map[st
 		for k := range removeDateMap {
 			removeDateList = append(removeDateList, k)
 		}
-		removeDateStr := strings.Join(removeDateList, `","`)
-		removeDateStr = `"` + removeDateStr + `"`
+		removeDateStr := strings.Join(removeDateList, `','`)
+		removeDateStr = `'` + removeDateStr + `'`
 		//如果拼接指标变更了,那么需要删除所有的指标数据
 		tableName := GetEdbDataTableName(source, subSource)
 		sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? and data_time in (%s) `, tableName, removeDateStr)

+ 1 - 4
models/base_from_clarksons.go

@@ -4,7 +4,6 @@ import (
 	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strconv"
 	"strings"
 	"time"
@@ -64,9 +63,7 @@ func AddBaseFromClarksonsIndex(item *BaseFromClarksonsIndex) (lastId int64, err
 }
 
 func AddBaseFromClarksonsDataMuti(items []*BaseFromClarksonsData) (count int64, err error) {
-	o := orm.NewOrm()
-	count, err = o.InsertMulti(500, items)
-	dbResult := global.DEFAULT_DB.CreateInBatches(&items, 500)
+	dbResult := global.DEFAULT_DB.CreateInBatches(&items, utils.MultiAddNum)
 	err = dbResult.Error
 	count = dbResult.RowsAffected
 	return

+ 1 - 1
models/base_from_mtjh.go

@@ -90,7 +90,7 @@ func AddBaseFromMtjhMapping(item *BaseFromMtjhMapping) (lastId int64, err error)
 func AddBaseFromMtjhMappingMuti(items []*BaseFromMtjhMapping) (lastId int64, err error) {
 	//o := orm.NewOrm()
 	//lastId, err = o.InsertMulti(500, items)
-	err = global.DEFAULT_DB.CreateInBatches(items, 500).Error
+	err = global.DEFAULT_DB.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 

+ 2 - 2
models/base_from_mysteel_chemical.go

@@ -483,7 +483,7 @@ func (r *BaseFromMysteelChemicalData) Update(updateCols []string) (err error) {
 func (r *BaseFromMysteelChemicalData) Add(list []BaseFromMysteelChemicalData) (err error) {
 	//o := orm.NewOrm()
 	//_, err = o.InsertMulti(500, list)
-	err = global.DEFAULT_DB.CreateInBatches(list, 500).Error
+	err = global.DEFAULT_DB.CreateInBatches(list, utils.MultiAddNum).Error
 	return
 }
 
@@ -494,7 +494,7 @@ func (r *BaseFromMysteelChemicalData) AddV2(list []*BaseFromMysteelChemicalData)
 	}
 	//o := orm.NewOrm()
 	//_, err = o.InsertMulti(500, list)
-	err = global.DEFAULT_DB.CreateInBatches(list, 500).Error
+	err = global.DEFAULT_DB.CreateInBatches(list, utils.MultiAddNum).Error
 	return
 }
 

+ 1 - 1
models/base_from_oilchem.go

@@ -36,7 +36,7 @@ type BaseFromOilchemData struct {
 func AddBaseFromOilchemIndexMuti(items []*BaseFromOilchemIndex) (err error) {
 	//o := orm.NewOrm()
 	//_, err = o.InsertMulti(500, items)
-	err = global.DEFAULT_DB.CreateInBatches(items, 500).Error
+	err = global.DEFAULT_DB.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 func AddBaseFromOilchemIndex(item *BaseFromOilchemIndex) (lastId int64, err error) {

+ 2 - 2
models/base_from_python.go

@@ -213,8 +213,8 @@ func RefreshAllPythonEdb(edbInfo *EdbInfo, item EdbDataFromPython) (err error) {
 	//删除已经不存在的累计同比拼接指标数据(由于同比值当日的数据删除了)
 	{
 		if len(removeDateList) > 0 {
-			removeDateStr := strings.Join(removeDateList, `","`)
-			removeDateStr = `"` + removeDateStr + `"`
+			removeDateStr := strings.Join(removeDateList, `','`)
+			removeDateStr = `'` + removeDateStr + `'`
 			//如果拼接指标变更了,那么需要删除所有的指标数据
 			tableName := GetEdbDataTableName(edbInfo.Source, edbInfo.SubSource)
 			sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? and data_time in (%s) `, tableName, removeDateStr)

+ 1 - 1
models/base_from_sci_hq.go

@@ -244,7 +244,7 @@ func (r *BaseFromSciHqData) Update(cols []string) (err error) {
 func BatchAddBaseFromSciHqData(list []*BaseFromSciHqData) (err error) {
 	//o := orm.NewOrm()
 	//_, err = o.InsertMulti(500, list)
-	err = global.DEFAULT_DB.CreateInBatches(list, 500).Error
+	err = global.DEFAULT_DB.CreateInBatches(list, utils.MultiAddNum).Error
 	return
 }
 

+ 1 - 1
models/base_from_smm.go

@@ -32,7 +32,7 @@ func (s *BaseFromSmmData) Update(cols []string) (err error) {
 func AddBaseFromSmmData(item []*BaseFromSmmData) (err error) {
 	//o := orm.NewOrm()
 	//_, err = o.InsertMulti(500, item)
-	err = global.DEFAULT_DB.CreateInBatches(item, 500).Error
+	err = global.DEFAULT_DB.CreateInBatches(item, utils.MultiAddNum).Error
 	return
 }
 

+ 2 - 2
models/base_predict_from_calculate.go

@@ -547,8 +547,8 @@ func refreshAllPredictCalculate(to *gorm.DB, edbInfoIdList []*EdbInfo, edbInfoTa
 	}
 
 	if len(removeDateList) > 0 {
-		removeDateStr := strings.Join(removeDateList, `","`)
-		removeDateStr = `"` + removeDateStr + `"`
+		removeDateStr := strings.Join(removeDateList, `','`)
+		removeDateStr = `'` + removeDateStr + `'`
 		//如果拼接指标变更了,那么需要删除所有的指标数据
 		tableName := GetEdbDataTableName(source, subSource)
 		sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? and data_time in (%s) `, tableName, removeDateStr)

+ 2 - 2
models/edb_data_calculate_avg.go

@@ -91,7 +91,7 @@ func (obj CalculateAvg) Add(params AddCalculateBatchParams) (edbInfo *EdbInfo, e
 
 		tagMap[v.FromTag] = v.EdbInfoId
 	}
-	err = to.CreateInBatches(calculateMappingItemList, 500).Error
+	err = to.CreateInBatches(calculateMappingItemList, utils.MultiAddNum).Error
 	if err != nil {
 		return
 	}
@@ -210,7 +210,7 @@ func (obj CalculateAvg) Edit(params EditCalculateBatchParams) (err error, errMsg
 
 		tagMap[v.FromTag] = v.EdbInfoId
 	}
-	err = to.CreateInBatches(calculateMappingItemList, 500).Error
+	err = to.CreateInBatches(calculateMappingItemList, utils.MultiAddNum).Error
 	if err != nil {
 		return
 	}

+ 2 - 2
models/edb_data_calculate_correlation.go

@@ -99,7 +99,7 @@ func AddCalculateCorrelation(req *EdbInfoCalculateBatchSaveReq, edbCode, uniqueC
 		return
 	}
 
-	err = to.CreateInBatches(calculateMappingItemList, 500).Error
+	err = to.CreateInBatches(calculateMappingItemList, utils.MultiAddNum).Error
 	if err != nil {
 		return
 	}
@@ -197,7 +197,7 @@ func EditCalculateCorrelation(edbInfo *EdbInfo, req *EdbInfoCalculateBatchEditRe
 		err = errors.New(errMsg)
 		return
 	}
-	err = to.CreateInBatches(calculateMappingItemList, 500).Error
+	err = to.CreateInBatches(calculateMappingItemList, utils.MultiAddNum).Error
 	if err != nil {
 		return
 	}

+ 2 - 2
models/edb_data_calculate_hbz.go

@@ -273,8 +273,8 @@ func refreshAllCalculateHbz(to *gorm.DB, edbInfoId, source, subSource int, fromE
 		for k := range removeDateMap {
 			removeDateList = append(removeDateList, k)
 		}
-		removeDateStr := strings.Join(removeDateList, `","`)
-		removeDateStr = `"` + removeDateStr + `"`
+		removeDateStr := strings.Join(removeDateList, `','`)
+		removeDateStr = `'` + removeDateStr + `'`
 		//如果拼接指标变更了,那么需要删除所有的指标数据
 		tableName := GetEdbDataTableName(source, subSource)
 		sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? and data_time in (%s) `, tableName, removeDateStr)

+ 2 - 2
models/edb_data_calculate_kszs.go

@@ -84,7 +84,7 @@ func AddCalculateKszs(req *EdbInfoCalculateBatchSaveReq, edbCode, uniqueCode str
 
 		tagMap[v.FromTag] = v.EdbInfoId
 	}
-	err = to.CreateInBatches(calculateMappingItemList, 500).Error
+	err = to.CreateInBatches(calculateMappingItemList, utils.MultiAddNum).Error
 	if err != nil {
 		return
 	}
@@ -167,7 +167,7 @@ func EditCalculateKszs(edbInfo *EdbInfo, req *EdbInfoCalculateBatchEditReq) (err
 
 		tagMap[v.FromTag] = v.EdbInfoId
 	}
-	err = to.CreateInBatches(calculateMappingItemList, 500).Error
+	err = to.CreateInBatches(calculateMappingItemList, utils.MultiAddNum).Error
 	if err != nil {
 		return
 	}

+ 1 - 1
models/edb_data_calculate_ljztbpj.go

@@ -597,7 +597,7 @@ func refreshAllCalculateLjztbpj(to *gorm.DB, edbInfo *EdbInfo, existItemA, exist
 
 		//数据入库
 		if len(addDataList) > 0 {
-			tmpErr := to.CreateInBatches(addDataList, 500).Error
+			tmpErr := to.CreateInBatches(addDataList, utils.MultiAddNum).Error
 			if tmpErr != nil {
 				err = tmpErr
 				return

+ 2 - 2
models/edb_data_calculate_ljzzj.go

@@ -365,8 +365,8 @@ func (obj Ljzzj) refresh(to *gorm.DB, edbInfoId, source, subSource int, fromEdbI
 		for k := range removeDateMap {
 			removeDateList = append(removeDateList, k)
 		}
-		removeDateStr := strings.Join(removeDateList, `","`)
-		removeDateStr = `"` + removeDateStr + `"`
+		removeDateStr := strings.Join(removeDateList, `','`)
+		removeDateStr = `'` + removeDateStr + `'`
 		//如果拼接指标变更了,那么需要删除所有的指标数据
 		tableName := GetEdbDataTableName(source, subSource)
 		sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? and data_time in (%s) `, tableName, removeDateStr)

+ 2 - 2
models/edb_data_calculate_ljzzy.go

@@ -355,8 +355,8 @@ func refreshAllCalculateLjzzy(to *gorm.DB, edbInfoId, source, subSource int, fro
 		for k := range removeDateMap {
 			removeDateList = append(removeDateList, k)
 		}
-		removeDateStr := strings.Join(removeDateList, `","`)
-		removeDateStr = `"` + removeDateStr + `"`
+		removeDateStr := strings.Join(removeDateList, `','`)
+		removeDateStr = `'` + removeDateStr + `'`
 		//如果拼接指标变更了,那么需要删除所有的指标数据
 		tableName := GetEdbDataTableName(source, subSource)
 		sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? and data_time in (%s) `, tableName, removeDateStr)

+ 2 - 2
models/edb_data_calculate_nhcc.go

@@ -566,7 +566,7 @@ func refreshAllCalculateNhcc(to *gorm.DB, edbInfo *EdbInfo, existItemA, existIte
 			tmpAddDataList = append(tmpAddDataList, v)
 			i++
 			if i >= 500 {
-				err = to.CreateInBatches(tmpAddDataList, 500).Error
+				err = to.CreateInBatches(tmpAddDataList, utils.MultiAddNum).Error
 				if err != nil {
 					return
 				}
@@ -576,7 +576,7 @@ func refreshAllCalculateNhcc(to *gorm.DB, edbInfo *EdbInfo, existItemA, existIte
 		}
 
 		if len(tmpAddDataList) > 0 {
-			err = to.CreateInBatches(tmpAddDataList, 500).Error
+			err = to.CreateInBatches(tmpAddDataList, utils.MultiAddNum).Error
 			if err != nil {
 				return
 			}

+ 2 - 2
models/edb_data_calculate_rjz.go

@@ -268,8 +268,8 @@ func refreshAllCalculateRjz(to *gorm.DB, edbInfoId, source int, fromEdbInfo *Edb
 		for k := range removeDateMap {
 			removeDateList = append(removeDateList, k)
 		}
-		removeDateStr := strings.Join(removeDateList, `","`)
-		removeDateStr = `"` + removeDateStr + `"`
+		removeDateStr := strings.Join(removeDateList, `','`)
+		removeDateStr = `'` + removeDateStr + `'`
 		//如果拼接指标变更了,那么需要删除所有的指标数据
 		tableName := GetEdbDataTableName(source, utils.DATA_SUB_SOURCE_EDB)
 		sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? and data_time in (%s) `, tableName, removeDateStr)

+ 2 - 2
models/edb_data_calculate_sum.go

@@ -93,7 +93,7 @@ func (obj CalculateSum) Add(params AddCalculateBatchParams) (edbInfo *EdbInfo, e
 
 		tagMap[v.FromTag] = v.EdbInfoId
 	}
-	err = to.CreateInBatches(calculateMappingItemList, 500).Error
+	err = to.CreateInBatches(calculateMappingItemList, utils.MultiAddNum).Error
 	if err != nil {
 		errMsg = "保存失败"
 		return
@@ -222,7 +222,7 @@ func (obj CalculateSum) Edit(params EditCalculateBatchParams) (err error, errMsg
 
 		tagMap[v.FromTag] = v.EdbInfoId
 	}
-	err = to.CreateInBatches(calculateMappingItemList, 500).Error
+	err = to.CreateInBatches(calculateMappingItemList, utils.MultiAddNum).Error
 	if err != nil {
 		return
 	}

+ 2 - 2
models/edb_data_calculate_tcz.go

@@ -418,8 +418,8 @@ func refreshAllCalculateTcz(to *gorm.DB, edbInfoId, source, subSource int, fromE
 		for k := range removeDateMap {
 			removeDateList = append(removeDateList, k)
 		}
-		removeDateStr := strings.Join(removeDateList, `","`)
-		removeDateStr = `"` + removeDateStr + `"`
+		removeDateStr := strings.Join(removeDateList, `','`)
+		removeDateStr = `'` + removeDateStr + `'`
 		//如果拼接指标变更了,那么需要删除所有的指标数据
 		tableName := GetEdbDataTableName(source, subSource)
 		sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? and data_time in (%s) `, tableName, removeDateStr)

+ 2 - 2
models/edb_data_calculate_zjpj.go

@@ -492,7 +492,7 @@ func refreshAllCalculateZjpj(to *gorm.DB, edbInfo *EdbInfo, existItemA, existIte
 			tmpAddDataList = append(tmpAddDataList, v)
 			i++
 			if i >= 500 {
-				err = to.CreateInBatches(tmpAddDataList, 500).Error
+				err = to.CreateInBatches(tmpAddDataList, utils.MultiAddNum).Error
 				if err != nil {
 					return
 				}
@@ -502,7 +502,7 @@ func refreshAllCalculateZjpj(to *gorm.DB, edbInfo *EdbInfo, existItemA, existIte
 		}
 
 		if len(tmpAddDataList) > 0 {
-			err = to.CreateInBatches(tmpAddDataList, 500).Error
+			err = to.CreateInBatches(tmpAddDataList, utils.MultiAddNum).Error
 			if err != nil {
 				return
 			}

+ 1 - 1
models/edb_data_trade_analysis.go

@@ -60,7 +60,7 @@ func (m *EdbDataTradeAnalysis) CreateMulti(items []*EdbDataTradeAnalysis) (err e
 		return
 	}
 
-	err = global.DEFAULT_DB.CreateInBatches(items, 500).Error
+	err = global.DEFAULT_DB.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 

+ 1 - 1
models/edb_info_calculate_mapping.go

@@ -53,7 +53,7 @@ type EdbInfoCalculateMappingInfo struct {
 
 // AddEdbInfoCalculateMappingMulti 批量添加指标关系表
 func AddEdbInfoCalculateMappingMulti(items []*EdbInfoCalculateMapping) (err error) {
-	err = global.DEFAULT_DB.CreateInBatches(items, 500).Error
+	err = global.DEFAULT_DB.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 

+ 1 - 1
models/edb_info_relation.go

@@ -82,7 +82,7 @@ func UpdateSecondRelationEdbInfoId(edbRelationIds []int, relationList []*EdbInfo
 				relationCodesMap[relation.RelationCode] = struct{}{}
 			}
 		}
-		err = o.CreateInBatches(relationList, 500).Error
+		err = o.CreateInBatches(relationList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}

+ 3 - 3
models/factor_edb_series.go

@@ -62,7 +62,7 @@ func (m *FactorEdbSeries) CreateMulti(items []*FactorEdbSeries) (err error) {
 	if len(items) == 0 {
 		return
 	}
-	err = global.DEFAULT_DB.CreateInBatches(items, 500).Error
+	err = global.DEFAULT_DB.CreateInBatches(items, utils.MultiAddNum).Error
 
 	return
 }
@@ -210,7 +210,7 @@ func (m *FactorEdbSeries) CreateSeriesAndMapping(item *FactorEdbSeries, mappings
 		for _, v := range mappings {
 			v.FactorEdbSeriesId = seriesId
 		}
-		e = to.CreateInBatches(mappings, 200).Error
+		e = to.CreateInBatches(mappings, utils.MultiAddNum).Error
 		if e != nil {
 			err = fmt.Errorf("insert multi mapping err: %v", e)
 			return
@@ -257,7 +257,7 @@ func (m *FactorEdbSeries) EditSeriesAndMapping(item *FactorEdbSeries, mappings [
 		for _, v := range mappings {
 			v.FactorEdbSeriesId = item.FactorEdbSeriesId
 		}
-		e = to.CreateInBatches(mappings, 200).Error
+		e = to.CreateInBatches(mappings, utils.MultiAddNum).Error
 		if e != nil {
 			err = fmt.Errorf("insert multi mapping err: %v", e)
 			return

+ 1 - 1
models/factor_edb_series_calculate_data.go

@@ -64,7 +64,7 @@ func (m *FactorEdbSeriesCalculateData) CreateMulti(items []*FactorEdbSeriesCalcu
 	if len(items) == 0 {
 		return
 	}
-	err = global.DEFAULT_DB.CreateInBatches(items, 500).Error
+	err = global.DEFAULT_DB.CreateInBatches(items, utils.MultiAddNum).Error
 
 	return
 }

+ 1 - 1
models/factor_edb_series_calculate_data_qjjs.go

@@ -61,7 +61,7 @@ func (m *FactorEdbSeriesCalculateDataQjjs) CreateMulti(items []*FactorEdbSeriesC
 	if len(items) == 0 {
 		return
 	}
-	err = global.DEFAULT_DB.CreateInBatches(items, 500).Error
+	err = global.DEFAULT_DB.CreateInBatches(items, utils.MultiAddNum).Error
 
 	return
 }

+ 1 - 1
models/factor_edb_series_calculate_func.go

@@ -53,7 +53,7 @@ func (m *FactorEdbSeriesCalculateFunc) CreateMulti(items []*FactorEdbSeriesCalcu
 		return
 	}
 
-	err = global.DEFAULT_DB.CreateInBatches(items, 500).Error
+	err = global.DEFAULT_DB.CreateInBatches(items, utils.MultiAddNum).Error
 
 	return
 }

+ 1 - 1
models/factor_edb_series_chart_mapping.go

@@ -72,7 +72,7 @@ func (m *FactorEdbSeriesChartMapping) CreateMulti(items []*FactorEdbSeriesChartM
 		return
 	}
 
-	err = global.DEFAULT_DB.CreateInBatches(items, 500).Error
+	err = global.DEFAULT_DB.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 

+ 1 - 1
models/factor_edb_series_mapping.go

@@ -52,7 +52,7 @@ func (m *FactorEdbSeriesMapping) CreateMulti(items []*FactorEdbSeriesMapping) (e
 	if len(items) == 0 {
 		return
 	}
-	err = global.DEFAULT_DB.CreateInBatches(items, 500).Error
+	err = global.DEFAULT_DB.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 

+ 2 - 2
models/predict_edb.go

@@ -273,7 +273,7 @@ func CalculateByRuleBy9(to *gorm.DB, rule CalculateRule) (resultDataList []*EdbI
 	// 添加计算出来的值入库
 	lenAddDataList := len(addDataList)
 	if lenAddDataList > 0 {
-		err = to.CreateInBatches(addDataList, 500).Error
+		err = to.CreateInBatches(addDataList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -436,7 +436,7 @@ func CalculateByRuleByRuleLineNh(to *gorm.DB, predictEdbInfo EdbInfo, predictEdb
 		// 添加计算出来的值入库
 		lenAddDataList := len(addDataList)
 		if lenAddDataList > 0 {
-			err = to.CreateInBatches(addDataList, 500).Error
+			err = to.CreateInBatches(addDataList, utils.MultiAddNum).Error
 			if err != nil {
 				return
 			}

+ 6 - 6
models/predict_edb_data_base.go

@@ -47,7 +47,7 @@ func AddPredictEdb(item *EdbInfo, calculateMappingList []*EdbInfoCalculateMappin
 			calculateMappingItem.EdbInfoId = item.EdbInfoId
 			calculateMappingItem.EdbCode = item.EdbCode
 		}
-		err = to.CreateInBatches(calculateMappingList, 500).Error
+		err = to.CreateInBatches(calculateMappingList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -86,7 +86,7 @@ func AddPredictEdb(item *EdbInfo, calculateMappingList []*EdbInfoCalculateMappin
 					vv.EdbInfoId = item.EdbInfoId
 					vv.ConfigId = v.ConfigId
 				}
-				err = to.CreateInBatches(calculateRule.TrendsCalculateMappingList, 500).Error
+				err = to.CreateInBatches(calculateRule.TrendsCalculateMappingList, utils.MultiAddNum).Error
 				if err != nil {
 					return
 				}
@@ -109,7 +109,7 @@ func AddPredictEdb(item *EdbInfo, calculateMappingList []*EdbInfoCalculateMappin
 					vv.EdbInfoId = item.EdbInfoId
 					vv.ConfigId = v.ConfigId
 				}
-				err = to.CreateInBatches(calculateRule.TrendsCalculateMappingList, 500).Error
+				err = to.CreateInBatches(calculateRule.TrendsCalculateMappingList, utils.MultiAddNum).Error
 				if err != nil {
 					return
 				}
@@ -197,7 +197,7 @@ func EditPredictEdb(edbInfo *EdbInfo, updateEdbInfoCol []string, calculateMappin
 			calculateMappingItem.EdbInfoId = edbInfo.EdbInfoId
 			calculateMappingItem.EdbCode = edbInfo.EdbCode
 		}
-		err = to.CreateInBatches(calculateMappingList, 500).Error
+		err = to.CreateInBatches(calculateMappingList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -235,7 +235,7 @@ func EditPredictEdb(edbInfo *EdbInfo, updateEdbInfoCol []string, calculateMappin
 					vv.EdbInfoId = edbInfo.EdbInfoId
 					vv.ConfigId = v.ConfigId
 				}
-				err = to.CreateInBatches(calculateRule.TrendsCalculateMappingList, 500).Error
+				err = to.CreateInBatches(calculateRule.TrendsCalculateMappingList, utils.MultiAddNum).Error
 				if err != nil {
 					return
 				}
@@ -258,7 +258,7 @@ func EditPredictEdb(edbInfo *EdbInfo, updateEdbInfoCol []string, calculateMappin
 					vv.EdbInfoId = edbInfo.EdbInfoId
 					vv.ConfigId = v.ConfigId
 				}
-				err = to.CreateInBatches(calculateRule.TrendsCalculateMappingList, 500).Error
+				err = to.CreateInBatches(calculateRule.TrendsCalculateMappingList, utils.MultiAddNum).Error
 				if err != nil {
 					return
 				}

+ 2 - 2
models/predict_edb_data_calculate_kszs.go

@@ -95,7 +95,7 @@ func SavePredictCalculateKszs(reqEdbInfoId, classifyId int, edbName, frequency,
 
 			tagMap[v.FromTag] = v.EdbInfoId
 		}
-		err = to.CreateInBatches(calculateMappingItemList, 500).Error
+		err = to.CreateInBatches(calculateMappingItemList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -174,7 +174,7 @@ func SavePredictCalculateKszs(reqEdbInfoId, classifyId int, edbName, frequency,
 
 			tagMap[v.FromTag] = v.EdbInfoId
 		}
-		err = to.CreateInBatches(calculateMappingItemList, 500).Error
+		err = to.CreateInBatches(calculateMappingItemList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}

+ 1 - 1
models/predict_edb_data_calculate_ljztbpj.go

@@ -261,7 +261,7 @@ func refreshAllPredictCalculateLjztbpj(to *gorm.DB, edbInfo, firstEdbInfo, secon
 
 		//数据入库
 		if len(addDataList) > 0 {
-			tmpErr := to.CreateInBatches(addDataList, 500).Error
+			tmpErr := to.CreateInBatches(addDataList, utils.MultiAddNum).Error
 			if tmpErr != nil {
 				err = tmpErr
 				return

+ 2 - 2
models/predict_edb_data_calculate_ljzzj.go

@@ -368,8 +368,8 @@ func (obj PredictLjzzj) refresh(to *gorm.DB, edbInfoId, source, subSource int, f
 		for k := range removeDateMap {
 			removeDateList = append(removeDateList, k)
 		}
-		removeDateStr := strings.Join(removeDateList, `","`)
-		removeDateStr = `"` + removeDateStr + `"`
+		removeDateStr := strings.Join(removeDateList, `','`)
+		removeDateStr = `'` + removeDateStr + `'`
 		//如果拼接指标变更了,那么需要删除所有的指标数据
 		tableName := GetEdbDataTableName(source, subSource)
 		sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? and data_time in (%s) `, tableName, removeDateStr)

+ 2 - 2
models/predict_edb_data_calculate_ljzzy.go

@@ -331,8 +331,8 @@ func refreshAllPredictCalculateLjzzy(to *gorm.DB, edbInfoId, source, subSource i
 		for k := range removeDateMap {
 			removeDateList = append(removeDateList, k)
 		}
-		removeDateStr := strings.Join(removeDateList, `","`)
-		removeDateStr = `"` + removeDateStr + `"`
+		removeDateStr := strings.Join(removeDateList, `','`)
+		removeDateStr = `'` + removeDateStr + `'`
 		//如果拼接指标变更了,那么需要删除所有的指标数据
 		tableName := GetEdbDataTableName(source, subSource)
 		sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? and data_time in (%s) `, tableName, removeDateStr)

+ 2 - 2
models/predict_edb_data_calculate_nhcc.go

@@ -540,7 +540,7 @@ func refreshAllPredictCalculateNhcc(to *gorm.DB, edbInfo, firstEdbInfo, secondEd
 			tmpAddDataList = append(tmpAddDataList, v)
 			i++
 			if i >= 500 {
-				err = to.CreateInBatches(tmpAddDataList, 500).Error
+				err = to.CreateInBatches(tmpAddDataList, utils.MultiAddNum).Error
 				if err != nil {
 					return
 				}
@@ -550,7 +550,7 @@ func refreshAllPredictCalculateNhcc(to *gorm.DB, edbInfo, firstEdbInfo, secondEd
 		}
 
 		if len(tmpAddDataList) > 0 {
-			err = to.CreateInBatches(tmpAddDataList, 500).Error
+			err = to.CreateInBatches(tmpAddDataList, utils.MultiAddNum).Error
 			if err != nil {
 				return
 			}

+ 2 - 2
models/predict_edb_data_calculate_tcz.go

@@ -669,8 +669,8 @@ func RefreshAllPredictCalculateTcz(edbInfoId, source, subSource int, fromEdbInfo
 		for k := range removeDateMap {
 			removeDateList = append(removeDateList, k)
 		}
-		removeDateStr := strings.Join(removeDateList, `","`)
-		removeDateStr = `"` + removeDateStr + `"`
+		removeDateStr := strings.Join(removeDateList, `','`)
+		removeDateStr = `'` + removeDateStr + `'`
 		//如果拼接指标变更了,那么需要删除所有的指标数据
 		tableName := GetEdbDataTableName(source, subSource)
 		sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? and data_time in (%s) `, tableName, removeDateStr)

+ 1 - 1
models/predict_edb_data_calculate_zjpj.go

@@ -233,7 +233,7 @@ func refreshAllPredictCalculateZjpj(to *gorm.DB, edbInfo, firstEdbInfo, secondEd
 
 	//数据入库
 	if len(addDataList) > 0 {
-		tmpErr := to.CreateInBatches(addDataList, 500).Error
+		tmpErr := to.CreateInBatches(addDataList, utils.MultiAddNum).Error
 		if tmpErr != nil {
 			err = tmpErr
 			return