change gorm

models/base_from_business.go

@@ -149,7 +149,7 @@ func (m *BaseFromBusinessIndex) DelIndexItemList(indexCodeList []string) (err er
 // @return err error
 func (m *BaseFromBusinessIndex) GetMaxId() (maxId int, err error) {
 	//o := orm.NewOrm()
-	sql := `SELECT max(base_from_business_index_id) id FROM base_from_business_index limit 1`
+	sql := `SELECT COALESCE(MAX(base_from_business_index_id), 0) as id FROM base_from_business_index limit 1`
 	err = global.DEFAULT_DB.Raw(sql).Scan(&maxId).Error
 	//err = o.Raw(sql).QueryRow(&maxId)
 	return

models/base_from_ccf.go

@@ -283,7 +283,7 @@ func (m *BaseFromCCFIndex) GetItemsByCondition(condition string, pars []interfac
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_ccf_index WHERE 1=1 %s %s`, fields, condition, order)
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DEFAULT_DB.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/base_from_ths_hf_data.go

@@ -112,14 +112,14 @@ func (m *BaseFromThsHfData) GetItemByCondition(condition string, pars []interfac
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = global.DEFAULT_DB.Raw(sql, pars).First(&item).Error
+	err = global.DEFAULT_DB.Raw(sql, pars...).First(&item).Error
 
 	return
 }
 
 func (m *BaseFromThsHfData) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = global.DEFAULT_DB.Raw(sql, pars).Scan(&count).Error
+	err = global.DEFAULT_DB.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -134,7 +134,7 @@ func (m *BaseFromThsHfData) GetItemsByCondition(condition string, pars []interfa
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DEFAULT_DB.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&items).Error
 
 	return
 }
@@ -149,7 +149,9 @@ func (m *BaseFromThsHfData) GetPageItemsByCondition(condition string, pars []int
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	err = global.DEFAULT_DB.Raw(sql, pars, startSize, pageSize).Find(&items).Error
+	pars = append(pars, startSize, pageSize)
+
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&items).Error
 
 	return
 }

models/ccf_stock_excel.go

@@ -100,14 +100,14 @@ func (m *CCFStockExcel) GetItemByCondition(condition string, pars []interface{},
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = global.DEFAULT_DB.Raw(sql, pars).First(&item).Error
+	err = global.DEFAULT_DB.Raw(sql, pars...).First(&item).Error
 
 	return
 }
 
 func (m *CCFStockExcel) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = global.DEFAULT_DB.Raw(sql, pars).Scan(&count).Error
+	err = global.DEFAULT_DB.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -122,7 +122,7 @@ func (m *CCFStockExcel) 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_DB.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&items).Error
 
 	return
 }
@@ -137,7 +137,8 @@ func (m *CCFStockExcel) GetPageItemsByCondition(condition string, pars []interfa
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	err = global.DEFAULT_DB.Raw(sql, pars, startSize, pageSize).Find(&items).Error
+	pars = append(pars, startSize, pageSize)
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&items).Error
 
 	return
 }

models/edb_data_calculate_ljztbpj.go

@@ -435,7 +435,7 @@ func refreshAllCalculateLjztbpj(to *gorm.DB, edbInfo *EdbInfo, existItemA, exist
 	//根据指标id获取全部的数据
 	var dataList []*EdbDataCalculateLjztbpj
 	sql := ` SELECT * FROM edb_data_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 err
 	}

models/edb_data_calculate_zjpj.go

@@ -363,7 +363,7 @@ func refreshAllCalculateZjpj(to *gorm.DB, edbInfo *EdbInfo, existItemA, existIte
 
 	var dataList []*EdbDataCalculateZjpj
 	sql := ` SELECT * FROM edb_data_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 err
 	}

models/edb_data_ths_hf.go

@@ -112,14 +112,14 @@ func (m *EdbDataThsHf) GetItemByCondition(condition string, pars []interface{},
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = global.DEFAULT_DB.Raw(sql, pars).First(&item).Error
+	err = global.DEFAULT_DB.Raw(sql, pars...).First(&item).Error
 
 	return
 }
 
 func (m *EdbDataThsHf) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = global.DEFAULT_DB.Raw(sql, pars).Scan(&count).Error
+	err = global.DEFAULT_DB.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -134,7 +134,7 @@ func (m *EdbDataThsHf) 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_DB.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&items).Error
 
 	return
 }
@@ -149,7 +149,8 @@ func (m *EdbDataThsHf) GetPageItemsByCondition(condition string, pars []interfac
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	err = global.DEFAULT_DB.Raw(sql, pars, startSize, pageSize).Find(&items).Error
+	pars = append(pars, startSize, pageSize)
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&items).Error
 
 	return
 }

models/edb_refresh/edb_refresh_mapping.go

@@ -110,7 +110,7 @@ WHERE b.edb_refresh_config_id IN (` + utils.GetOrmInReplace(num) + `) `
 		sql += ` AND b.source not in (` + utils.GetOrmInReplace(sourceNum) + `) `
 		pars = append(pars, sourceList)
 	}
-	err = global.DEFAULT_DB.Raw(sql, pars).Scan(&list).Error
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&list).Error
 
 	return
 }

models/edb_source.go

@@ -45,7 +45,7 @@ func GetEdbSourceItemsByCondition(condition string, pars []interface{}, fieldArr
 // GetEdbSourceItemByCondition 获取指标来源
 func GetEdbSourceItemByCondition(condition string, pars []interface{}) (item *EdbSource, err error) {
 	sql := fmt.Sprintf(`SELECT * FROM edb_source WHERE 1=1 %s`, condition)
-	err = global.DEFAULT_DB.Raw(sql, pars).First(&item).Error
+	err = global.DEFAULT_DB.Raw(sql, pars...).First(&item).Error
 
 	return
 }

models/future_good/chart_info_future_good_profit.go

@@ -62,7 +62,7 @@ func (m *ChartInfoFutureGoodProfit) GetItemById(id int) (err error) {
 
 func (m *ChartInfoFutureGoodProfit) GetItemByCondition(condition string, pars []interface{}) (err error) {
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
-	err = global.DEFAULT_DB.Raw(sql, pars).First(&m).Error
+	err = global.DEFAULT_DB.Raw(sql, pars...).First(&m).Error
 
 	return
 }
@@ -77,7 +77,7 @@ func (m *ChartInfoFutureGoodProfit) 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_DB.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&items).Error
 
 	return
 }

models/future_good/future_good_edb_data.go

@@ -79,7 +79,7 @@ func GetFutureGoodEdbDataList(condition string, pars []interface{}) (list []*Fut
 		sql += condition
 	}
 	sql += `ORDER BY data_time asc `
-	err = global.DEFAULT_DB.Raw(sql, pars).Find(&list).Error
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&list).Error
 
 	return
 }
@@ -169,7 +169,7 @@ func RefreshFutureGoodEdbDataFromThs(futureGoodEdbInfoId int, edbCode, startDate
 			sql += condition
 		}
 		sql += `ORDER BY data_time asc `
-		err = to.Raw(sql, pars).Find(&existList).Error
+		err = to.Raw(sql, pars...).Find(&existList).Error
 	}
 
 	existMap := make(map[string]*FutureGoodEdbData)
@@ -297,7 +297,7 @@ func GetFutureGoodEdbDataListByDate(futureGoodEdbInfoId int, startDate, endDate
 	}
 
 	sql += ` ORDER BY data_time ASC `
-	err = global.DEFAULT_DB.Raw(sql, futureGoodEdbInfoId, pars).Find(&list).Error
+	err = global.DEFAULT_DB.Raw(sql, utils.ForwardPars(pars, futureGoodEdbInfoId)...).Find(&list).Error
 
 	return
 }

models/future_good/future_good_edb_info.go

@@ -78,7 +78,7 @@ func GetFutureGoodEdbInfoList(condition string, pars []interface{}) (list []*Fut
 		sql += condition
 	}
 	sql += `ORDER BY future_good_edb_info_id DESC `
-	err = global.DEFAULT_DB.Raw(sql, pars).Find(&list).Error
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&list).Error
 
 	return
 }

models/trade_analysis/trade_analysis.go

@@ -277,7 +277,7 @@ func GetTradeDataByContracts(exchange string, classifyNames, contracts []string,
 	fields := []string{"rank", "buy_short_name", "buy_value", "buy_change", "sold_short_name", "sold_value", "sold_change", "classify_name", "classify_type", "data_time"}
 	tableName := fmt.Sprintf("base_from_trade_%s_index", exchange)
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s ORDER BY data_time DESC`, strings.Join(fields, ","), tableName, cond)
-	err = global.DEFAULT_DB.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&items).Error
 
 	return
 }
@@ -297,7 +297,7 @@ func GetZhengzhouTradeDataByContracts(classifyNames []string, startDate, endDate
 	// ps.classify_name实为合约代码
 	fields := []string{"rank", "buy_short_name", "buy_value", "buy_change", "sold_short_name", "sold_value", "sold_change", "classify_name AS classify_type", "data_time"}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_trade_zhengzhou_index WHERE 1=1 %s ORDER BY data_time DESC`, strings.Join(fields, ","), cond)
-	err = global.DEFAULT_DB.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&items).Error
 
 	return
 }
@@ -363,7 +363,7 @@ func GetBaseFromTradeGuangzhouIndex(classifyIds []int, contracts []string, index
 		JOIN base_from_trade_guangzhou_contract AS b ON a.base_from_trade_guangzhou_contract_id = b.base_from_trade_guangzhou_contract_id
 		WHERE 1=1 %s`
 	sql = fmt.Sprintf(sql, cond)
-	err = global.DEFAULT_DB.Raw(sql, pars).Find(&list).Error
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&list).Error
 
 	return
 }
@@ -398,7 +398,7 @@ func GetBaseFromTradeGuangzhouDataByIndexIds(indexIds []int, startDate, endDate
 		}
 	}
 	sql := fmt.Sprintf(`SELECT * FROM base_from_trade_guangzhou_data WHERE 1=1 %s ORDER BY base_from_trade_guangzhou_index_id`, cond)
-	err = global.DEFAULT_DB.Raw(sql, pars).Find(&list).Error
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&list).Error
 
 	return
 }
@@ -497,7 +497,7 @@ func GetGuangzhouClassifyNewestDataTime(indexIds []int) (dateTime time.Time, err
 	pars := make([]interface{}, 0)
 	pars = append(pars, indexIds)
 	sql := fmt.Sprintf(`SELECT data_time FROM base_from_trade_guangzhou_data WHERE 1=1 %s ORDER BY data_time DESC LIMIT 1`, cond)
-	err = global.DEFAULT_DB.Raw(sql, pars).Scan(&dateTime).Error
+	err = global.DEFAULT_DB.Raw(sql, pars...).Scan(&dateTime).Error
 
 	return
 }

models/trade_analysis/trade_classify.go

@@ -54,7 +54,7 @@ func (m *BaseFromTradeClassify) GetItemsByCondition(condition string, pars []int
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	err = global.DEFAULT_DB.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&items).Error
 
 	return
 }
@@ -70,7 +70,7 @@ func (m *BaseFromTradeClassify) GetClassifyItemsByCondition(condition string, pa
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s GROUP BY %s %s`, fields, m.TableName(), condition, m.Cols().ClassifyName, order)
-	err = global.DEFAULT_DB.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&items).Error
 
 	return
 }

utils/common.go

@@ -1727,6 +1727,19 @@ func ReverseTimeSlice(s []time.Time) []time.Time {
 	}
 	return s
 }
+
+// ForwardPars
+// @Description: 向前插入参数
+// @param pars
+// @param values
+// @return []interface{}
+func ForwardPars(pars []interface{}, values ...interface{}) []interface{} {
+	if len(values) <= 0 {
+		return pars
+	}
+	return append(values, pars...)
+}
+
 func IsErrNoRow(err error) bool {
 	if err == nil {
 		return false