fix

models/edb_data_calculate_kszs.go

@@ -371,7 +371,7 @@ func refreshAllCalculateKszs(to *gorm.DB, edbInfoId, source, subSource int, rela
 		removeDateStr := strings.Join(removeDateList, `','`)
 		removeDateStr = `'` + removeDateStr + `'`
 		sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? and data_time in (%s) `, tableName, removeDateStr)
-		err = to.Raw(sql, edbInfoId).Error
+		err = to.Exec(sql, edbInfoId).Error
 		if err != nil {
 			err = fmt.Errorf("删除扩散指数指标数据失败,Err:" + err.Error())
 			return

models/edb_data_calculate_ljz.go

@@ -185,14 +185,14 @@ func (obj Ljz) Edit(params EditCalculateBatchParams) (err error, errMsg string)
 
 	//删除，计算指标关联的，基础指标的关联关系
 	sql := ` DELETE FROM edb_info_calculate_mapping WHERE edb_info_id = ? `
-	err = to.Raw(sql, edbInfo.EdbInfoId).Error
+	err = to.Exec(sql, edbInfo.EdbInfoId).Error
 	if err != nil {
 		return
 	}
 
 	//清空原有数据
 	sql = ` DELETE FROM ` + tableName + ` WHERE edb_info_id = ? `
-	err = to.Raw(sql, edbInfo.EdbInfoId).Error
+	err = to.Exec(sql, edbInfo.EdbInfoId).Error
 	if err != nil {
 		return
 	}
@@ -672,7 +672,7 @@ func (obj Ljz) refresh(to *gorm.DB, edbInfoId, source, subSource int, edbInfo, f
 			if existVal != saveValue {
 				sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
 				sql = fmt.Sprintf(sql, dataTableName)
-				err = to.Raw(sql, saveValue, edbInfoId, currDateStr).Error
+				err = to.Exec(sql, saveValue, edbInfoId, currDateStr).Error
 				if err != nil {
 					return
 				}
@@ -700,7 +700,7 @@ func (obj Ljz) refresh(to *gorm.DB, edbInfoId, source, subSource int, edbInfo, f
 		removeNum := len(removeDateList)
 		if removeNum > 0 {
 			sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? and data_time in (`+utils.GetOrmInReplace(removeNum)+`) `, dataTableName)
-			err = to.Raw(sql, edbInfo.EdbInfoId, removeDateList).Error
+			err = to.Exec(sql, edbInfo.EdbInfoId, removeDateList).Error
 			if err != nil {
 				fmt.Println(reflect.TypeOf(obj).Name(), " add data ;delete Err", err.Error())
 				err = fmt.Errorf("删除不存在的指标数据失败,Err:" + err.Error())

models/edb_data_calculate_ljztbpj.go

@@ -21,9 +21,9 @@ type EdbDataCalculateLjztbpj struct {
 	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:"数据日期时间戳"`
+	CreateTime    time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime    time.Time `gorm:"column:modify_time" description:"修改时间"`
+	DataTimestamp int64     `gorm:"column:data_timestamp" description:"数据日期时间戳"`
 }
 
 // AddCalculateLjztbpj 新增累计值同比拼接数据

models/edb_data_calculate_zjpj.go

@@ -18,9 +18,9 @@ type EdbDataCalculateZjpj struct {
 	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:"数据日期时间戳"`
+	CreateTime    time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime    time.Time `gorm:"column:modify_time" description:"修改时间"`
+	DataTimestamp int64     `gorm:"column:data_timestamp" description:"数据日期时间戳"`
 }
 
 // AddCalculateZjpj 新增直接拼接数据

models/edb_data_insert_config.go

@@ -7,7 +7,7 @@ import (
 
 // EdbDataInsertConfig 指标数据插入配置表
 type EdbDataInsertConfig struct {
-	EdbInfoId  int       `gorm:"primaryKey;autoIncrement;column:edb_info_id" description:"指标id"`
+	EdbInfoId  int       `gorm:"primaryKey;autoIncrement:false;column:edb_info_id" description:"指标id"`
 	Date       time.Time `description:"插入的日期"`
 	Value      string    `description:"插入的值"`
 	RealDate   time.Time `description:"实际数据的日期"`

models/edb_data_trade_analysis.go

@@ -16,9 +16,9 @@ type EdbDataTradeAnalysis struct {
 	EdbCode       string    `gorm:"column:edb_code" description:"指标编码"`
 	DataTime      time.Time `gorm:"column:data_time" description:"数据日期"`
 	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:"数据日期时间戳"`
+	CreateTime    time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime    time.Time `gorm:"column:modify_time" description:"修改时间"`
+	DataTimestamp int64     `gorm:"column:data_timestamp" description:"数据日期时间戳"`
 }
 
 func (m *EdbDataTradeAnalysis) TableName() string {
@@ -73,7 +73,7 @@ func (m *EdbDataTradeAnalysis) Update(cols []string) (err error) {
 func (m *EdbDataTradeAnalysis) Remove() (err error) {
 
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	err = global.DEFAULT_DmSQL.Raw(sql, m.EdbDataId).Error
+	err = global.DEFAULT_DmSQL.Exec(sql, m.EdbDataId).Error
 	return
 }
 
@@ -83,7 +83,7 @@ func (m *EdbDataTradeAnalysis) MultiRemove(ids []int) (err error) {
 	}
 
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.Cols().PrimaryId, utils.GetOrmInReplace(len(ids)))
-	err = global.DEFAULT_DmSQL.Raw(sql, ids).Error
+	err = global.DEFAULT_DmSQL.Exec(sql, ids).Error
 	return
 }
 
@@ -133,7 +133,7 @@ func (m *EdbDataTradeAnalysis) GetItemsByCondition(condition string, pars []inte
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -149,7 +149,7 @@ func (m *EdbDataTradeAnalysis) GetPageItemsByCondition(condition string, pars []
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
 	pars = append(pars, startSize, pageSize)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/factor_edb_series.go

@@ -75,7 +75,7 @@ func (m *FactorEdbSeries) Update(cols []string) (err error) {
 
 func (m *FactorEdbSeries) Remove() (err error) {
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	err = global.DEFAULT_DmSQL.Raw(sql, m.FactorEdbSeriesId).Error
+	err = global.DEFAULT_DmSQL.Exec(sql, m.FactorEdbSeriesId).Error
 
 	return
 }
@@ -125,7 +125,7 @@ func (m *FactorEdbSeries) GetItemsByCondition(condition string, pars []interface
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 
 	return
 }
@@ -141,7 +141,7 @@ func (m *FactorEdbSeries) GetPageItemsByCondition(condition string, pars []inter
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
 	pars = append(pars, startSize, pageSize)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 
 	return
 }

models/factor_edb_series_calculate_data.go

@@ -138,7 +138,7 @@ func (m *FactorEdbSeriesCalculateData) GetItemsByCondition(condition string, par
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 
 	return
 }
@@ -154,7 +154,7 @@ func (m *FactorEdbSeriesCalculateData) GetPageItemsByCondition(condition string,
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
 	pars = append(pars, startSize, pageSize)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 
 	return
 }

models/factor_edb_series_calculate_data_qjjs.go

@@ -136,7 +136,7 @@ func (m *FactorEdbSeriesCalculateDataQjjs) GetItemsByCondition(condition string,
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 
 	return
 }
@@ -152,7 +152,7 @@ func (m *FactorEdbSeriesCalculateDataQjjs) GetPageItemsByCondition(condition str
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
 	pars = append(pars, startSize, pageSize)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 
 	return
 }

models/factor_edb_series_calculate_func.go

@@ -117,7 +117,7 @@ func (m *FactorEdbSeriesCalculateFunc) GetItemsByCondition(condition string, par
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -133,7 +133,7 @@ func (m *FactorEdbSeriesCalculateFunc) GetPageItemsByCondition(condition string,
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
 	pars = append(pars, startSize, pageSize)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/factor_edb_series_chart_mapping.go

@@ -135,7 +135,7 @@ func (m *FactorEdbSeriesChartMapping) GetItemsByCondition(condition string, pars
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -151,7 +151,7 @@ func (m *FactorEdbSeriesChartMapping) GetPageItemsByCondition(condition string,
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
 	pars = append(pars, startSize, pageSize)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/factor_edb_series_mapping.go

@@ -125,7 +125,7 @@ func (m *FactorEdbSeriesMapping) GetItemsByCondition(condition string, pars []in
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -141,7 +141,7 @@ func (m *FactorEdbSeriesMapping) GetPageItemsByCondition(condition string, pars
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
 	pars = append(pars, startSize, pageSize)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/predict_edb.go

@@ -113,7 +113,7 @@ func CalculateByRuleBy9(to *gorm.DB, rule CalculateRule) (resultDataList []*EdbI
 	//获取指标所有数据
 	dataList := make([]*PredictEdbRuleData, 0)
 	sql := `SELECT * FROM predict_edb_rule_data WHERE config_id = ?`
-	err = to.Raw(sql, rule.ConfigId).Scan(&dataList).Error
+	err = to.Raw(sql, rule.ConfigId).Find(&dataList).Error
 	if err != nil {
 		return
 	}
@@ -335,7 +335,7 @@ func CalculateByRuleByRuleLineNh(to *gorm.DB, predictEdbInfo EdbInfo, predictEdb
 		//获取该配置的所有数据
 		dataList := make([]*PredictEdbRuleData, 0)
 		sql := `SELECT * FROM predict_edb_rule_data WHERE config_id = ?`
-		err = to.Raw(sql, rule.ConfigId).Scan(&dataList).Error
+		err = to.Raw(sql, rule.ConfigId).Find(&dataList).Error
 		if err != nil {
 			return
 		}

models/predict_edb_data_base.go

@@ -544,7 +544,7 @@ func RefreshPredictStandardBaseByGeneralEdbInfoId(sourceEdbInfoId int) {
 
 	var list []*PredictEdbConf
 	sql := ` SELECT * FROM predict_edb_conf WHERE source_edb_info_id=? `
-	err := global.DEFAULT_DmSQL.Raw(sql, sourceEdbInfoId).Scan(&list).Error
+	err := global.DEFAULT_DmSQL.Raw(sql, sourceEdbInfoId).Find(&list).Error
 	if err != nil {
 		errList = append(errList, fmt.Sprintf("根据来源换指标id获取配置项失败,来源指标ID:%d；err：%s", sourceEdbInfoId, err.Error()))
 		return

models/predict_edb_data_calculate_ljztbpj.go

@@ -20,9 +20,9 @@ type EdbDataPredictCalculateLjztbpj struct {
 	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:"数据日期时间戳"`
+	CreateTime    time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime    time.Time `gorm:"column:modify_time" description:"修改时间"`
+	DataTimestamp int64     `gorm:"column:data_timestamp" description:"数据日期时间戳"`
 }
 
 // RefreshAllPredictCalculateLjztbpj 刷新所有 累计值同比拼接 数据
@@ -84,7 +84,7 @@ func refreshAllPredictCalculateLjztbpj(to *gorm.DB, edbInfo, firstEdbInfo, secon
 	//根据指标id获取全部的数据
 	var dataList []*EdbDataPredictCalculateLjztbpj
 	sql := ` SELECT * FROM edb_data_predict_calculate_ljztbpj WHERE edb_info_id=? ORDER BY data_time DESC `
-	err = to.Raw(sql, edbInfo.EdbInfoId).Scan(&dataList).Error
+	err = to.Raw(sql, edbInfo.EdbInfoId).Find(&dataList).Error
 	if err != nil {
 		return
 	}

models/predict_edb_data_calculate_nhcc.go

@@ -20,9 +20,9 @@ type EdbDataPredictCalculateNhcc struct {
 	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:"数据日期时间戳"`
+	CreateTime    time.Time `gorm:"column:create_time" description:"创建时间"`
+	ModifyTime    time.Time `gorm:"column:modify_time" description:"修改时间"`
+	DataTimestamp int64     `gorm:"column:data_timestamp" description:"数据日期时间戳"`
 }
 
 // SavePredictCalculateNhcc 新增拟合残差数据
@@ -388,7 +388,7 @@ func RefreshAllPredictCalculateNhcc(edbInfo *EdbInfo) (latestDateStr string, lat
 func refreshAllPredictCalculateNhcc(to *gorm.DB, edbInfo, firstEdbInfo, secondEdbInfo *EdbInfo, existItemA, existItemB *EdbInfoCalculateMapping, nhccDate NhccDate) (latestDateStr string, latestValue float64, err error) {
 	var dataList []*EdbDataPredictCalculateNhcc
 	sql := ` SELECT * FROM edb_data_predict_calculate_nhcc WHERE edb_info_id=? ORDER BY data_time DESC `
-	err = to.Raw(sql, edbInfo.EdbInfoId).Scan(&dataList).Error
+	err = to.Raw(sql, edbInfo.EdbInfoId).Find(&dataList).Error
 	if err != nil {
 		return
 	}

models/predict_edb_data_calculate_zjpj.go

@@ -83,7 +83,7 @@ func refreshAllPredictCalculateZjpj(to *gorm.DB, edbInfo, firstEdbInfo, secondEd
 	//查询当前指标现有的数据
 	var dataList []*EdbDataPredictCalculateZjpj
 	sql := ` SELECT * FROM edb_data_predict_calculate_zjpj WHERE edb_info_id=? ORDER BY data_time DESC `
-	err = to.Raw(sql, edbInfo.EdbInfoId).Scan(&dataList).Error
+	err = to.Raw(sql, edbInfo.EdbInfoId).Find(&dataList).Error
 	if err != nil {
 		return
 	}

models/predict_edb_rule_data.go

@@ -45,7 +45,7 @@ func GetPredictEdbRuleDataItemList(edbInfoId, configId int, startDate, endDate s
 		pars = append(pars, endDate)
 	}
 	sql += ` ORDER BY data_time ASC `
-	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&list).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&list).Error
 
 	if err != nil {
 		return