Roc hai 2 meses
pai
achega
519bb34391
Modificáronse 76 ficheiros con 122 adicións e 4 borrados
  1. 2 0
      models/base_from_adjust.go
  2. 2 0
      models/base_from_bloomberg.go
  3. 1 0
      models/base_from_calculate.go
  4. 2 0
      models/base_from_ccf.go
  5. 2 0
      models/base_from_cffex.go
  6. 2 0
      models/base_from_coal.go
  7. 2 0
      models/base_from_com_trade.go
  8. 2 0
      models/base_from_dl.go
  9. 11 1
      models/base_from_eia_steo.go
  10. 2 0
      models/base_from_fenwei.go
  11. 1 0
      models/base_from_fubao.go
  12. 2 0
      models/base_from_gie.go
  13. 1 0
      models/base_from_google_travel.go
  14. 1 0
      models/base_from_gz.go
  15. 2 0
      models/base_from_jiayue.go
  16. 2 0
      models/base_from_lt.go
  17. 2 0
      models/base_from_lz.go
  18. 2 0
      models/base_from_manual.go
  19. 2 0
      models/base_from_mtjh.go
  20. 2 0
      models/base_from_mysteel.go
  21. 2 0
      models/base_from_mysteel_chemical.go
  22. 1 0
      models/base_from_national_statistics.go
  23. 2 0
      models/base_from_pb.go
  24. 2 0
      models/base_from_python.go
  25. 2 0
      models/base_from_sci.go
  26. 2 0
      models/base_from_sci99.go
  27. 4 0
      models/base_from_shfe.go
  28. 2 0
      models/base_from_ths.go
  29. 2 0
      models/base_from_ths_ds.go
  30. 2 0
      models/base_from_wind.go
  31. 2 0
      models/base_from_wind_wsd.go
  32. 2 0
      models/base_from_yongyi.go
  33. 2 0
      models/base_from_zz.go
  34. 1 0
      models/base_predict_from_calculate.go
  35. 1 0
      models/edb_data_business.go
  36. 1 0
      models/edb_data_calculate_avg.go
  37. 1 0
      models/edb_data_calculate_bp.go
  38. 1 0
      models/edb_data_calculate_cjjx.go
  39. 1 0
      models/edb_data_calculate_correlation.go
  40. 1 0
      models/edb_data_calculate_hbz.go
  41. 1 0
      models/edb_data_calculate_hcz.go
  42. 1 0
      models/edb_data_calculate_jp.go
  43. 1 0
      models/edb_data_calculate_kszs.go
  44. 1 0
      models/edb_data_calculate_ljz.go
  45. 1 0
      models/edb_data_calculate_ljznczj.go
  46. 1 0
      models/edb_data_calculate_ljzzj.go
  47. 1 0
      models/edb_data_calculate_nh.go
  48. 1 0
      models/edb_data_calculate_nszydbpjjs.go
  49. 1 0
      models/edb_data_calculate_percentile.go
  50. 1 0
      models/edb_data_calculate_rjz.go
  51. 1 0
      models/edb_data_calculate_standard_deviation.go
  52. 1 0
      models/edb_data_calculate_sum.go
  53. 1 0
      models/edb_data_calculate_tbz.go
  54. 1 0
      models/edb_data_calculate_tcz.go
  55. 1 0
      models/edb_data_calculate_time_shift.go
  56. 1 0
      models/edb_data_calculate_zdyfx.go
  57. 1 0
      models/edb_data_calculate_zsxy.go
  58. 1 1
      models/edb_info.go
  59. 1 0
      models/predict_edb_data_base.go
  60. 1 0
      models/predict_edb_data_calculate_bp.go
  61. 2 0
      models/predict_edb_data_calculate_cjjx.go
  62. 1 0
      models/predict_edb_data_calculate_hbz.go
  63. 1 0
      models/predict_edb_data_calculate_hcz.go
  64. 1 0
      models/predict_edb_data_calculate_jp.go
  65. 1 0
      models/predict_edb_data_calculate_kszs.go
  66. 2 0
      models/predict_edb_data_calculate_ljz.go
  67. 1 0
      models/predict_edb_data_calculate_ljznczj.go
  68. 2 0
      models/predict_edb_data_calculate_ljzzj.go
  69. 2 0
      models/predict_edb_data_calculate_ljzzy.go
  70. 1 0
      models/predict_edb_data_calculate_nszydbpjjs.go
  71. 1 0
      models/predict_edb_data_calculate_percentile.go
  72. 1 0
      models/predict_edb_data_calculate_standard_deviation.go
  73. 1 0
      models/predict_edb_data_calculate_tbz.go
  74. 2 0
      models/predict_edb_data_calculate_tcz.go
  75. 1 0
      models/predict_edb_data_calculate_time_shift.go
  76. 3 2
      utils/sql.go

+ 2 - 0
models/base_from_adjust.go

@@ -232,6 +232,7 @@ func SaveAdjustEdb(req SaveAdjustEdbReq) (edbInfo *EdbInfo, err error, errMsg st
 	var isAdd bool
 	dataTableName := GetEdbDataTableName(edbInfo.Source, edbInfo.SubSource)
 	addSql := ` INSERT INTO ` + dataTableName + `(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	for _, item := range dataObj {
 		//值
 		val := item.Value
@@ -310,6 +311,7 @@ func RefreshAllAdjustEdb(edbInfo *EdbInfo, fromEdbInfo *EdbInfo) (err error) {
 
 	var isAdd bool
 	addSql := ` INSERT INTO ` + dataTableName + `(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	for _, item := range dataList {
 		currDay := item.DataTime
 		//值

+ 2 - 0
models/base_from_bloomberg.go

@@ -204,6 +204,7 @@ func AddEdbDataFromBloomberg(edbCode string) (err error) {
 	if dataLen > 0 {
 		var isAdd bool
 		addSql := ` INSERT INTO edb_data_bloomberg (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+		addSql = utils.ReplaceDriverKeywords("", addSql)
 		for i := 0; i < dataLen; i++ {
 			item := bloombergDataList[i]
 			eDate := item.DataTime
@@ -298,6 +299,7 @@ func RefreshEdbDataFromBloomberg(edbInfoId int, edbCode, startDate string) (err
 	}
 
 	addSql := ` INSERT INTO edb_data_bloomberg(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	addMap := make(map[string]string)
 	for _, v := range bloombergDataList {

+ 1 - 0
models/base_from_calculate.go

@@ -409,6 +409,7 @@ func refreshAllCalculate(to *gorm.DB, edbInfoIdArr []*EdbInfo, edbInfoTag map[st
 		return
 	}
 	addSql := ` INSERT INTO edb_data_calculate(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 
 	//获取指标所有数据

+ 2 - 0
models/base_from_ccf.go

@@ -62,6 +62,7 @@ func (obj BaseFromCCF) Add(edbCode string) (err error) {
 	}
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_ccf(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	existMap := make(map[string]string)
 	for _, sv := range ccfBaseDataAll {
 		eDate := sv.DataTime
@@ -149,6 +150,7 @@ func (obj BaseFromCCF) Refresh(edbInfoId int, edbCode, startDate string) (err er
 		existMap[v.DataTime] = v
 	}
 	addSql := ` INSERT INTO edb_data_ccf(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	for _, v := range ccfDataList {
 		item := v

+ 2 - 0
models/base_from_cffex.go

@@ -91,6 +91,7 @@ func AddEdbDataFromCffex(edbCode string) (err error) {
 	}
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_cffex(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	existMap := make(map[string]string)
 
 	for _, sv := range cffexBaseDataAll {
@@ -211,6 +212,7 @@ func RefreshEdbDataFromCffex(edbInfoId int, edbCode, startDate string) (err erro
 	}
 
 	addSql := ` INSERT INTO edb_data_cffex(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	for _, v := range glDataList {
 		var value string

+ 2 - 0
models/base_from_coal.go

@@ -70,6 +70,7 @@ func AddEdbDataFromCoal(edbCode string) (err error) {
 
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_coal(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	existMap := make(map[string]string)
 	for _, sv := range coalBaseDataAll {
 		eDate := sv.DataTime
@@ -214,6 +215,7 @@ func RefreshEdbDataFromCoal(edbInfoId int, edbCode, startDate string) (err error
 	}
 
 	addSql := ` INSERT INTO edb_data_coal(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	for _, v := range glDataList {
 		var value string

+ 2 - 0
models/base_from_com_trade.go

@@ -98,6 +98,7 @@ func AddEdbDataFromComTrade(edbCode string) (err error) {
 	if dataLen > 0 {
 		var isAdd bool
 		addSql := ` INSERT INTO edb_data_com_trade (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+		addSql = utils.ReplaceDriverKeywords("", addSql)
 		for i := 0; i < dataLen; i++ {
 			item := ComTradeDataList[i]
 			eDate := item.DataTime
@@ -190,6 +191,7 @@ func RefreshEdbDataFromComTrade(edbInfoId int, edbCode, startDate string) (err e
 	}
 
 	addSql := ` INSERT INTO edb_data_com_trade(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	addMap := make(map[string]string)
 	for _, v := range ComTradeDataList {

+ 2 - 0
models/base_from_dl.go

@@ -88,6 +88,7 @@ func AddEdbDataFromDl(edbCode string) (err error) {
 
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_dl(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	existMap := make(map[string]string)
 
 	for _, sv := range dlBaseDataAll {
@@ -207,6 +208,7 @@ func RefreshEdbDataFromDl(edbInfoId int, edbCode, startDate string) (err error)
 	}
 
 	addSql := ` INSERT INTO edb_data_dl(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	for _, v := range glDataList {
 		var value string

+ 11 - 1
models/base_from_eia_steo.go

@@ -4,6 +4,7 @@ import (
 	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
+	"gorm.io/gorm"
 	"strconv"
 	"strings"
 	"time"
@@ -12,10 +13,17 @@ import (
 //钢联
 
 type EiaSteoData struct {
-	InputValue float64 `orm:"column(value)" description:"值"`
+	InputValue float64 `gorm:"column(value)" description:"值"`
 	DataTime   string  `orm:"column(data_time)" description:"日期"`
 }
 
+// AfterFind 在该模型上设置钩子函数,把日期转成正确的string,所以查询函数只能用Find函数,First或者Scan是不会触发该函数的来获取数据
+func (m *EiaSteoData) AfterFind(db *gorm.DB) (err error) {
+	m.DataTime = utils.GormDateStrToDateStr(m.DataTime)
+
+	return
+}
+
 func GetEiaSteoDataByCondition(condition string, pars []interface{}) (item []*EiaSteoData, err error) {
 	sql1 := ` SELECT * FROM base_from_eia_steo_data WHERE 1=1  `
 	//o := orm.NewOrm()
@@ -51,6 +59,7 @@ func AddEdbDataFromEiaSteo(edbCode string) (err error) {
 	if dataLen > 0 {
 		var isAdd bool
 		addSql := ` INSERT INTO edb_data_eia_steo (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+		addSql = utils.ReplaceDriverKeywords("", addSql)
 		for i := 0; i < dataLen; i++ {
 			item := EiaSteoDataList[i]
 			eDate := item.DataTime
@@ -145,6 +154,7 @@ func RefreshEdbDataFromEiaSteo(edbInfoId int, edbCode, startDate string) (err er
 	}
 
 	addSql := ` INSERT INTO edb_data_eia_steo(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	addMap := make(map[string]string)
 	for _, v := range EiaSteoDataList {

+ 2 - 0
models/base_from_fenwei.go

@@ -62,6 +62,7 @@ func (obj BaseFromFenwei) Add(edbCode string) (err error) {
 	}
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_fenwei(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	existMap := make(map[string]string)
 	for _, sv := range fenweiBaseDataAll {
 		eDate := sv.DataTime
@@ -149,6 +150,7 @@ func (obj BaseFromFenwei) Refresh(edbInfoId int, edbCode, startDate string) (err
 		existMap[v.DataTime] = v
 	}
 	addSql := ` INSERT INTO edb_data_fenwei(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	for _, v := range fenweiDataList {
 		item := v

+ 1 - 0
models/base_from_fubao.go

@@ -31,6 +31,7 @@ func AddEdbDataFromFubao(edbCode string, fubaoData *FuBaoData) (err error) {
 	//o := orm.NewOrm()
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_fubao(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	for _, dataItem := range fubaoData.ReturnValue.Data {
 		dataTime, err := time.ParseInLocation(utils.FormatDate, dataItem.Datadate, time.Local)
 		if err != nil {

+ 2 - 0
models/base_from_gie.go

@@ -170,6 +170,7 @@ func AddEdbDataFromGie(edbCode string) (err error) {
 
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_gie(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	existMap := make(map[string]string)
 
 	for _, sv := range eicBaseDataAll {
@@ -329,6 +330,7 @@ func RefreshEdbDataFromGie(edbInfoId int, edbCode, startDate string) (err error)
 	}
 
 	addSql := ` INSERT INTO edb_data_gie(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	dataMap := make(map[string]interface{})
 	for _, v := range eicDataList {

+ 1 - 0
models/base_from_google_travel.go

@@ -58,6 +58,7 @@ func AddEdbDataGoogleTravel(edbCode string) (err error) {
 
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_google_travel(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 
 	for _, sv := range dataAll {
 		eDate := sv.Day

+ 1 - 0
models/base_from_gz.go

@@ -66,6 +66,7 @@ func AddEdbDataFromGz(edbCode string) (err error) {
 
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_gz(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	existMap := make(map[string]string)
 
 	for _, sv := range dataAll {

+ 2 - 0
models/base_from_jiayue.go

@@ -95,6 +95,7 @@ func AddEdbDataFromJiaYue(tableName, edbCode string, dataList []BridgeJiaYueInde
 	}
 
 	sql := fmt.Sprintf(`INSERT INTO %s(edb_info_id, edb_code, data_time, value, create_time, modify_time, data_timestamp) VALUES `, tableName)
+	sql = utils.ReplaceDriverKeywords("", sql)
 	for _, v := range dataList {
 		val := utils.SubFloatToString(v.Val, 20)
 		stamp := fmt.Sprint(v.DataTime.UnixMilli())
@@ -167,6 +168,7 @@ func RefreshEdbDataFromJiaYue(source, subSource, edbInfoId int, tableName, edbCo
 	strEdbInfoId := strconv.Itoa(edbInfoId)
 	addExists := make(map[string]bool)
 	sqlInsert := fmt.Sprintf(`INSERT INTO %s(edb_info_id, edb_code, data_time, value, create_time, modify_time, data_timestamp) VALUES `, tableName)
+	sqlInsert = utils.ReplaceDriverKeywords("", sqlInsert)
 	for _, v := range dataList {
 		val := utils.SubFloatToString(v.Val, 30)
 		stamp := fmt.Sprint(v.DataTime.UnixMilli())

+ 2 - 0
models/base_from_lt.go

@@ -18,6 +18,7 @@ func AddEdbDataFromLt(edbCode string, ltDataList map[int64]interface{}) (err err
 	if len(ltDataList) > 0 {
 		var isAdd bool
 		addSql := ` INSERT INTO edb_data_lt(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+		addSql = utils.ReplaceDriverKeywords("", addSql)
 		for timestampInt, edbValue := range ltDataList {
 			dataTime := time.Unix(timestampInt/1000, 0)
 
@@ -96,6 +97,7 @@ func RefreshEdbDataFromLt(edbInfoId int, edbCode, startDate string, ltDataList m
 	edbInfoIdStr := strconv.Itoa(edbInfoId)
 
 	addSql := ` INSERT INTO edb_data_lt(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 
 	for timestampInt, edbValue := range ltDataList {

+ 2 - 0
models/base_from_lz.go

@@ -51,6 +51,7 @@ func AddEdbDataFromLz(edbCode string) (err error) {
 	if dataLen > 0 {
 		var isAdd bool
 		addSql := ` INSERT INTO edb_data_lz(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+		addSql = utils.ReplaceDriverKeywords("", addSql)
 		for i := 0; i < dataLen; i++ {
 			item := lzDataList[i]
 			eDate := item.DataTime
@@ -134,6 +135,7 @@ func RefreshEdbDataFromLz(edbInfoId int, edbCode, startDate string) (err error)
 		existMap[v.DataTime] = v
 	}
 	addSql := ` INSERT INTO edb_data_lz(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	for _, v := range lzDataList {
 		item := v

+ 2 - 0
models/base_from_manual.go

@@ -55,6 +55,7 @@ func AddEdbDataFromManual(edbCode string) (err error) {
 	if dataLen > 0 {
 		var isAdd bool
 		addSql := ` INSERT INTO edb_data_manual(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+		addSql = utils.ReplaceDriverKeywords("", addSql)
 		for i := 0; i < dataLen; i++ {
 			item := manualDataList[i]
 			eDate := item.Dt
@@ -154,6 +155,7 @@ func RefreshEdbDataFromManual(edbInfoId int, edbCode, startDate string) (err err
 	}
 
 	addSql := ` INSERT INTO edb_data_manual (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	manualMap := make(map[string]*ManualEdbdata)
 	//fmt.Println("manualDataList:", len(manualDataList))

+ 2 - 0
models/base_from_mtjh.go

@@ -118,6 +118,7 @@ func AddEdbDataFromMtjh(edbCode string) (err error) {
 
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_mtjh(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	existMap := make(map[string]string)
 	for _, sv := range coalBaseDataAll {
 		eDate := sv.DataTime
@@ -221,6 +222,7 @@ func RefreshEdbDataFromMtjh(edbInfoId int, edbCode, startDate string) (err error
 	}
 
 	addSql := ` INSERT INTO edb_data_mtjh(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	for _, v := range glDataList {
 		var value string

+ 2 - 0
models/base_from_mysteel.go

@@ -65,6 +65,7 @@ func AddEdbDataFromMysteel(edbCode string) (err error) {
 	if dataLen > 0 {
 		var isAdd bool
 		addSql := ` INSERT INTO edb_data_gl(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+		addSql = utils.ReplaceDriverKeywords("", addSql)
 		for i := 0; i < dataLen; i++ {
 			item := glDataList[i]
 			eDate := item.DataTime
@@ -159,6 +160,7 @@ func RefreshEdbDataFromMysteel(edbInfoId int, edbCode, startDate string) (err er
 	}
 
 	addSql := ` INSERT INTO edb_data_gl(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	addMap := make(map[string]string)
 	for _, v := range glDataList {

+ 2 - 0
models/base_from_mysteel_chemical.go

@@ -52,6 +52,7 @@ func AddEdbDataFromMysteelChemical(edbCode string) (err error) {
 	if dataLen > 0 {
 		var isAdd bool
 		addSql := ` INSERT INTO edb_data_mysteel_chemical (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+		addSql = utils.ReplaceDriverKeywords("", addSql)
 		for i := 0; i < dataLen; i++ {
 			item := mysteelChemicalDataList[i]
 			eDate := item.DataTime
@@ -146,6 +147,7 @@ func RefreshEdbDataFromMysteelChemical(edbInfoId int, edbCode, startDate string)
 	}
 
 	addSql := ` INSERT INTO edb_data_mysteel_chemical(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	addMap := make(map[string]string)
 	for _, v := range mysteelChemicalDataList {

+ 1 - 0
models/base_from_national_statistics.go

@@ -50,6 +50,7 @@ func AddEdbDataFromNationalStatistics(edbCode string) (err error) {
 	}
 	var isAdd bool
 	addSql := `INSERT INTO edb_data_national_statistics(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	existMap := make(map[string]string)
 	for _, sv := range dataList {
 		eDate := sv.DataTime

+ 2 - 0
models/base_from_pb.go

@@ -22,6 +22,7 @@ func AddEdbDataFromPb(edbCode string, item *EdbDataFromPb) (err error) {
 		var isAdd bool
 		dateMap := item.Date
 		addSql := ` INSERT INTO edb_data_pb(edb_info_id,edb_code,data_time,value,create_time,modify_time,ticker,field,data_timestamp) values `
+		addSql = utils.ReplaceDriverKeywords("", addSql)
 		nowStr := time.Now().Format(utils.FormatDateTime)
 		for k, v := range dateMap {
 			timeStr := fmt.Sprintf("%d", v)
@@ -102,6 +103,7 @@ func RefreshEdbDataFromPb(edbInfoId int, edbCode, startDate string, item *EdbDat
 		dateMap := item.Date
 		var isAdd bool
 		addSql := ` INSERT INTO edb_data_pb(edb_info_id,edb_code,data_time,value,create_time,modify_time,ticker,field,data_timestamp) values `
+		addSql = utils.ReplaceDriverKeywords("", addSql)
 		nowStr := time.Now().Format(utils.FormatDateTime)
 		for k, v := range dateMap {
 			timeStr := fmt.Sprintf("%d", v)

+ 2 - 0
models/base_from_python.go

@@ -65,6 +65,7 @@ func AddPythonEdb(edbInfo *EdbInfo, item EdbDataFromPython, edbInfoList []*EdbIn
 
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_python (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	for k, dateTimeStr := range item.Date {
 		//格式化时间
 		currentDate, tmpErr := time.ParseInLocation(utils.FormatDate, dateTimeStr, time.Local)
@@ -99,6 +100,7 @@ func EditPythonEdb(edbInfoId int, edbCode string, item EdbDataFromPython) (err e
 	//o := orm.NewOrm()
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_python (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	for k, dateTimeStr := range item.Date {
 		//格式化时间
 		currentDate, tmpErr := time.ParseInLocation(utils.FormatDate, dateTimeStr, time.Local)

+ 2 - 0
models/base_from_sci.go

@@ -80,6 +80,7 @@ func AddEdbDataFromSci(edbCode string) (err error) {
 	}
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_sci(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	existMap := make(map[string]string)
 	for _, sv := range sciBaseDataAll {
 		eDate := sv.DataTime
@@ -169,6 +170,7 @@ func RefreshEdbDataFromSci(edbInfoId int, edbCode, startDate string) (err error)
 		existMap[v.DataTime] = v
 	}
 	addSql := ` INSERT INTO edb_data_sci(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	for _, v := range sciDataList {
 		item := v

+ 2 - 0
models/base_from_sci99.go

@@ -135,6 +135,7 @@ func AddEdbDataFromSci99(edbCode string) (err error) {
 
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_sci99(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	existMap := make(map[string]string)
 
 	for _, sv := range dataAll {
@@ -227,6 +228,7 @@ func RefreshEdbDataFromSci99(edbInfoId int, edbCode, startDate string) (err erro
 	}
 
 	addSql := ` INSERT INTO edb_data_sci99(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	for _, v := range dataList {
 		item := v

+ 4 - 0
models/base_from_shfe.go

@@ -88,6 +88,7 @@ func AddEdbDataFromShfe(edbCode string) (err error) {
 
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_ine(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	existMap := make(map[string]string)
 
 	for _, sv := range ineBaseDataAll {
@@ -341,6 +342,8 @@ func ModifyBaseFromTradeIneIndex(dealValue, buyValue, soldValue int, dataId int)
 func GetIndexCodeFromMapping(exchange string) (list []*BaseFromTradeMapping, err error) {
 	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_trade_mapping where exchange=?`
+	sql = utils.ReplaceDriverKeywords("", sql)
+
 	//_, err = o.Raw(sql, exchange).QueryRows(&list)
 	err = global.DEFAULT_DB.Raw(sql, exchange).Find(&list).Error
 	return
@@ -349,6 +352,7 @@ func GetIndexCodeFromMapping(exchange string) (list []*BaseFromTradeMapping, err
 func AddBaseFromTradeMapping(indexName, indexCode, exchange string) (err error) {
 	//o := orm.NewOrm()
 	sql := "Insert Into base_from_trade_mapping(index_name,index_code,exchange) Values('" + indexName + "','" + indexCode + "','" + exchange + "')"
+	sql = utils.ReplaceDriverKeywords("", sql)
 	//_, err = o.Raw(sql).Exec()
 	err = global.DEFAULT_DB.Exec(sql).Error
 	return

+ 2 - 0
models/base_from_ths.go

@@ -34,6 +34,7 @@ func AddEdbDataFromThs(edbCode string, item EdbDataFromThs) (err error) {
 
 		var isAdd bool
 		addSql := ` INSERT INTO %s(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+		addSql = utils.ReplaceDriverKeywords("", addSql)
 		tableName := GetEdbDataTableName(utils.DATA_SOURCE_THS, utils.DATA_SUB_SOURCE_EDB)
 		addSql = fmt.Sprintf(addSql, tableName)
 
@@ -105,6 +106,7 @@ func RefreshEdbDataFromThs(edbInfoId int, edbCode, startDate string, item EdbDat
 		table := item.Tables[0]
 		dataLen := len(table.Time)
 		addSql := ` INSERT INTO edb_data_ths(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+		addSql = utils.ReplaceDriverKeywords("", addSql)
 		var isAdd bool
 		addMap := make(map[string]string)
 		edbInfoIdStr := strconv.Itoa(edbInfoId)

+ 2 - 0
models/base_from_ths_ds.go

@@ -20,6 +20,7 @@ func AddEdbDataFromThsDs(stockCode, edbCode string, item EdbDataFromThs) (err er
 	if len(item.Tables) > 0 {
 		var isAdd bool
 		addSql := ` INSERT INTO edb_data_ths_ds(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+		addSql = utils.ReplaceDriverKeywords("", addSql)
 		for k, table := range item.Tables {
 			dataLen := len(table.Value)
 			for i := 0; i < dataLen; i++ {
@@ -115,6 +116,7 @@ func RefreshEdbDataFromThsDs(edbInfoId int, edbCode, startDate string, item EdbD
 		table := item.Tables[0]
 		dataLen := len(table.Time)
 		addSql := ` INSERT INTO edb_data_ths_ds(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+		addSql = utils.ReplaceDriverKeywords("", addSql)
 		var isAdd bool
 		addMap := make(map[string]string)
 		edbInfoIdStr := strconv.Itoa(edbInfoId)

+ 2 - 0
models/base_from_wind.go

@@ -21,6 +21,7 @@ func AddEdbDataFromWind(edbCode string, item *EdbDataFromWind) (err error) {
 
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_wind(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	for k, v := range item.Dt {
 		//timeStr := fmt.Sprintf("%d", v)
 		v = v / 1000
@@ -87,6 +88,7 @@ func RefreshEdbDataFromWind(edbInfoId int, edbCode, startDate string, item *EdbD
 		existMap[v.DataTime] = v
 	}
 	addSql := ` INSERT INTO edb_data_wind(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	addMap := make(map[string]string)
 	edbInfoIdStr := strconv.Itoa(edbInfoId)

+ 2 - 0
models/base_from_wind_wsd.go

@@ -17,6 +17,7 @@ func AddEdbDataFromWindWsd(stockCode string, item map[string]map[string]interfac
 
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_wind_wsd(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 
 	indexCodeMap := make(map[string]string)
 	for wk, wv := range item {
@@ -142,6 +143,7 @@ func RefreshEdbDataFromWindWsd(edbInfoId int, edbCode, startDate string, item ma
 		existMap[v.DataTime] = v
 	}
 	addSql := ` INSERT INTO edb_data_wind_wsd(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	addMap := make(map[string]string)
 	edbInfoIdStr := strconv.Itoa(edbInfoId)

+ 2 - 0
models/base_from_yongyi.go

@@ -58,6 +58,7 @@ func (obj BaseFromYongyi) Add(edbCode string) (err error) {
 	}
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_yongyi(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	existMap := make(map[string]string)
 	for _, sv := range yongyiBaseDataAll {
 		eDate := sv.DataTime
@@ -145,6 +146,7 @@ func (obj BaseFromYongyi) Refresh(edbInfoId int, edbCode, startDate string) (err
 		existMap[v.DataTime] = v
 	}
 	addSql := ` INSERT INTO edb_data_yongyi(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	for _, v := range yongyiDataList {
 		item := v

+ 2 - 0
models/base_from_zz.go

@@ -89,6 +89,7 @@ func AddEdbDataFromZz(edbCode string) (err error) {
 
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_zz(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	existMap := make(map[string]string)
 	for _, sv := range zzBaseDataAll {
 		eDate := sv.DataTime
@@ -207,6 +208,7 @@ func RefreshEdbDataFromZz(edbInfoId int, edbCode, startDate string) (err error)
 	}
 
 	addSql := ` INSERT INTO edb_data_zz(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	for _, v := range glDataList {
 		var value string

+ 1 - 0
models/base_predict_from_calculate.go

@@ -395,6 +395,7 @@ func refreshAllPredictCalculate(to *gorm.DB, edbInfoIdList []*EdbInfo, edbInfoTa
 		return
 	}
 	addSql := ` INSERT INTO edb_data_predict_calculate (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 
 	//获取指标所有数据

+ 1 - 0
models/edb_data_business.go

@@ -398,6 +398,7 @@ func (obj Business) refreshByMysql(to *gorm.DB, edbInfo *EdbInfo, startDate stri
 
 	// 待添加的数据集
 	addSql := ` INSERT INTO ` + dataTableName + ` (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	// 待更新的数据集
 	updateDataList := make([]*EdbInfoSearchData, 0)

+ 1 - 0
models/edb_data_calculate_avg.go

@@ -343,6 +343,7 @@ func (obj CalculateAvg) refresh(to *gorm.DB, edbInfoId, source, subSource int, e
 	HandleDateSaveDataMap(dateList, maxStartDate, minLatestDate, realSaveDataMap, saveDataMap, edbInfoIdArr, emptyType)
 
 	addSql := ` INSERT INTO ` + tableName + ` (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 
 	dataTableName := GetEdbDataTableName(source, subSource)

+ 1 - 0
models/edb_data_calculate_bp.go

@@ -227,6 +227,7 @@ func refreshAllCalculateBp(to *gorm.DB, edbInfoId, source, subSource int, fromEd
 	existDataMap := make(map[string]*EdbData, 0)
 	removeDateMap := make(map[string]struct{})
 	addSql := ` INSERT INTO edb_data_calculate_bp(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	//待删除的日期
 	removeDateList := make([]string, 0)

+ 1 - 0
models/edb_data_calculate_cjjx.go

@@ -253,6 +253,7 @@ func refreshAllCalculateCjjx(to *gorm.DB, edbInfoId, source, subSource int, from
 	}
 
 	addSql := ` INSERT INTO edb_data_calculate_cjjx(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	//日度/周度/季度/月度
 	//isCompatibility := false //是否向上下兼容35天

+ 1 - 0
models/edb_data_calculate_correlation.go

@@ -301,6 +301,7 @@ func refreshAllCalculateCorrelation(to *gorm.DB, edbInfoId, source, subSource in
 	correlationChartDataMap, err := GetRollingCorrelationChartDataByEdbInfo(edbInfoA, edbInfoB, correlationConf.LeadValue, correlationConf.LeadUnit, correlationConf.CalculateValue, correlationConf.CalculateUnit, startDate, endDate)
 
 	addSql := ` INSERT INTO ` + tableName + ` (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 
 	for currDateStr, val := range correlationChartDataMap {

+ 1 - 0
models/edb_data_calculate_hbz.go

@@ -225,6 +225,7 @@ func refreshAllCalculateHbz(to *gorm.DB, edbInfoId, source, subSource int, fromE
 		removeDateMap[v.DataTime] = true
 	}
 	addSql := ` INSERT INTO edb_data_calculate_hbz(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	existMap := make(map[string]string)
 	dataLen := len(dataList)

+ 1 - 0
models/edb_data_calculate_hcz.go

@@ -226,6 +226,7 @@ func refreshAllCalculateHcz(to *gorm.DB, edbInfoId, source, subSource int, fromE
 	}
 	//fmt.Println("existDataMap:", existDataMap)
 	addSql := ` INSERT INTO edb_data_calculate_hcz(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	existMap := make(map[string]string)
 	dataLen := len(dataList)

+ 1 - 0
models/edb_data_calculate_jp.go

@@ -261,6 +261,7 @@ func refreshAllCalculateJp(to *gorm.DB, edbInfoId, source, subSource int, fromEd
 
 	tableName := GetEdbDataTableName(utils.DATA_SOURCE_CALCULATE_JP, subSource)
 	addSql := ` INSERT INTO ` + tableName + ` (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 
 	//existMap := make(map[string]string)

+ 1 - 0
models/edb_data_calculate_kszs.go

@@ -289,6 +289,7 @@ func refreshAllCalculateKszs(to *gorm.DB, edbInfoId, source, subSource int, rela
 	}
 
 	addSql := ` INSERT INTO ` + tableName + ` (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 
 	for currDate := startDate.AddDate(0, 0, 1); !currDate.After(endDate); currDate = currDate.AddDate(0, 0, 1) {

+ 1 - 0
models/edb_data_calculate_ljz.go

@@ -647,6 +647,7 @@ func (obj Ljz) refresh(to *gorm.DB, edbInfoId, source, subSource int, edbInfo, f
 	needAddDateMap := make(map[time.Time]int)
 
 	addSql := ` INSERT INTO ` + dataTableName + `(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	for _, currTime := range dateList {
 		currDateStr := currTime.Format(utils.FormatDate)

+ 1 - 0
models/edb_data_calculate_ljznczj.go

@@ -374,6 +374,7 @@ func (obj LjzNczj) refresh(to *gorm.DB, edbInfoId, source, subSource int, edbInf
 	needAddDateMap := make(map[time.Time]int)
 
 	addSql := ` INSERT INTO ` + dataTableName + `(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	for _, currTime := range dateList {
 		currDateStr := currTime.Format(utils.FormatDate)

+ 1 - 0
models/edb_data_calculate_ljzzj.go

@@ -263,6 +263,7 @@ func (obj Ljzzj) refresh(to *gorm.DB, edbInfoId, source, subSource int, fromEdbI
 	}
 
 	addSql := ` INSERT INTO ` + dataTableName + `(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 
 	//获取指标所有数据

+ 1 - 0
models/edb_data_calculate_nh.go

@@ -252,6 +252,7 @@ func refreshAllCalculateNh(to *gorm.DB, edbInfoId, source, subSource int, fromEd
 	}
 
 	addSql := ` INSERT INTO ` + tableName + ` (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	//来源指指标数据
 	for _, v := range fromDataList {

+ 1 - 0
models/edb_data_calculate_nszydbpjjs.go

@@ -237,6 +237,7 @@ func refreshAllCalculateNszydpjjs(to *gorm.DB, edbInfoId, source, subSource, for
 	}
 
 	addSql := ` INSERT INTO edb_data_calculate_nszydpjjs(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	dataTableName := GetEdbDataTableName(source, subSource)
 	arrLen := len(fromDateArr)

+ 1 - 0
models/edb_data_calculate_percentile.go

@@ -265,6 +265,7 @@ func (obj Percentile) refresh(to *gorm.DB, edbInfo, fromEdbInfo *EdbInfo, edbCod
 	needAddDateMap := make(map[time.Time]int)
 
 	addSql := ` INSERT INTO ` + dataTableName + `(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	for _, tmpData := range fromDataList {
 		currDateStr := tmpData.DataTime

+ 1 - 0
models/edb_data_calculate_rjz.go

@@ -225,6 +225,7 @@ func refreshAllCalculateRjz(to *gorm.DB, edbInfoId, source int, fromEdbInfo *Edb
 	}
 	fmt.Println("existDataMap:", existDataMap)
 	addSql := ` INSERT INTO edb_data_calculate_rjz(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	existAddDataMap := make(map[string]string)
 	for _, av := range dateArr {

+ 1 - 0
models/edb_data_calculate_standard_deviation.go

@@ -255,6 +255,7 @@ func (obj StandardDeviation) refresh(to *gorm.DB, edbInfo, fromEdbInfo *EdbInfo,
 	needAddDateMap := make(map[time.Time]int)
 
 	addSql := ` INSERT INTO ` + dataTableName + `(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	for _, tmpData := range fromDataList {
 		currDateStr := tmpData.DataTime

+ 1 - 0
models/edb_data_calculate_sum.go

@@ -354,6 +354,7 @@ func (obj CalculateSum) refresh(to *gorm.DB, edbInfoId, source, subSource int, e
 	HandleDateSaveDataMap(dateList, maxStartDate, minLatestDate, realSaveDataMap, saveDataMap, edbInfoIdArr, emptyType)
 
 	addSql := ` INSERT INTO ` + tableName + ` (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 
 	dataTableName := GetEdbDataTableName(source, subSource)

+ 1 - 0
models/edb_data_calculate_tbz.go

@@ -236,6 +236,7 @@ func refreshAllCalculateTbz(to *gorm.DB, edbInfoId, source, subSource int, fromE
 	//fmt.Println("existDataMap:", existDataMap)
 
 	addSql := ` INSERT INTO edb_data_calculate_tbz(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	existAddDataMap := make(map[string]string)
 

+ 1 - 0
models/edb_data_calculate_tcz.go

@@ -225,6 +225,7 @@ func refreshAllCalculateTcz(to *gorm.DB, edbInfoId, source, subSource int, fromE
 	}
 
 	addSql := ` INSERT INTO edb_data_calculate_tcz(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	existAddDataMap := make(map[string]string)
 	for _, av := range dateArr {

+ 1 - 0
models/edb_data_calculate_time_shift.go

@@ -259,6 +259,7 @@ func refreshAllCalculateTimeShift(to *gorm.DB, edbInfoId, source, subSource, for
 	}
 	fmt.Println("existDataMap:", existDataMap)
 	addSql := ` INSERT INTO edb_data_calculate_time_shift(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 
 	existMap := make(map[string]string)

+ 1 - 0
models/edb_data_calculate_zdyfx.go

@@ -208,6 +208,7 @@ func (obj CustomAnalysis) refresh(to *gorm.DB, edbInfo *EdbInfo, dateList []stri
 
 	var isAdd, isUpdate bool
 	addSql := ` INSERT INTO ` + dataTableName + `(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 
 	updateEdbDataStrList := make([]UpdateEdbDataStr, 0)
 	updateSql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `

+ 1 - 0
models/edb_data_calculate_zsxy.go

@@ -248,6 +248,7 @@ func (obj ExponentialSmoothing) refresh(to *gorm.DB, edbInfo, fromEdbInfo *EdbIn
 	needAddDateMap := make(map[time.Time]int)
 
 	addSql := ` INSERT INTO ` + dataTableName + `(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	for _, tmpData := range fromDataList {
 		currDateStr := tmpData.DataTime

+ 1 - 1
models/edb_info.go

@@ -162,7 +162,7 @@ type EdbInfoList struct {
 	IndicatorCode string `gorm:"column:indicator_code" description:"指标代码"`
 	StockCode     string `gorm:"column:stock_code" description:"证券代码"`
 	//Extra            string    `gorm:"column:extra" description:"指标的额外配置"`
-	DataList []*EdbData `gorm:"column:-" description:"实际指标数据"`
+	DataList []*EdbData `gorm:"-" description:"实际指标数据"`
 	//PredictDataList []*EdbData             `description:"预测指标数据"`
 	//Button          EdbClassifyItemsButton `description:"操作权限"`
 	//IsEnEdb         bool                   `description:"是否展示英文标识"`

+ 1 - 0
models/predict_edb_data_base.go

@@ -378,6 +378,7 @@ func (obj PredictStandardBase) refresh(to *gorm.DB, edbInfo *EdbInfo, predictEdb
 	needAddDateMap := make(map[time.Time]int)
 
 	addSql := ` INSERT INTO ` + dataTableName + `(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	for _, tmpData := range fromDataList {
 		currDateStr := tmpData.DataTime

+ 1 - 0
models/predict_edb_data_calculate_bp.go

@@ -204,6 +204,7 @@ func refreshAllPredictCalculateBp(to *gorm.DB, edbInfoId, source, subSource int,
 	existDataMap := make(map[string]*EdbData, 0)
 	removeDateMap := make(map[string]struct{})
 	addSql := ` INSERT INTO edb_data_predict_calculate_bp(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 
 	var isAdd bool
 	//待删除的日期

+ 2 - 0
models/predict_edb_data_calculate_cjjx.go

@@ -226,6 +226,7 @@ func refreshAllPredictCalculateCjjx(to *gorm.DB, edbInfoId, source, subSource in
 	}
 
 	addSql := ` INSERT INTO edb_data_predict_calculate_cjjx(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	//日度/周度/季度/月度
 	//isCompatibility := false //是否向上下兼容35天
@@ -360,6 +361,7 @@ func refreshAllPredictCalculateCjjx(to *gorm.DB, edbInfoId, source, subSource in
 	//确定最终值
 	var finalLast EdbInfoSearchData
 	sql := ` SELECT data_time , value FROM edb_data_predict_calculate_cjjx WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `
+	sql = utils.ReplaceDriverKeywords("", sql)
 	tmpErr := to.Raw(sql, edbInfoId, latestDateStr).First(&finalLast).Error
 	if tmpErr != nil {
 		if tmpErr.Error() != utils.ErrNoRow() {

+ 1 - 0
models/predict_edb_data_calculate_hbz.go

@@ -204,6 +204,7 @@ func refreshAllPredictCalculateHbz(to *gorm.DB, edbInfoId, source, subSource int
 		removeDateMap[v.DataTime] = true
 	}
 	addSql := ` INSERT INTO edb_data_predict_calculate_hbz(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	existMap := make(map[string]string)
 	dataLen := len(dataList)

+ 1 - 0
models/predict_edb_data_calculate_hcz.go

@@ -206,6 +206,7 @@ func refreshAllPredictCalculateHcz(to *gorm.DB, edbInfoId, source, subSource int
 	}
 	//fmt.Println("existDataMap:", existDataMap)
 	addSql := ` INSERT INTO edb_data_predict_calculate_hcz(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	existMap := make(map[string]string)
 	dataLen := len(dataList)

+ 1 - 0
models/predict_edb_data_calculate_jp.go

@@ -241,6 +241,7 @@ func refreshAllPredictCalculateJp(to *gorm.DB, edbInfoId, source, subSource int,
 
 	tableName := GetEdbDataTableName(utils.DATA_SOURCE_PREDICT_CALCULATE_JP, subSource)
 	addSql := ` INSERT INTO ` + tableName + ` (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 
 	//existMap := make(map[string]string)

+ 1 - 0
models/predict_edb_data_calculate_kszs.go

@@ -299,6 +299,7 @@ func refreshAllPredictCalculateKszs(to *gorm.DB, edbInfoId, source, subSource in
 	}
 
 	addSql := ` INSERT INTO ` + tableName + ` (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 
 	for currDate := startDate.AddDate(0, 0, 1); !currDate.After(endDate); currDate = currDate.AddDate(0, 0, 1) {

+ 2 - 0
models/predict_edb_data_calculate_ljz.go

@@ -522,6 +522,7 @@ func (obj PredictLjz) refresh(to *gorm.DB, edbInfoId, source, subSource int, edb
 	needAddDateMap := make(map[time.Time]int)
 
 	addSql := ` INSERT INTO ` + dataTableName + `(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	for _, currTime := range dateList {
 		currDateStr := currTime.Format(utils.FormatDate)
@@ -596,6 +597,7 @@ func (obj PredictLjz) refresh(to *gorm.DB, edbInfoId, source, subSource int, edb
 	{
 		var finalLast EdbInfoSearchData
 		sql := fmt.Sprintf(` SELECT data_time , value FROM %s WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `, dataTableName)
+		sql = utils.ReplaceDriverKeywords("", sql)
 		err = to.Raw(sql, edbInfoId, fromEdbInfo.LatestDate).First(&finalLast).Error
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			return

+ 1 - 0
models/predict_edb_data_calculate_ljznczj.go

@@ -446,6 +446,7 @@ func (obj PredictLjzNczj) refresh(to *gorm.DB, edbInfoId, source, subSource int,
 	{
 		var finalLast EdbInfoSearchData
 		sql := fmt.Sprintf(` SELECT data_time , value FROM %s WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `, dataTableName)
+		sql = utils.ReplaceDriverKeywords("", sql)
 		err = to.Raw(sql, edbInfoId, fromEdbInfo.LatestDate).First(&finalLast).Error
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			return

+ 2 - 0
models/predict_edb_data_calculate_ljzzj.go

@@ -264,6 +264,7 @@ func (obj PredictLjzzj) refresh(to *gorm.DB, edbInfoId, source, subSource int, f
 	}
 
 	addSql := ` INSERT INTO ` + dataTableName + `(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	//获取指标所有数据
 	existDataList, err := GetAllEdbDataListByTo(to, edbInfoId, source, subSource)
@@ -393,6 +394,7 @@ func (obj PredictLjzzj) refresh(to *gorm.DB, edbInfoId, source, subSource int, f
 	{
 		var finalLast EdbInfoSearchData
 		sql := fmt.Sprintf(` SELECT data_time , value FROM %s WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `, dataTableName)
+		sql = utils.ReplaceDriverKeywords("", sql)
 		err = to.Raw(sql, edbInfoId, fromEdbInfo.LatestDate).First(&finalLast).Error
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			return

+ 2 - 0
models/predict_edb_data_calculate_ljzzy.go

@@ -205,6 +205,7 @@ func refreshAllPredictCalculateLjzzy(to *gorm.DB, edbInfoId, source, subSource i
 	}
 
 	addSql := ` INSERT INTO edb_data_predict_calculate_ljzzy(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	dataTableName := GetEdbDataTableName(source, subSource)
 
@@ -355,6 +356,7 @@ func refreshAllPredictCalculateLjzzy(to *gorm.DB, edbInfoId, source, subSource i
 	//确定最终值
 	var finalLast EdbInfoSearchData
 	sql := ` SELECT data_time , value FROM edb_data_predict_calculate_ljzzy WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `
+	sql = utils.ReplaceDriverKeywords("", sql)
 	tmpErr := to.Raw(sql, edbInfoId, latestDateStr).First(&finalLast).Error
 	if tmpErr != nil {
 		if tmpErr.Error() != utils.ErrNoRow() {

+ 1 - 0
models/predict_edb_data_calculate_nszydbpjjs.go

@@ -258,6 +258,7 @@ func refreshAllPredictCalculateNszydpjjs(to *gorm.DB, edbInfoId, source, subSour
 	}
 
 	addSql := ` INSERT INTO ` + dataTableName + `(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	arrLen := len(fromDateArr)
 	existAddDataMap := make(map[string]string)

+ 1 - 0
models/predict_edb_data_calculate_percentile.go

@@ -278,6 +278,7 @@ func (obj PredictPercentile) refresh(to *gorm.DB, edbInfo, fromEdbInfo *EdbInfo,
 	needAddDateMap := make(map[time.Time]int)
 
 	addSql := ` INSERT INTO ` + dataTableName + `(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	for _, tmpData := range fromDataList {
 		currDateStr := tmpData.DataTime

+ 1 - 0
models/predict_edb_data_calculate_standard_deviation.go

@@ -288,6 +288,7 @@ func (obj PredictStandardDeviation) refresh(to *gorm.DB, edbInfo, fromEdbInfo *E
 	needAddDateMap := make(map[time.Time]int)
 
 	addSql := ` INSERT INTO ` + dataTableName + `(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	for _, tmpData := range fromDataList {
 		currDateStr := tmpData.DataTime

+ 1 - 0
models/predict_edb_data_calculate_tbz.go

@@ -292,6 +292,7 @@ func (obj PredictTb) refresh(to *gorm.DB, edbInfo, fromEdbInfo *EdbInfo, edbCode
 
 	//fmt.Println("existDataMap:", existDataMap)
 	addSql := ` INSERT INTO edb_data_predict_calculate_tbz (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	existAddDataMap := make(map[string]string)
 

+ 2 - 0
models/predict_edb_data_calculate_tcz.go

@@ -174,6 +174,7 @@ func SavePredictCalculateTcz(reqEdbInfoId, classifyId int, edbName, frequency, u
 	//fmt.Println("Frequency:", fromEdbInfo.Frequency)
 
 	addSql := ` INSERT INTO edb_data_predict_calculate_tcz (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	existMap := make(map[string]string)
 	for _, av := range dateArr {
@@ -396,6 +397,7 @@ func RefreshAllPredictCalculateTcz(edbInfoId, source, subSource int, fromEdbInfo
 	}
 
 	addSql := ` INSERT INTO edb_data_predict_calculate_tcz(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 	existAddDataMap := make(map[string]string)
 	for _, av := range dateArr {

+ 1 - 0
models/predict_edb_data_calculate_time_shift.go

@@ -238,6 +238,7 @@ func refreshAllPredictCalculateTimeShift(to *gorm.DB, edbInfoId, source, subSour
 	}
 	//fmt.Println("existDataMap:", existDataMap)
 	addSql := ` INSERT INTO edb_data_predict_calculate_time_shift(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql = utils.ReplaceDriverKeywords("", addSql)
 	var isAdd bool
 
 	existMap := make(map[string]string)

+ 3 - 2
utils/sql.go

@@ -70,8 +70,9 @@ func ReplaceDriverKeywords(driver string, sql string) string {
 	dbDriver, _ := getDriverInstance(driver)
 	rules := map[Driver]map[string]string{
 		DM: {
-			"admin": `"admin"`,
-			"value": `"value"`,
+			"admin":    `"admin"`,
+			"value":    `"value"`,
+			"exchange": `"exchange"`,
 		},
 	}
 	replacements, ok := rules[dbDriver]