|
|
@@ -85,7 +85,7 @@ func SaveQuotaDataCache() {
|
|
|
//quotaDataDB.Count += quotaData.Count
|
|
|
//quotaDataDB.Quota += quotaData.Quota
|
|
|
//DB.Table("quota_data").Save(quotaDataDB)
|
|
|
- increaseQuotaData(quotaData.UserID, quotaData.Username, quotaData.ModelName, quotaData.Count, quotaData.Quota, quotaData.CreatedAt)
|
|
|
+ increaseQuotaData(quotaData.UserID, quotaData.Username, quotaData.ModelName, quotaData.Count, quotaData.Quota, quotaData.CreatedAt, quotaData.TokenUsed)
|
|
|
} else {
|
|
|
DB.Table("quota_data").Create(quotaData)
|
|
|
}
|
|
|
@@ -94,11 +94,12 @@ func SaveQuotaDataCache() {
|
|
|
common.SysLog(fmt.Sprintf("保存数据看板数据成功,共保存%d条数据", size))
|
|
|
}
|
|
|
|
|
|
-func increaseQuotaData(userId int, username string, modelName string, count int, quota int, createdAt int64) {
|
|
|
+func increaseQuotaData(userId int, username string, modelName string, count int, quota int, createdAt int64, tokenUsed int) {
|
|
|
err := DB.Table("quota_data").Where("user_id = ? and username = ? and model_name = ? and created_at = ?",
|
|
|
userId, username, modelName, createdAt).Updates(map[string]interface{}{
|
|
|
- "count": gorm.Expr("count + ?", count),
|
|
|
- "quota": gorm.Expr("quota + ?", quota),
|
|
|
+ "count": gorm.Expr("count + ?", count),
|
|
|
+ "quota": gorm.Expr("quota + ?", quota),
|
|
|
+ "token_used": gorm.Expr("token_used + ?", tokenUsed),
|
|
|
}).Error
|
|
|
if err != nil {
|
|
|
common.SysLog(fmt.Sprintf("increaseQuotaData error: %s", err))
|
|
|
@@ -127,6 +128,6 @@ func GetAllQuotaDates(startTime int64, endTime int64, username string) (quotaDat
|
|
|
// 从quota_data表中查询数据
|
|
|
// only select model_name, sum(count) as count, sum(quota) as quota, model_name, created_at from quota_data group by model_name, created_at;
|
|
|
//err = DB.Table("quota_data").Where("created_at >= ? and created_at <= ?", startTime, endTime).Find("aDatas).Error
|
|
|
- err = DB.Table("quota_data").Select("model_name, sum(count) as count, sum(quota) as quota, created_at").Where("created_at >= ? and created_at <= ?", startTime, endTime).Group("model_name, created_at").Find("aDatas).Error
|
|
|
+ err = DB.Table("quota_data").Select("model_name, sum(count) as count, sum(quota) as quota, sum(token_used) as token_used, created_at").Where("created_at >= ? and created_at <= ?", startTime, endTime).Group("model_name, created_at").Find("aDatas).Error
|
|
|
return quotaDatas, err
|
|
|
}
|