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

models/data_manage/base_from_changes_visitors_covid.go

@@ -15,6 +15,9 @@ func GetVisitorsCovidLastDate() (last_date string, err error) {
 	} else {
 		last_date = lastDateNull.String
 	}
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		last_date = utils.GormDateStrToDateStr(last_date)
+	}
 	return
 }
 

models/data_manage/base_from_clarksons_classify.go

@@ -76,10 +76,10 @@ func GetChildClarksonsClassifyIdsById(classifyId int) (items []int, err error) {
 
 // GetChildClarksonsClassifyMaxSortById 获取子分类最大排序
 func GetChildClarksonsClassifyMaxSortById(classifyId int) (sort int, err error) {
-	sqlStr := ` SELECT MAX(sort) AS sort FROM base_from_clarksons_classify WHERE parent_id=? `
+	sqlStr := ` SELECT COALESCE(MAX(sort),0) AS sort FROM base_from_clarksons_classify WHERE parent_id=? `
 
 	var totalNull sql.NullInt64
-	err = global.DbMap[utils.DbNameIndex].Raw(sqlStr, classifyId).Scan(&sort).Error
+	err = global.DbMap[utils.DbNameIndex].Raw(sqlStr, classifyId).Scan(&totalNull).Error
 	if !totalNull.Valid {
 		sort = 0
 	} else {

models/data_manage/base_from_clarksons_data.go

@@ -4,6 +4,7 @@ import (
 	"database/sql"
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -18,6 +19,13 @@ type BaseFromClarksonsData struct {
 	DataTimestamp            int64     `description:"数据时间戳"`
 }
 
+func (baseFromClarksonsData *BaseFromClarksonsData) AfterFind(tx *gorm.DB) (err error) {
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		baseFromClarksonsData.DataTime = utils.GormDateStrToDateStr(baseFromClarksonsData.DataTime)
+	}
+	return
+}
+
 // GetClarksonsDataByIndexId 根据指标id获取指标数据
 func GetClarksonsDataByIndexId(indexId int) (items []*BaseFromClarksonsData, err error) {
 	sql := ` SELECT * FROM base_from_clarksons_data WHERE base_from_clarksons_index_id=? ORDER BY data_time DESC`
@@ -32,6 +40,11 @@ func GetClarksonsDataDataTimeByIndexId(indexIdList []int) (items []string, err e
 	}
 	sql := ` SELECT DISTINCT data_time FROM base_from_clarksons_data WHERE base_from_clarksons_index_id IN (` + utils.GetOrmInReplace(len(indexIdList)) + `) ORDER BY data_time DESC`
 	err = global.DbMap[utils.DbNameIndex].Raw(sql, indexIdList).Find(&items).Error
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		for i, item := range items {
+			items[i] = utils.GormDateStrToDateStr(item)
+		}
+	}
 	return
 }
 

models/data_manage/base_from_clarksons_index.go

@@ -5,11 +5,13 @@ import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"github.com/rdlucklib/rdluck_tools/paging"
+	"gorm.io/gorm"
 	"time"
 )
 
 type BaseFromClarksonsIndex struct {
-	BaseFromClarksonsIndexId int    `orm:"pk"`
+	//BaseFromClarksonsIndexId int    `orm:"pk"`
+	BaseFromClarksonsIndexId int    `gorm:"primaryKey"`
 	ClassifyId               int    `description:"指标分类id"`
 	IndexCode                string `description:"指标编码"`
 	IndexName                string `description:"指标名称"`
@@ -22,6 +24,18 @@ type BaseFromClarksonsIndex struct {
 	ModifyTime               time.Time
 }
 
+func (baseFromClarksonsIndex *BaseFromClarksonsIndex) AfterFind(tx *gorm.DB) (err error) {
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		if baseFromClarksonsIndex.StartDate != "" {
+			baseFromClarksonsIndex.StartDate = utils.GormDateStrToDateStr(baseFromClarksonsIndex.StartDate)
+		}
+		if baseFromClarksonsIndex.EndDate != "" {
+			baseFromClarksonsIndex.EndDate = utils.GormDateStrToDateStr(baseFromClarksonsIndex.EndDate)
+		}
+	}
+	return
+}
+
 type BaseFromClarksonsIndexView struct {
 	BaseFromClarksonsIndexId int    `orm:"pk"`
 	EdbInfoId                int    `description:"指标库id"`
@@ -54,7 +68,7 @@ type BaseFromClarksonsIndexList struct {
 }
 
 func (b *BaseFromClarksonsIndex) Update(cols []string) (err error) {
-	err = global.DbMap[utils.DbNameIndex].Select(cols).Updates(b).Error
+	err = global.DbMap[utils.DbNameIndex].Model(&b).Select(cols).Updates(b).Error
 	return
 }
 

models/data_manage/base_from_gpr_risk.go

@@ -2,6 +2,7 @@ package data_manage
 
 import (
 	"eta/eta_api/utils"
+	"gorm.io/gorm"
 	"time"
 
 	"database/sql"
@@ -45,6 +46,25 @@ type BaseFromGprRiskIndexList struct {
 	DataList               []*BaseFromGprRiskData `gorm:"-"`
 	Paging                 *paging.PagingItem     `description:"分页数据" gorm:"-"`
 }
+
+func (baseFromGprRiskIndexList *BaseFromGprRiskIndexList) AfterFind(tx *gorm.DB) (err error) {
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		if baseFromGprRiskIndexList.CreateTime != "" {
+			baseFromGprRiskIndexList.CreateTime = utils.GormDateStrToDateTimeStr(baseFromGprRiskIndexList.CreateTime)
+		}
+		if baseFromGprRiskIndexList.ModifyTime != "" {
+			baseFromGprRiskIndexList.ModifyTime = utils.GormDateStrToDateTimeStr(baseFromGprRiskIndexList.ModifyTime)
+		}
+		if baseFromGprRiskIndexList.StartDate != "" {
+			baseFromGprRiskIndexList.StartDate = utils.GormDateStrToDateStr(baseFromGprRiskIndexList.StartDate)
+		}
+		if baseFromGprRiskIndexList.EndDate != "" {
+			baseFromGprRiskIndexList.EndDate = utils.GormDateStrToDateStr(baseFromGprRiskIndexList.EndDate)
+		}
+	}
+	return
+}
+
 type BaseFromGprRiskIndexSearchList struct {
 	List   []*BaseFromGprRiskIndexList
 	Paging *paging.PagingItem `description:"分页数据"`
@@ -170,6 +190,11 @@ func GetGprRiskDataDataTimeByIndexId(indexIdList []int) (items []string, err err
 	}
 	sql := ` SELECT DISTINCT data_time FROM base_from_gpr_risk_data WHERE base_from_gpr_risk_index_id IN (` + utils.GetOrmInReplace(len(indexIdList)) + `) ORDER BY data_time DESC`
 	err = global.DbMap[utils.DbNameIndex].Raw(sql, indexIdList).Find(&items).Error
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		for i, item := range items {
+			items[i] = utils.GormDateStrToDateStr(item)
+		}
+	}
 	return
 }
 
@@ -184,6 +209,21 @@ type BaseFromGprRiskData struct {
 	DataTimestamp          int64
 }
 
+func (baseFromGprRiskData *BaseFromGprRiskData) AfterFind(tx *gorm.DB) (err error) {
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		if baseFromGprRiskData.ModifyTime != "" {
+			baseFromGprRiskData.ModifyTime = utils.GormDateStrToDateTimeStr(baseFromGprRiskData.ModifyTime)
+		}
+		if baseFromGprRiskData.CreateTime != "" {
+			baseFromGprRiskData.CreateTime = utils.GormDateStrToDateTimeStr(baseFromGprRiskData.CreateTime)
+		}
+		if baseFromGprRiskData.DataTime != "" {
+			baseFromGprRiskData.DataTime = utils.GormDateStrToDateStr(baseFromGprRiskData.DataTime)
+		}
+	}
+	return
+}
+
 type BaseFromGprRiskIndexSearchItem struct {
 	BaseFromGprRiskIndexId int `orm:"column(base_from_gpr_risk_index_id);pk"`
 	ClassifyId             int

models/data_manage/base_from_rzd_data.go

@@ -4,6 +4,7 @@ package data_manage
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
+	"gorm.io/gorm"
 
 	"github.com/beego/beego/v2/client/orm"
 )
@@ -18,6 +19,21 @@ type BaseFromRzdData struct {
 	Value              float64 `orm:"column(value)"`
 }
 
+func (baseFromRzdData *BaseFromRzdData) AfterFind(tx *gorm.DB) (err error) {
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		if baseFromRzdData.ModifyTime != "" {
+			baseFromRzdData.ModifyTime = utils.GormDateStrToDateTimeStr(baseFromRzdData.ModifyTime)
+		}
+		if baseFromRzdData.CreateTime != "" {
+			baseFromRzdData.CreateTime = utils.GormDateStrToDateTimeStr(baseFromRzdData.CreateTime)
+		}
+		if baseFromRzdData.DataTime != "" {
+			baseFromRzdData.DataTime = utils.GormDateStrToDateStr(baseFromRzdData.DataTime)
+		}
+	}
+	return
+}
+
 // RzdIndexAddReq 指标添加vo
 type RzdIndexAddReq struct {
 	EdbCode       string `description:"指标编码"`
@@ -91,6 +107,11 @@ func GetRzdDataListByIndexCodes(IndexCodes string) (items []string, err error) {
 	sql := ` SELECT data_time FROM base_from_rzd_data WHERE index_code IN(` + IndexCodes + `)  GROUP BY data_time DESC `
 	o := global.DbMap[utils.DbNameIndex]
 	err = o.Raw(sql).Find(&items).Error
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		for i := 0; i < len(items); i++ {
+			items[i] = utils.GormDateStrToDateStr(items[i])
+		}
+	}
 	return
 }
 

models/data_manage/base_from_rzd_index.go

@@ -6,6 +6,7 @@ import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"fmt"
+	"gorm.io/gorm"
 
 	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
@@ -54,6 +55,19 @@ type BaseFromRzdIndexList struct {
 	EdbInfoId             int                `description:"指标库主键id"`
 }
 
+func (baseFromRzdIndexList *BaseFromRzdIndexList) AfterFind(tx *gorm.DB) (err error) {
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		if baseFromRzdIndexList.ModifyTime != "" {
+			baseFromRzdIndexList.ModifyTime = utils.GormDateStrToDateTimeStr(baseFromRzdIndexList.ModifyTime)
+		}
+		if baseFromRzdIndexList.CreateTime != "" {
+			baseFromRzdIndexList.CreateTime = utils.GormDateStrToDateTimeStr(baseFromRzdIndexList.CreateTime)
+		}
+
+	}
+	return
+}
+
 // RzdNameCheckResult 校验名称是否存在
 type RzdNameCheckResult struct {
 	IndexCode string `from:"EdbCode" description:"edb编码"`

models/data_manage/base_from_sci_hq_classify.go

@@ -28,7 +28,7 @@ type BaseFromSciHqClassifyItem struct {
 	ModifyTime     time.Time                    `description:"修改时间"`
 	CreateTime     time.Time                    `description:"创建时间"`
 	ClassifyNameEn string                       `description:"英文分类名称"`
-	Children       []*BaseFromSciHqClassifyItem `description:"子分类"`
+	Children       []*BaseFromSciHqClassifyItem `description:"子分类" gorm:"-"`
 }
 
 type BaseFromSciHqClassifyMaxSort struct {

models/data_manage/edb_info.go

@@ -753,6 +753,18 @@ type EdbInfoMaxAndMinInfo struct {
 	LatestValue float64 `description:"最新值"`
 }
 
+func (edbInfoMaxAndMinInfo *EdbInfoMaxAndMinInfo) AfterFind(tx *gorm.DB) (err error) {
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		if edbInfoMaxAndMinInfo.MinDate != "" {
+			edbInfoMaxAndMinInfo.MinDate = utils.GormDateStrToDateStr(edbInfoMaxAndMinInfo.MinDate)
+		}
+		if edbInfoMaxAndMinInfo.MaxDate != "" {
+			edbInfoMaxAndMinInfo.MaxDate = utils.GormDateStrToDateStr(edbInfoMaxAndMinInfo.MaxDate)
+		}
+	}
+	return
+}
+
 // GetEdbInfoMaxAndMinInfo
 // @Description: 获取指标最大最小值
 // @author: Roc
@@ -794,7 +806,6 @@ func GetEdbInfoMaxAndMinInfoByMysql(source, subSource int, edbCode string) (item
 	if err != nil {
 		return
 	}
-
 	var latest_value float64
 	sql = ` SELECT value AS latest_value FROM %s WHERE edb_code=? ORDER BY data_time DESC LIMIT 1 `
 	sql = fmt.Sprintf(sql, tableName)

models/data_source/guagnzhouqihuo.go

@@ -3,6 +3,7 @@ package data_source
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -66,6 +67,9 @@ func (obj *BaseFromTradeGuangzhouIndex) GetBaseFromTradeGuangzhouMaxDate() (max_
 	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT MAX(a.end_date) AS max_date FROM base_from_trade_guangzhou_index AS a `
 	err = o.Raw(sql).Scan(&max_date).Error
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		max_date = utils.GormDateStrToDateStr(max_date)
+	}
 	return max_date, err
 }
 
@@ -88,6 +92,18 @@ type BaseFromTradeGuangzhouIndexView struct {
 	Value                            float64 `description:"数据"`
 }
 
+func (obj *BaseFromTradeGuangzhouIndexView) AfterFind(tx *gorm.DB) (err error) {
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		if obj.StartDate != "" {
+			obj.StartDate = utils.GormDateStrToDateStr(obj.StartDate)
+		}
+		if obj.EndDate != "" {
+			obj.EndDate = utils.GormDateStrToDateStr(obj.EndDate)
+		}
+	}
+	return
+}
+
 func (obj *BaseFromTradeGuangzhouIndex) GetBaseFromTradeGuangzhouIndex(condition string, pars []interface{}, baseFromTradeGuangzhouContractId int) (list []*BaseFromTradeGuangzhouIndexView, err error) {
 	o := global.DbMap[utils.DbNameIndex]
 	if baseFromTradeGuangzhouContractId <= 0 {

models/target.go

@@ -5,6 +5,7 @@ import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"fmt"
+	"gorm.io/gorm"
 	"sort"
 	"strconv"
 	"strings"
@@ -1722,6 +1723,18 @@ type EdbinfoMaxMinDate struct {
 	MaxDate string
 }
 
+func (mmDate *EdbinfoMaxMinDate) AfterFind(tx *gorm.DB) (err error) {
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		if mmDate.MinDate != "" {
+			mmDate.MinDate = utils.GormDateStrToDateStr(mmDate.MinDate)
+		}
+		if mmDate.MaxDate != "" {
+			mmDate.MaxDate = utils.GormDateStrToDateStr(mmDate.MaxDate)
+		}
+	}
+	return
+}
+
 // GetEdbdataMaxMinDate
 // @Description: 获取手工指标的最小最大日期
 // @author: Roc