Merge branch 'dm' of http://8.136.199.33:3000/eta_server/eta_api into dm

models/data_manage/excel/referenced_excel_config.go

@@ -1,13 +1,13 @@
 package excel
 
 import (
+	"eta/eta_api/global"
 	"eta/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 type ReferencedExcelConfig struct {
-	ReferencedExcelConfigId int       `orm:"column(referenced_excel_config_id);pk;auto" ` // excel表格配置id
+	ReferencedExcelConfigId int       `gorm:"column:referenced_excel_config_id;primaryKey;autoIncrement" orm:"column(referenced_excel_config_id);pk;auto" ` // excel表格配置id
 	UniqueCode              string    // 表格唯一编码
 	ReferencedId            int       // 被引用的id，报告就是报告id，pptId
 	FromScene               int       // 引用类型 1智能研报 2研报列表 3英文研报 4PPT 5英文ppt
@@ -32,39 +32,39 @@ type ExcelReferencesReq struct {
 
 // add
 func AddReferencedExcelConfig(items []*ReferencedExcelConfig) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(len(items), items)
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 // getByCode
 func GetReferencedExcelConfigByUniqueCode(uniqueCode string) (item ReferencedExcelConfig, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT * FROM referenced_excel_config WHERE referenced_excel_unique_code = ? `
-	err = o.Raw(sql, uniqueCode).QueryRow(&item)
+	err = o.Raw(sql, uniqueCode).First(&item).Error
 	return
 }
 
 // getByCode
 func GetReferencedExcelConfig(referencedId, fromScene int, uniqueCode, uuid string) (item ReferencedExcelConfig, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT * FROM referenced_excel_config WHERE referenced_id = ? AND from_scene = ? AND unique_code = ? AND  uuid= ? `
-	err = o.Raw(sql, referencedId, fromScene, uniqueCode, uuid).QueryRow(&item)
+	err = o.Raw(sql, referencedId, fromScene, uniqueCode, uuid).First(&item).Error
 	return
 }
 
 // update
 func UpdateReferencedExcelConfig(item *ReferencedExcelConfig) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(item, "WidthList", "HeightList", "OpUserId", "OpUserName", "ModifyTime")
+	cols := []string{"WidthList", "HeightList", "OpUserId", "OpUserName", "ModifyTime"}
+	err = global.DbMap[utils.DbNameIndex].Select(cols).Updates(item).Error
 	return
 }
 
 // delete
 func DeleteReferencedExcelConfig(uniqueCode string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `DELETE FROM referenced_excel_config WHERE unique_code=? `
-	_, err = o.Raw(sql, uniqueCode).Exec()
+	err = o.Raw(sql, uniqueCode).Error
 	return
 }
 
@@ -77,9 +77,9 @@ func DeleteReferencedExcelConfig(uniqueCode string) (err error) {
 // @return items []ReferencedExcelConfig
 // @return err error
 func GetReferencedExcelConfigList(referencedId, fromScene int) (items []ReferencedExcelConfig, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT * FROM referenced_excel_config WHERE referenced_id = ? AND from_scene = ? `
-	_, err = o.Raw(sql, referencedId, fromScene).QueryRows(&items)
+	err = o.Raw(sql, referencedId, fromScene).Find(&items).Error
 
 	return
 }
@@ -96,10 +96,10 @@ func GetReferencedExcelConfigList(referencedId, fromScene int) (items []Referenc
 // @param sysUserName string
 // @return err error
 func CopyReferencedExcelConfigByReferencedIdAndFromScene(oldReferencedId, oldFromScene, newReferencedId, newFromScene, sysUserId int, sysUserName string) (addList []*ReferencedExcelConfig, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	var items []ReferencedExcelConfig
 	sql := ` SELECT * FROM referenced_excel_config WHERE referenced_id = ? AND from_scene = ? `
-	_, err = o.Raw(sql, oldReferencedId, oldFromScene).QueryRows(&items)
+	err = o.Raw(sql, oldReferencedId, oldFromScene).Find(&items).Error
 	if err != nil {
 		return
 	}
@@ -122,7 +122,7 @@ func CopyReferencedExcelConfigByReferencedIdAndFromScene(oldReferencedId, oldFro
 		})
 	}
 	// 批量复制表格关系
-	_, err = o.InsertMulti(utils.MultiAddNum, addList)
+	err = o.CreateInBatches(addList, utils.MultiAddNum).Error
 
 	return
 }
@@ -145,10 +145,10 @@ func CopyReferencedExcelConfigByReferencedIdListAndFromScene(oldReferencedIdList
 		return
 	}
 
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	var items []ReferencedExcelConfig
 	sql := ` SELECT * FROM referenced_excel_config WHERE referenced_id in (` + utils.GetOrmInReplace(num) + `) AND from_scene = ? group by unique_code,uuid `
-	_, err = o.Raw(sql, oldReferencedIdList, oldFromScene).QueryRows(&items)
+	err = o.Raw(sql, oldReferencedIdList, oldFromScene).Find(&items).Error
 	if err != nil {
 		return
 	}
@@ -171,7 +171,7 @@ func CopyReferencedExcelConfigByReferencedIdListAndFromScene(oldReferencedIdList
 		})
 	}
 	// 批量复制表格关系
-	_, err = o.InsertMulti(utils.MultiAddNum, addList)
+	err = o.CreateInBatches(addList, utils.MultiAddNum).Error
 
 	return
 }

models/data_manage/supply_analysis/variety_edb_info.go

@@ -95,6 +95,12 @@ func (v *VarietyEdbInfoItem) AfterFind(tx *gorm.DB) (err error) {
 		if v.ModifyTime != "" {
 			v.ModifyTime = utils.GormDateStrToDateTimeStr(v.ModifyTime)
 		}
+		if v.StartDate != "" {
+			v.StartDate = utils.GormDateStrToDateStr(v.StartDate)
+		}
+		if v.EndDate != "" {
+			v.EndDate = utils.GormDateStrToDateStr(v.EndDate)
+		}
 	}
 	return
 }

models/data_manage/supply_analysis/variety_plant.go

@@ -3,6 +3,7 @@ package supply_analysis
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -92,6 +93,24 @@ type VarietyPlantItem struct {
 	Button                        VarietyPlantButton `gorm:"-" description:"操作按钮权限"`
 }
 
+func (v *VarietyPlantItem) AfterFind(tx *gorm.DB) (err error) {
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		if v.CreateTime != "" {
+			v.CreateTime = utils.GormDateStrToDateTimeStr(v.CreateTime)
+		}
+		if v.ModifyTime != "" {
+			v.ModifyTime = utils.GormDateStrToDateTimeStr(v.ModifyTime)
+		}
+		if v.MaintenanceDate != "" {
+			v.MaintenanceDate = utils.GormDateStrToDateStr(v.MaintenanceDate)
+		}
+		if v.ResumptionDate != "" {
+			v.ResumptionDate = utils.GormDateStrToDateStr(v.ResumptionDate)
+		}
+	}
+	return
+}
+
 type VarietyPlantButton struct {
 	Edit   bool `description:"操作权限"`
 	Delete bool `description:"删除权限"`

models/data_manage/trade_analysis/base_from_trade_exchange.go

@@ -1,7 +1,7 @@
 package trade_analysis
 
 import (
-	"database/sql"
+	sql2 "database/sql"
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"fmt"
@@ -61,13 +61,15 @@ func (m *BaseFromTradeExchange) 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)
+	sql = utils.ReplaceDriverKeywords("", sql) // exchange是关键词
 	err = global.DbMap[utils.DbNameIndex].Raw(sql, pars...).First(&item).Error
 	return
 }
 
 func (m *BaseFromTradeExchange) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	var totalNull sql.NullInt64
+	var totalNull sql2.NullInt64
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
+	sql = utils.ReplaceDriverKeywords("", sql)
 	err = global.DbMap[utils.DbNameIndex].Raw(sql, pars...).Scan(&totalNull).Error
 	if !totalNull.Valid {
 		count = 0
@@ -87,6 +89,7 @@ func (m *BaseFromTradeExchange) GetItemsByCondition(condition string, pars []int
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
+	sql = utils.ReplaceDriverKeywords("", sql)
 	err = global.DbMap[utils.DbNameIndex].Raw(sql, pars...).Find(&items).Error
 	return
 }
@@ -101,6 +104,7 @@ func (m *BaseFromTradeExchange) GetPageItemsByCondition(condition string, pars [
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
+	sql = utils.ReplaceDriverKeywords("", sql)
 	pars = append(pars, startSize, pageSize)
 	err = global.DbMap[utils.DbNameIndex].Raw(sql, pars...).Find(&items).Error
 	return

models/permission.go

@@ -20,6 +20,7 @@ type ChartPermissionSearchKeyWordMapping struct {
 func GetPermission(classifyId int) (items []*ChartPermissionSearchKeyWordMapping, err error) {
 	o := global.DbMap[utils.DbNameReport]
 	sql := `SELECT * FROM chart_permission_search_key_word_mapping AS a WHERE a.from='rddp' AND a.classify_id = ? `
+	sql = utils.ReplaceDriverKeywords("", sql)
 	err = o.Raw(sql, classifyId).Find(&items).Error
 	return
 }
@@ -27,6 +28,7 @@ func GetPermission(classifyId int) (items []*ChartPermissionSearchKeyWordMapping
 func GetAllPermissionMapping() (items []*ChartPermissionSearchKeyWordMapping, err error) {
 	o := global.DbMap[utils.DbNameReport]
 	sql := `SELECT * FROM chart_permission_search_key_word_mapping AS a WHERE a.from='rddp'`
+	sql = utils.ReplaceDriverKeywords("", sql)
 	err = o.Raw(sql).Find(&items).Error
 	return
 }
@@ -41,7 +43,8 @@ func EditChartPermissionSearchKeyWordMappingMulti(keyword string, permissionIdLi
 			_ = to.Commit()
 		}
 	}()
-	sql := "DELETE FROM chart_permission_search_key_word_mapping WHERE `from` = 'rddp' AND classify_id = ?"
+	sql := "DELETE FROM chart_permission_search_key_word_mapping WHERE from = 'rddp' AND classify_id = ?"
+	sql = utils.ReplaceDriverKeywords("", sql)
 	err = to.Exec(sql, classifyId).Error
 	if err != nil {
 		return
@@ -87,7 +90,8 @@ type ChartPermissionMappingIdName struct {
 
 func GetChartPermissionNameFromMappingByKeyword(source string, classifyId int) (list []*ChartPermissionMappingIdName, err error) {
 	o := global.DbMap[utils.DbNameReport]
-	sql := " SELECT b.chart_permission_id AS permission_id,b.permission_name FROM chart_permission_search_key_word_mapping AS a INNER JOIN chart_permission AS b ON a.chart_permission_id = b.chart_permission_id WHERE a.`from` = ? AND a.classify_id = ? "
+	sql := " SELECT b.chart_permission_id AS permission_id,b.permission_name FROM chart_permission_search_key_word_mapping AS a INNER JOIN chart_permission AS b ON a.chart_permission_id = b.chart_permission_id WHERE a.from = ? AND a.classify_id = ? "
+	sql = utils.ReplaceDriverKeywords("", sql)
 	err = o.Raw(sql, source, classifyId).Find(&list).Error
 	return
 }
@@ -95,7 +99,8 @@ func GetChartPermissionNameFromMappingByKeyword(source string, classifyId int) (
 // UpdateChartPermissionNameFromMappingByKeyword 根据关键词及来源更新新关键词
 func UpdateChartPermissionNameFromMappingByKeyword(newKeyword string, classifyId int, source string) (err error) {
 	o := global.DbMap[utils.DbNameReport]
-	sql := " UPDATE chart_permission_search_key_word_mapping SET key_word = ? WHERE classify_id = ? AND `from` = ? "
+	sql := " UPDATE chart_permission_search_key_word_mapping SET key_word = ? WHERE classify_id = ? AND from = ? "
+	sql = utils.ReplaceDriverKeywords("", sql)
 	err = o.Exec(sql, newKeyword, classifyId, source).Error
 	return
 }

utils/sql.go

@@ -331,6 +331,10 @@ func ReplaceDriverKeywords(driver string, sql string) string {
 			"exchange": `"exchange"`,
 			"b.from":   `b."from"`,
 			"size":     `"size"`,
+			"a.from":   `a."from"`,
+		},
+		MySql: {
+			"from": "`from`",
 		},
 	}
 	replacements, ok := rules[dbDriver]