Merge remote-tracking branch 'origin/dm' into dm

global/initDb.go

@@ -17,6 +17,12 @@ import (
 	"time"
 )
 
+var (
+	tableMap = map[string]int{
+		"base_from_mysteel_chemical_data": 1,
+	}
+)
+
 type LocalTime time.Time
 
 // InitDb
@@ -57,7 +63,27 @@ func InitDb() {
 	if utils.MYSQL_WEEKLY_URL != `` && (utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox || utils.BusinessCode == utils.BusinessCodeDebug) {
 		connectDb(utils.MYSQL_WEEKLY_URL, utils.DbNameWeekly, newLogger, dbMap, false)
 	}
-
+	for _, db := range dbMap {
+		_ = db.Callback().Query().Before("gorm:query").Register("before_query", func(tx *gorm.DB) {
+			orgSql := tx.Statement.SQL.String()
+			if _, ok := tableMap[tx.Statement.Table]; ok && strings.Contains(strings.ToLower(orgSql), "select") {
+				newSql := utils.ReplaceDriverKeywords(utils.DbDriverName, orgSql)
+				tx.Statement.SQL.Reset()
+				tx.Statement.SQL.WriteString(newSql)
+			}
+		})
+		_ = db.Callback().Raw().Before("gorm:raw").Register("before_raw", func(tx *gorm.DB) {
+			orgSql := tx.Statement.SQL.String()
+			if _, ok := tableMap[tx.Statement.Table]; ok &&
+				(strings.Contains(strings.ToLower(orgSql), "delete") ||
+					strings.Contains(strings.ToLower(orgSql), "update") ||
+					strings.Contains(strings.ToLower(orgSql), "insert")) {
+				newSql := utils.ReplaceDriverKeywords(utils.DbDriverName, orgSql)
+				tx.Statement.SQL.Reset()
+				tx.Statement.SQL.WriteString(newSql)
+			}
+		})
+	}
 	//全局赋值数据库链接
 	DbMap = dbMap
 

models/data_manage/baiinfo_data.go

@@ -118,7 +118,7 @@ func GetBaiinfoFrequencyByCode(code string) (items []*string, err error) {
 }
 
 type BaiinfoIndexList struct {
-	BaseFromBaiinfoIndexId int `orm:"column(base_from_baiinfo_index_id);pk"`
+	BaseFromBaiinfoIndexId int `gorm:"column:base_from_baiinfo_index_id;primaryKey"`
 	Interface              string
 	Name                   string
 	IndexCode              string

models/data_manage/mysteel_chemical_index.go

@@ -208,8 +208,17 @@ func (m *MysteelChemicalList) AfterFind(tx *gorm.DB) (err error) {
 
 // MysteelChemicalData 钢联化工数据列表
 type MysteelChemicalData struct {
-	InputValue string `orm:"column(value)" description:"值"`
-	DataTime   string `orm:"column(data_time)" description:"日期"`
+	InputValue string `gorm:"column:value" description:"值"`
+	DataTime   string `gorm:"column:data_time" description:"日期"`
+}
+
+func (m *MysteelChemicalData) AfterFind(tx *gorm.DB) (err error) {
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		if m.DataTime != "" {
+			m.DataTime = utils.GormDateStrToDateStr(m.DataTime)
+		}
+	}
+	return
 }
 
 // GetMysteelChemicalIndex 根据分类id获取钢联化工频度数据列表
@@ -233,6 +242,7 @@ func GetMysteelChemicalIndexData(indexCode string, startSize, pageSize int) (ite
 	)AS t
 	GROUP BY t.data_time
 	ORDER BY t.data_time DESC LIMIT ?,? `
+	sql = utils.ReplaceDriverKeywords(utils.DbDriverName, sql)
 	o := global.DbMap[utils.DbNameIndex]
 	err = o.Raw(sql, indexCode, startSize, pageSize).Find(&items).Error
 	return