Roc 2 månader sedan
förälder
incheckning
f039a0955a

+ 2 - 0
models/data_manage/chart_info.go

@@ -512,6 +512,8 @@ func getEdbDataListByMysql(source, subSource, edbInfoId int, startDate, endDate
 
 	sql += ` ORDER BY data_time ASC `
 	sql = fmt.Sprintf(sql, tableName)
+	sql = utils.ReplaceDriverKeywords("", sql)
+
 	o := global.DbMap[utils.DbNameIndex]
 	err = o.Raw(sql, pars...).Find(&list).Error
 	return

+ 1 - 0
models/data_manage/chart_theme/chart_theme_default_data.go

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

+ 3 - 0
models/data_manage/edb_data_insert_config.go

@@ -200,6 +200,7 @@ func updateInsertConfigValueByMysql(to *gorm.DB, edbInfo *EdbInfo, oldConfigDate
 		if !oldConfigDate.IsZero() {
 			sql := `SELECT edb_data_id,edb_info_id,data_time,value,data_timestamp FROM %s WHERE edb_info_id=? AND data_time = ?`
 			sql = fmt.Sprintf(sql, tableName)
+			sql = utils.ReplaceDriverKeywords("", sql)
 			err = to.Raw(sql, tableName, edbInfo.EdbInfoId, oldConfigDate.Format(utils.FormatDate)).First(&edbDateData).Error
 			//err = to.Raw(sql, edbInfo.EdbInfoId, oldConfigDate.Format(utils.FormatDate)).QueryRow(&edbDateData)
 			if err != nil && !utils.IsErrNoRow(err) {
@@ -212,6 +213,7 @@ func updateInsertConfigValueByMysql(to *gorm.DB, edbInfo *EdbInfo, oldConfigDate
 		if edbDateData == nil {
 			addSql := ` INSERT INTO %s (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) VALUES ( %d, "%s", "%s", "%s", now(), now(), %s) `
 			addSql = fmt.Sprintf(addSql, tableName, edbInfo.EdbInfoId, edbInfo.EdbCode, dateStr, saveValue, timeStr)
+			addSql = utils.ReplaceDriverKeywords("", addSql)
 			err = to.Exec(addSql).Error
 			//_, err = to.Raw(addSql).Exec()
 		} else if value == "" {
@@ -232,6 +234,7 @@ func updateInsertConfigValueByMysql(to *gorm.DB, edbInfo *EdbInfo, oldConfigDate
 			err = to.Exec(deleteSql).Error
 		} else {
 			updateSql := `UPDATE %s SET data_time = "%s", value = "%s", modify_time= now(), data_timestamp= %s WHERE edb_data_id = %d;`
+			updateSql = utils.ReplaceDriverKeywords("", updateSql)
 			updateSql = fmt.Sprintf(updateSql, tableName, dateStr, saveValue, timeStr, edbDateData.EdbDataId)
 			//_, err = to.Raw(updateSql).Exec()
 			err = to.Exec(updateSql).Error

+ 3 - 2
models/data_manage/edb_data_quarter.go

@@ -195,10 +195,11 @@ func AddCalculateQuarter(edbInfoId, source int, edbCode string) (err error) {
 	fmt.Println("isAdd", isAdd)
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		utils.FileLog.Info(addSql)
+		addSql = utils.ReplaceDriverKeywords("", addSql)
+		//utils.FileLog.Info(addSql)
 		//_, err = to.Raw(addSql).Exec()
 		err = to.Exec(addSql).Error
-		fmt.Println("err:", err)
+		//fmt.Println("err:", err)
 		if err != nil {
 			return err
 		}

+ 2 - 0
models/data_manage/edb_data_ys.go

@@ -82,6 +82,7 @@ func GetEdbDataByYs(edbCode, startDate, endDate string) (searchItem *EdbInfoSear
 	}
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
+		addSql = utils.ReplaceDriverKeywords("", addSql)
 		utils.FileLog.Info("addSql:" + addSql)
 		_, err = to.Raw(addSql).Exec()
 		if err != nil {
@@ -183,6 +184,7 @@ func RefreshAllEdbDataByYs(edbInfoId, source, subSource int, edbCode, startDate,
 	}
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
+		addSql = utils.ReplaceDriverKeywords("", addSql)
 		_, err = to.Raw(addSql).Exec()
 		if err != nil {
 			return err

+ 1 - 0
models/data_manage/factor_edb_series_calculate_data_qjjs.go

@@ -200,6 +200,7 @@ func TransEdbSeriesCalculateDataQjjs2EdbDataList(items []*FactorEdbSeriesCalcula
 func (m *FactorEdbSeriesCalculateDataQjjs) GetEdbDataList(seriesId int, edbInfoId int, startDate, endDate string) (list []*EdbDataList, err error) {
 	var pars []interface{}
 	sql := `SELECT factor_edb_series_calculate_data_id as edb_data_id, edb_info_id, data_time, value, data_timestamp FROM %s WHERE edb_info_id=? AND factor_edb_series_id=? `
+	sql = utils.ReplaceDriverKeywords("", sql)
 	pars = append(pars, edbInfoId, seriesId)
 	if startDate != "" {
 		sql += ` AND data_time >= ? `

+ 1 - 1
services/data/edb_info.go

@@ -323,7 +323,7 @@ func edbInfoRefreshAll(refreshAll bool, newBaseEdbInfoArr, newBasePredictEdbInfo
 		if result.Ret != 200 {
 			fmt.Println(bv.EdbInfoId, "RefreshBaseEdbData err;msg:", result.Msg, ";errMsg:", result.ErrMsg)
 			errmsg = fmt.Sprint(bv.EdbInfoId, "RefreshBaseEdbData err;msg:", result.Msg, ";errMsg:", result.ErrMsg)
-			return fmt.Errorf("刷新失败, err:", errmsg)
+			return fmt.Errorf("刷新失败, err:%s", errmsg)
 		}
 
 		//maxAndMinItem, err := data_manage.GetEdbInfoMaxAndMinInfo(source, edbCode)