数据库查询参数处理优化

对数据库查询操作进行了全面的参数序列化和传递优化，以提高代码的可靠性和可维护性。改动包括使用更清晰的参数处理方法，以避免潜在的SQL错误，例如在用户创建操作中正确分配UUID。此外，对查询参数的传递使用了更直接的方式，减少了潜在的错误并提升了代码的整洁度。

models/classify.go

@@ -339,7 +339,7 @@ func GetClassifyChild(parentId int, keyWord string) (items []*Classify, err erro
 	pars = append(pars, parentId)
 	//o := orm.NewOrmUsingDB("rddp")
 	//_, err = o.Raw(sql, pars...).QueryRows(&items)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/data_manage/baiinfo_data.go

@@ -49,13 +49,13 @@ type BaiinfoIndex struct {
 	ModifyTime             string
 }
 
-func GetBaiinfoIndex(condition string, pars interface{}) (items []*BaiinfoIndex, err error) {
+func GetBaiinfoIndex(condition string, pars []interface{}) (items []*BaiinfoIndex, err error) {
 	sql := ` SELECT * FROM base_from_baiinfo_index WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
 	sql += `ORDER BY sort ASC, base_from_baiinfo_index_id asc`
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/base_from_bloomberg_index.go

@@ -129,7 +129,7 @@ func (m *BaseFromBloombergIndex) GetItemByCondition(condition string, pars []int
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).First(&item).Error
+	err = o.Raw(sql, pars...).First(&item).Error
 
 	return
 }
@@ -137,7 +137,7 @@ func (m *BaseFromBloombergIndex) GetItemByCondition(condition string, pars []int
 func (m *BaseFromBloombergIndex) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }

models/data_manage/base_from_ccf.go

@@ -50,21 +50,13 @@ type CCFSingleData struct {
 	DataTime string `orm:"column(data_time)" description:"值"`
 }
 
-func GetCCFIndex(condition string, pars interface{}) (items []*BaseFromCCFIndexList, err error) {
+func GetCCFIndex(condition string, pars []interface{}) (items []*BaseFromCCFIndexList, err error) {
 	sql := ` SELECT * FROM base_from_ccf_index WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC, base_from_ccf_index_id asc`
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
-
-	return
-}
-
-func GetCCFIndexDataCount(indexCode string) (count int, err error) {
-	o := global.DmSQL["data"]
-	sql := ` SELECT COUNT(1) AS count FROM base_from_ccf_data WHERE index_code=? `
-	err = o.Raw(sql, indexCode).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/base_from_fenwei.go

@@ -91,13 +91,13 @@ type BaseFromFenWeiIndexPage struct {
 	Paging *paging.PagingItem     `description:"分页数据"`
 }
 
-func GetFenweiIndex(condition string, pars interface{}) (items []*BaseFromFenweiIndexList, err error) {
+func GetFenweiIndex(condition string, pars []interface{}) (items []*BaseFromFenweiIndexList, err error) {
 	sql := ` SELECT * FROM base_from_fenwei_index WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC, fenwei_index_id asc`
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/base_from_mtjh.go

@@ -68,13 +68,13 @@ type BaseFromMtjhMappingItem struct {
 	Frequency             string `description:"频率"`
 }
 
-func GetMtjhMapping(condition string, pars interface{}) (items []*BaseFromMtjhMappingItem, err error) {
+func GetMtjhMapping(condition string, pars []interface{}) (items []*BaseFromMtjhMappingItem, err error) {
 	sql := ` SELECT * FROM base_from_mtjh_mapping WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY base_from_mtjh_mapping_id asc`
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/base_from_national_statistics_classify.go

@@ -64,14 +64,14 @@ func (m *BaseFromNationalStatisticsClassify) GetItemByCondition(condition string
 	sql := `SELECT * FROM base_from_national_statistics_classify WHERE 1=1 `
 	sql += condition
 	sql += ` LIMIT 1`
-	err = global.DmSQL["data"].Raw(sql, pars).First(&m).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&m).Error
 
 	return
 }
 
 func (m *BaseFromNationalStatisticsClassify) 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.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 
 	return
 }

models/data_manage/base_from_national_statistics_data.go

@@ -62,14 +62,14 @@ func (m *BaseFromNationalStatisticsData) GetItemByCondition(condition string, pa
 	sql := `SELECT * FROM base_from_national_statistics_data WHERE 1=1 `
 	sql += condition
 	sql += ` LIMIT 1`
-	err = global.DmSQL["data"].Raw(sql, pars).First(&m).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&m).Error
 
 	return
 }
 
 func (m *BaseFromNationalStatisticsData) 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.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 
 	return
 }

models/data_manage/base_from_oilchem.go

@@ -79,22 +79,22 @@ LEFT JOIN edb_info AS e ON a.index_code=e.edb_code AND e.source=89
 	return
 }
 
-func GetOilchemIndexListCount(condition string, pars interface{}) (count int, err error) {
+func GetOilchemIndexListCount(condition string, pars []interface{}) (count int, err error) {
 	sql := ` SELECT COUNT(1) AS count FROM base_from_oilchem_index WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
 
-func GetOilchemDataListCount(condition string, pars interface{}) (count int, err error) {
+func GetOilchemDataListCount(condition string, pars []interface{}) (count int, err error) {
 	sql := ` SELECT COUNT(1) AS count FROM base_from_oilchem_data WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -153,7 +153,7 @@ func GetOilchemIndexAndEdbInfoByCondition(condition string, pars []interface{})
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC `
-	err = global.DmSQL["data"].Raw(sql, utils.DATA_SOURCE_OILCHEM, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, utils.DATA_SOURCE_OILCHEM)).Scan(&items).Error
 
 	return
 }
@@ -248,7 +248,7 @@ func GetOilchemIndexViewListCount(condition string, pars []interface{}) (count i
 		sql += condition
 	}
 	sql += ` ORDER BY b.modify_time ASC `
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }

models/data_manage/base_from_sci_hq_index.go

@@ -58,7 +58,7 @@ func GetSciHqIndexByCondition(condition string, pars []interface{}) (items []*Ba
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC, base_from_sci_hq_index_id ASC`
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }
@@ -86,7 +86,7 @@ func GetSciHqIndexCountByCondition(condition string, pars []interface{}) (count
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC, base_from_sci_hq_index_id ASC`
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }
@@ -100,7 +100,7 @@ func GetSciHqIndexAndEdbInfoByCondition(condition string, pars []interface{}) (i
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC `
-	err = o.Raw(sql, utils.DATA_SOURCE_SCI_HQ, pars).Scan(&items).Error
+	err = o.Raw(sql, utils.ForwardPars(pars, utils.DATA_SOURCE_SCI_HQ)).Scan(&items).Error
 
 	return
 }
@@ -223,7 +223,7 @@ func GetSciHqDataMaxCount(condition string, pars []interface{}) (count int, err
 		sql += condition
 	}
 	sql += ` GROUP BY a.base_from_sci_hq_index_id) AS t `
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }

models/data_manage/base_from_smm.go

@@ -378,7 +378,7 @@ func GetSmmIndexDataListCount(condition string, pars []interface{}) (total int,
 		sql += condition
 	}
 	o := global.DmSQL["data"]
-	err = o.Raw(sql, pars).Scan(&total).Error
+	err = o.Raw(sql, pars...).Scan(&total).Error
 
 	return
 }
@@ -441,7 +441,7 @@ func GetSmmIndexDataListNoPage(condition string, pars []interface{}) (items []*B
 		sql += condition
 	}
 	o := global.DmSQL["data"]
-	err = o.Raw(sql, pars).Scan(&items).Error
+	err = o.Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/base_from_ths_hf.go

@@ -171,7 +171,7 @@ func (m *BaseFromThsHfIndex) GetItemByCondition(condition string, pars []interfa
 func (m *BaseFromThsHfIndex) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }

models/data_manage/base_from_ths_hf_classify.go

@@ -126,7 +126,7 @@ func (m *BaseFromThsHfClassify) GetItemByCondition(condition string, pars []inte
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).First(&item).Error
+	err = o.Raw(sql, pars...).First(&item).Error
 
 	return
 }
@@ -134,7 +134,7 @@ func (m *BaseFromThsHfClassify) GetItemByCondition(condition string, pars []inte
 func (m *BaseFromThsHfClassify) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }

models/data_manage/base_from_ths_hf_data.go

@@ -115,7 +115,7 @@ 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 = o.Raw(sql, pars).First(&item).Error
+	err = o.Raw(sql, pars...).First(&item).Error
 
 	return
 }

models/data_manage/base_from_yongyi.go

@@ -52,13 +52,13 @@ type YongyiSingleData struct {
 	DataTime string `orm:"column(data_time)" description:"值"`
 }
 
-func GetYongyiIndex(condition string, pars interface{}) (items []*BaseFromYongyiIndexList, err error) {
+func GetYongyiIndex(condition string, pars []interface{}) (items []*BaseFromYongyiIndexList, err error) {
 	sql := ` SELECT * FROM base_from_yongyi_index WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC, yongyi_index_id asc`
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/ccf_stock_excel.go

@@ -106,7 +106,7 @@ 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 = o.Raw(sql, pars).First(&item).Error
+	err = o.Raw(sql, pars...).First(&item).Error
 
 	return
 }

models/data_manage/chart_framework_node.go

@@ -68,7 +68,7 @@ func (m *ChartFrameworkNode) GetItemById(id int) (item *ChartFrameworkNode, err
 func (m *ChartFrameworkNode) GetItemByCondition(condition string, pars []interface{}) (item *ChartFrameworkNode, err error) {
 	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
-	err = o.Raw(sql, pars).First(&item).Error
+	err = o.Raw(sql, pars...).First(&item).Error
 
 	return
 }

models/data_manage/chart_info.go

@@ -509,7 +509,7 @@ func getEdbDataListByMysql(source, subSource, edbInfoId int, startDate, endDate
 	sql += ` ORDER BY data_time ASC `
 	sql = fmt.Sprintf(sql, tableName)
 	o := global.DmSQL["data"]
-	err = o.Raw(sql, edbInfoId, pars).Scan(&list).Error
+	err = o.Raw(sql, utils.ForwardPars(pars, edbInfoId)).Scan(&list).Error
 
 	return
 }
@@ -646,7 +646,7 @@ func getEdbDataListMinAndMaxByMysql(source, subSource, edbInfoId int, startDate,
 
 	var tmpData MaxOrMinData
 
-	err = o.Raw(sql, edbInfoId, pars).Scan(&tmpData).Error
+	err = o.Raw(sql, utils.ForwardPars(pars, edbInfoId)).Scan(&tmpData).Error
 	if err != nil {
 		return
 	}
@@ -1710,7 +1710,7 @@ func ChartInfoSearchByKeyWord(keyword string, showSysId int) (searchList []*Char
 	if keyword == "" {
 		sql += ` LIMIT 100 `
 	}
-	err = o.Raw(sql, pars).Scan(&searchList).Error
+	err = o.Raw(sql, pars...).Scan(&searchList).Error
 
 	return
 }
@@ -2791,7 +2791,7 @@ func GetChartInfoBySourceAndParentId(source, parentId, adminId int) (items []*Ch
 		pars = append(pars, adminId)
 	}
 	sql += ` ORDER BY sort asc,chart_info_id ASC `
-	err = o.Raw(sql, pars).Scan(&items).Error
+	err = o.Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/chart_theme/chart_theme_default_data.go

@@ -83,7 +83,7 @@ func GetChartThemeDefaultDataItemList(endInfoId int, startDate string) (list []*
 
 	sql += ` ORDER BY data_time ASC `
 
-	err = global.DmSQL["data"].Raw(sql, endInfoId, pars).Find(&list).Error
+	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, endInfoId)).Find(&list).Error
 	return
 }
 

models/data_manage/data_manage_permission/excel.go

@@ -960,7 +960,7 @@ func GetAdminAuthExcelInfoPermission(source, adminId int, keywords string) (item
 		pars = append(pars, keywords)
 	}
 	sql += ` ORDER BY a.create_time ASC`
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }

models/data_manage/edb_data_base.go

@@ -248,7 +248,7 @@ func GetEdbDataAllByEdbCodeByMysql(edbCode string, source, subSource, limit int)
 		pars = append(pars, limit)
 	}
 	sql = fmt.Sprintf(sql, tableName)
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
 
 	return
 }
@@ -334,7 +334,7 @@ func GetBaseIndexInfoByEdbCode(edbCode string, source int) (item *BaseIndexInfo,
 	sql := ` SELECT * FROM %s WHERE index_code=? `
 
 	sql = fmt.Sprintf(sql, tableName)
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&item).Error
 
 	return
 }

models/data_manage/edb_info.go

@@ -534,7 +534,7 @@ func GetAllEdbDataListByCondition(condition string, pars []interface{}, source,
 		sql += condition
 	}
 	sql += ` ORDER BY data_time DESC `
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&item).Error
 
 	return
 }
@@ -1246,7 +1246,7 @@ func GetEdbInfoFilterList(condition string, pars []interface{}, startSize, pageS
 	o := global.DmSQL["data"]
 
 	sql := ` SELECT count(1) total FROM edb_info where 1=1 ` + condition + ` ORDER BY edb_info_id DESC `
-	err = o.Raw(sql, pars).Scan(&total).Error
+	err = o.Raw(sql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}
@@ -1271,7 +1271,7 @@ func GetNextEdbInfoByCondition(condition string, pars []interface{}) (item *EdbI
 		sql += condition
 	}
 	sql += " ORDER BY sort asc , edb_info_id asc LIMIT 1 "
-	err = o.Raw(sql, pars).First(&item).Error
+	err = o.Raw(sql, pars...).First(&item).Error
 
 	return
 }

models/data_manage/edb_info_relation.go

@@ -276,7 +276,7 @@ SELECT count(edb_info_id) as relation_num, edb_info_id, max(relation_time) as re
 	if condition != "" {
 		totalSql += condition
 	}
-	err = o.Raw(totalSql, pars).Scan(&total).Error
+	err = o.Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}

models/data_manage/edb_info_updates.go

@@ -117,7 +117,7 @@ func GetUpdatesListTotal(condition string, pars []interface{}) (count int, err e
 	sql := ` SELECT COUNT(1) AS count FROM edb_info
 			WHERE 1=1 `
 	sql += condition
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }

models/data_manage/edb_source.go

@@ -56,7 +56,7 @@ type EdbSourceChild struct {
 // 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.DmSQL["data"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&item).Error
 
 	return
 }

models/data_manage/factor_edb_series_calculate_data_qjjs.go

@@ -113,7 +113,7 @@ func (m *FactorEdbSeriesCalculateDataQjjs) GetItemByCondition(condition string,
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).First(&item).Error
+	err = o.Raw(sql, pars...).First(&item).Error
 
 	return
 }
@@ -121,7 +121,7 @@ func (m *FactorEdbSeriesCalculateDataQjjs) GetItemByCondition(condition string,
 func (m *FactorEdbSeriesCalculateDataQjjs) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }

models/data_manage/factor_edb_series_calculate_func.go

@@ -93,7 +93,7 @@ func (m *FactorEdbSeriesCalculateFunc) GetItemByCondition(condition string, pars
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = global.DmSQL["data"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&item).Error
 
 	return
 }
@@ -101,7 +101,7 @@ func (m *FactorEdbSeriesCalculateFunc) GetItemByCondition(condition string, pars
 func (m *FactorEdbSeriesCalculateFunc) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }

models/data_manage/factor_edb_series_chart_mapping.go

@@ -130,7 +130,7 @@ func (m *FactorEdbSeriesChartMapping) GetItemByCondition(condition string, pars
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = global.DmSQL["data"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&item).Error
 
 	return
 }
@@ -138,7 +138,7 @@ func (m *FactorEdbSeriesChartMapping) GetItemByCondition(condition string, pars
 func (m *FactorEdbSeriesChartMapping) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 
 	return
 }

models/data_manage/factor_edb_series_mapping.go

@@ -103,14 +103,14 @@ func (m *FactorEdbSeriesMapping) GetItemByCondition(condition string, pars []int
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = global.DmSQL["data"].Raw(sql, pars).First(&item).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).First(&item).Error
 
 	return
 }
 
 func (m *FactorEdbSeriesMapping) 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.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 
 	return
 }

models/data_manage/future_good/future_good_edb_info.go

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

models/data_manage/future_good/future_good_edb_info_data.go

@@ -100,7 +100,7 @@ func GetFutureGoodEdbDataListByDate(futureGoodEdbInfoId int, startDate, endDate
 	}
 
 	sql += ` ORDER BY data_time ASC `
-	err = global.DmSQL["data"].Raw(sql, futureGoodEdbInfoId, pars).Scan(&list).Error
+	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, futureGoodEdbInfoId)).Scan(&list).Error
 
 	return
 }
@@ -118,7 +118,7 @@ func GetFutureGoodEdbDataListByIdsAndDate(futureGoodEdbInfoIds []int, startDate,
 	}
 
 	sql += ` ORDER BY data_time ASC `
-	err = global.DmSQL["data"].Raw(sql, futureGoodEdbInfoIds, pars).Scan(&list).Error
+	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, futureGoodEdbInfoIds)).Scan(&list).Error
 
 	return
 }

models/data_manage/my_chart.go

@@ -442,7 +442,7 @@ func GetMyChartListCountByCondition(condition string, pars []interface{}) (count
 		sql += condition
 	}
 	sql1 := ` SELECT COUNT(1) AS count FROM (` + sql + ` GROUP BY a.chart_info_id ) d`
-	err = global.DmSQL["data"].Raw(sql1, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql1, pars...).Scan(&count).Error
 	return
 }
 

models/data_manage/mysteel_chemical_index.go

@@ -116,7 +116,7 @@ func (m *BaseFromMysteelChemicalIndex) GeItemsByCondition(condition string, pars
 		sql += " limit ? "
 		pars = append(pars, limitSize)
 	}
-	err = global.DmSQL["data"].Raw(sql, utils.DATA_SOURCE_MYSTEEL_CHEMICAL, pars).Find(&items).Error
+	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, utils.DATA_SOURCE_MYSTEEL_CHEMICAL)).Find(&items).Error
 	return
 }
 
@@ -685,7 +685,7 @@ func GetMysteelChemicalBaseInfoList(condition string, pars []interface{}, orderB
 	if condition != "" {
 		totalSql += condition
 	}
-	err = global.DmSQL["data"].Raw(totalSql, pars).Scan(&total).Error
+	err = global.DmSQL["data"].Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}

models/data_manage/predict_edb_rule_data.go

@@ -2,6 +2,7 @@ package data_manage
 
 import (
 	"eta_gn/eta_api/global"
+	"eta_gn/eta_api/utils"
 	"time"
 )
 
@@ -44,6 +45,6 @@ func GetPredictEdbRuleDataList(edbInfoId, configId int, startDate, endDate strin
 		pars = append(pars, endDate)
 	}
 	sql += ` ORDER BY data_time ASC `
-	err = global.DmSQL["data"].Raw(sql, edbInfoId, configId, pars).Find(&list).Error
+	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, edbInfoId, configId)).Find(&list).Error
 	return
 }

models/data_manage/sci_data.go

@@ -53,7 +53,7 @@ type SciIndex struct {
 	ModifyTime         string
 }
 
-func GetSciIndex(condition string, pars interface{}) (items []*SciIndex, err error) {
+func GetSciIndex(condition string, pars []interface{}) (items []*SciIndex, err error) {
 	//o := orm.NewOrmUsingDB("data")
 	//sql := ` SELECT * FROM base_from_sci_index WHERE 1=1  `
 	//if condition != "" {
@@ -67,7 +67,7 @@ func GetSciIndex(condition string, pars interface{}) (items []*SciIndex, err err
 		sql += condition
 	}
 	sql += `ORDER BY sort ASC, base_from_sci_index_id asc`
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
 
 	return
 }

models/data_manage/smm_data.go

@@ -78,7 +78,7 @@ type SmmIndexItem struct {
 	EndValue           float64 `description:"指标的最新值"`
 }
 
-func GetSmmIndex(condition string, pars interface{}) (items []*SmmIndex, err error) {
+func GetSmmIndex(condition string, pars []interface{}) (items []*SmmIndex, err error) {
 	//o := orm.NewOrmUsingDB("data")
 	//sql := ` SELECT * FROM base_from_smm_index WHERE 1=1  `
 	//if condition != "" {
@@ -92,7 +92,7 @@ func GetSmmIndex(condition string, pars interface{}) (items []*SmmIndex, err err
 		sql += condition
 	}
 	sql += `ORDER BY sort ASC, base_from_smm_index_id asc`
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -336,7 +336,7 @@ func GetSmmBaseInfoList(condition string, pars []interface{}, orderBy string, st
 	if condition != "" {
 		totalSql += condition
 	}
-	err = global.DmSQL["data"].Raw(totalSql, pars).Scan(&total).Error
+	err = global.DmSQL["data"].Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}

models/data_manage/supply_analysis/base_from_stock_plant_data.go

@@ -39,7 +39,7 @@ func GetVarietyEdbData(varietyEdbId int, startDate, endDate string) (items []*Ba
 	}
 
 	sql += ` ORDER BY data_time ASC `
-	err = global.DmSQL["data"].Raw(sql, varietyEdbId, pars).Scan(&items).Error
+	err = global.DmSQL["data"].Raw(sql, utils.ForwardPars(pars, varietyEdbId)).Scan(&items).Error
 
 	return
 }

models/data_manage/supply_analysis/variety.go

@@ -147,7 +147,7 @@ func (item Variety) GetListBySuperAdminPage(condition string, pars []interface{}
 	// 数据总数
 	totalSql := `SELECT COUNT(1) total ` + baseSql
 
-	err = global.DmSQL["data"].Raw(totalSql, pars).Scan(&total).Error
+	err = global.DmSQL["data"].Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		fmt.Println("Count Err:", err)
 		return

models/data_source/base_from_sci99.go

@@ -124,7 +124,7 @@ func GetBaseFromSci99Classify() (list []*BaseFromSci99Classify, err error) {
 	return
 }
 
-func GetSci99Index(condition string, pars interface{}) (items []*BaseFromSci99IndexList, err error) {
+func GetSci99Index(condition string, pars []interface{}) (items []*BaseFromSci99IndexList, err error) {
 	//o := orm.NewOrmUsingDB("data")
 	//sql := ` SELECT * FROM base_from_sci99_index WHERE 1=1  `
 	//if condition != "" {
@@ -137,7 +137,7 @@ func GetSci99Index(condition string, pars interface{}) (items []*BaseFromSci99In
 		sql += condition
 	}
 	sql += `ORDER BY base_from_sci_index_id ASC `
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/data_source/guagnzhouqihuo.go

@@ -169,7 +169,7 @@ WHERE `
 		}
 		sql += ` ORDER BY a.index_code ASC `
 		//_, err = o.Raw(sql, pars).QueryRows(&list)
-		err = global.DmSQL["data"].Raw(sql, pars).Find(&list).Error
+		err = global.DmSQL["data"].Raw(sql, pars...).Find(&list).Error
 		return
 	} else {
 		condition += ` AND a.base_from_trade_guangzhou_contract_id=? `

models/data_source/icpi.go

@@ -127,7 +127,7 @@ type BaseFromIcpiIndexView struct {
 	Paging                 *paging.PagingItem      `description:"分页数据" gorm:"-"`
 }
 
-func (obj *BaseFromIcpiIndex) GetIcpiIndex(condition string, pars interface{}) (items []*BaseFromIcpiIndexView, err error) {
+func (obj *BaseFromIcpiIndex) GetIcpiIndex(condition string, pars []interface{}) (items []*BaseFromIcpiIndexView, err error) {
 	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_icpi_index WHERE 1=1  `
 	if condition != "" {
@@ -135,7 +135,7 @@ func (obj *BaseFromIcpiIndex) GetIcpiIndex(condition string, pars interface{}) (
 	}
 	sql += `ORDER BY base_from_icpi_index_id ASC `
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DmSQL["data"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/data_stat/edb_info_update_stat.go

@@ -142,7 +142,7 @@ func GetEdbUpdateStatCount(condition string, pars []interface{}) (count int, err
 		sql += condition
 	}
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 

models/out_link.go

@@ -73,7 +73,7 @@ func (ol *OutLink) GetItemsByCondition(condition string, pars []interface{}, ord
 	}
 	sql += order
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -96,7 +96,7 @@ func (ol *OutLink) GetCountByCondition(condition string, pars []interface{}) (co
 	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, ol.TableName(), condition)
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -113,7 +113,7 @@ func (ol *OutLink) GetPageItemsByCondition(startSize, pageSize int, condition st
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, ol.TableName(), condition, order)
 	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z`
 	//if err = o.Raw(totalSql, pars).QueryRow(&total); err != nil {
-	if err = global.DEFAULT_DmSQL.Raw(totalSql, pars).Scan(&total).Error; err != nil {
+	if err = global.DEFAULT_DmSQL.Raw(totalSql, pars...).Scan(&total).Error; err != nil {
 		return
 	}
 	sql += ` LIMIT ?,?`

models/ppt_english/ppt_english.go

@@ -130,7 +130,7 @@ func GetPptEnglishByCondition(condition string, pars []interface{}) (items []*Pp
 	sql += `ORDER BY modify_time DESC`
 	//sql += `ORDER BY create_time DESC LIMIT ?,?`
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/report.go

@@ -173,7 +173,7 @@ func GetReportListCountV1(condition string, pars []interface{}) (count int, err
 		sql += condition
 	}
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -242,7 +242,7 @@ func GetReportListCountByGrant(condition string, pars []interface{}) (count int,
 
 	sql = `SELECT COUNT(1) AS count  FROM (` + sql + `) d`
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -279,7 +279,7 @@ func GetReportListCount(condition string, pars []interface{}) (count int, err er
 		sql += condition
 	}
 	//err = oRddp.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -1116,7 +1116,7 @@ func GetCommentReportTotalByReportId(condition string, pars []interface{}) (tota
 		sql += condition
 	}
 	//err = o.Raw(sql, pars).QueryRow(&total)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&total).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&total).Error
 	return
 }
 
@@ -1235,7 +1235,7 @@ func GetPageReportList(condition string, pars []interface{}, startSize, pageSize
 	sql += ` ORDER BY modify_time DESC`
 	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z `
 	//err = o.Raw(totalSql, pars).QueryRow(&total)
-	err = global.DmSQL["rddp"].Raw(totalSql, pars).Scan(&total).Error
+	err = global.DmSQL["rddp"].Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}
@@ -1353,7 +1353,7 @@ func ModifyReportAuthor(condition string, pars []interface{}, authorName string)
 		sql += condition
 	}
 	//err = oRddp.Raw(sql, authorName, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, authorName, pars).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sql, utils.ForwardPars(pars, authorName)).Scan(&count).Error
 	return
 }
 
@@ -1426,7 +1426,7 @@ func GetReportByCondition(condition string, pars []interface{}, fieldArr []strin
 		err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	} else {
 		//_, err = o.Raw(sql, pars).QueryRows(&items)
-		err = global.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
+		err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	}
 	return
 }

models/system/sys_user.go

@@ -141,7 +141,7 @@ func (item *Admin) GetCountByCondition(condition string, pars []interface{}) (co
 	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM "admin" WHERE 1=1 %s`, condition)
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -157,7 +157,7 @@ func (item *Admin) GetItemsByCondition(condition string, pars []interface{}, fie
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM "admin" WHERE 1=1 %s %s`, fields, condition, order)
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/target.go

@@ -229,7 +229,7 @@ func GetEdbinfoListCount(condition string, pars []interface{}, mobile string, ro
 			sql += condition
 		}
 		//err = o.Raw(sql, mobile, pars).QueryRow(&count)
-		err = global.DmSQL["edb"].Raw(sql, mobile, pars).Scan(&count).Error
+		err = global.DmSQL["edb"].Raw(sql, utils.ForwardPars(pars, mobile)).Scan(&count).Error
 	} else {
 		sql = `SELECT COUNT(1) AS count FROM edbinfo AS a WHERE a.classify_id>0`
 
@@ -421,7 +421,7 @@ func SearchTargetEntry(classifyId int, keyWord string) (items []*Edbinfo, err er
 	sql += where
 	//o := orm.NewOrmUsingDB("edb")
 	//_, err = o.Raw(sql, pars...).QueryRows(&items)
-	err = global.DmSQL["edb"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["edb"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -647,7 +647,7 @@ func GetDataListForExport(startDate, endDate, frequency, keyWord string, classif
 	sql = sql + " ORDER BY c.DT DESC "
 	//o := orm.NewOrmUsingDB("edb")
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DmSQL["edb"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["edb"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -1115,7 +1115,7 @@ func GetEdbdataSecName(condition string, pars []interface{}) (items []*EdbdataEx
 	sql += " GROUP BY a.TRADE_CODE ORDER BY a.TRADE_CODE ASC "
 	//o := orm.NewOrmUsingDB("edb")
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DmSQL["edb"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["edb"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -1419,7 +1419,7 @@ left join edbdata b on a.TRADE_CODE=b.TRADE_CODE `
 
 	sql = sql + ` ORDER BY CONVERT(a.SEC_NAME USING gbk )  COLLATE gbk_chinese_ci ASC `
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DmSQL["edb"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["edb"].Raw(sql, pars...).Find(&items).Error
 	return
 
 }

utils/common.go

@@ -2663,3 +2663,27 @@ func GetDuration(filePath string) (duration string, err error) {
 
 	return duration, nil
 }
+
+// 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...)
+}
+
+// AppendPars
+// @Description: 向后插入参数
+// @param pars
+// @param values
+// @return []interface{}
+func AppendPars(pars []interface{}, values ...interface{}) []interface{} {
+	if len(values) <= 0 {
+		return pars
+	}
+	return append(pars, values...)
+}