瀏覽代碼

fix:返回添加机构明

jimmyyem 3 周之前
父節點
當前提交
fe2614a889
共有 3 個文件被更改,包括 18 次插入1 次删除
  1. 1 0
      desc/wechat/usage_detail.api
  2. 15 0
      internal/logic/UsageDetail/get_usage_detail_list_logic.go
  3. 2 1
      internal/types/types.go

+ 1 - 0
desc/wechat/usage_detail.api

@@ -40,6 +40,7 @@ type (
 
         // 组织ID
         OrganizationId *uint64 `json:"organizationId,optional"`
+		OrganizationName *string `json:"organizationName,optional"`
     }
 
     // The response data of UsageDetail list | UsageDetail列表数据

+ 15 - 0
internal/logic/UsageDetail/get_usage_detail_list_logic.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"github.com/suyuan32/simple-admin-common/msg/errormsg"
 	"github.com/suyuan32/simple-admin-common/utils/pointy"
+	"github.com/suyuan32/simple-admin-core/rpc/types/core"
 	"time"
 	"wechat-api/ent/predicate"
 	"wechat-api/ent/usagedetail"
@@ -78,6 +79,8 @@ func (l *GetUsageDetailListLogic) GetUsageDetailList(req *types.UsageDetailListR
 	resp.Msg = errormsg.Success
 	resp.Data.Total = data.PageDetails.Total
 
+	orgaMap := make(map[uint64]string)
+
 	for _, v := range data.List {
 		app := "未知"
 		if v.App == 1 {
@@ -97,6 +100,17 @@ func (l *GetUsageDetailListLogic) GetUsageDetailList(req *types.UsageDetailListR
 		} else if v.App == 4 {
 			request = "节点判断"
 		}
+
+		organizationName := ""
+		if oname, ok := orgaMap[v.OrganizationID]; ok {
+			organizationName = oname
+		} else {
+			departmentInfo, err := l.svcCtx.CoreRpc.GetDepartmentById(l.ctx, &core.IDReq{Id: v.OrganizationID})
+			if err == nil {
+				organizationName = *departmentInfo.Name
+			}
+		}
+
 		resp.Data.Data = append(resp.Data.Data,
 			types.UsageDetailInfo{
 				BaseIDInfo: types.BaseIDInfo{
@@ -116,6 +130,7 @@ func (l *GetUsageDetailListLogic) GetUsageDetailList(req *types.UsageDetailListR
 				PromptTokens:     &v.PromptTokens,
 				CompletionTokens: &v.CompletionTokens,
 				OrganizationId:   &v.OrganizationID,
+				OrganizationName: &organizationName,
 			})
 	}
 

+ 2 - 1
internal/types/types.go

@@ -3315,7 +3315,8 @@ type UsageDetailInfo struct {
 	// 响应token数
 	CompletionTokens *uint64 `json:"completionTokens,optional"`
 	// 组织ID
-	OrganizationId *uint64 `json:"organizationId,optional"`
+	OrganizationId   *uint64 `json:"organizationId,optional"`
+	OrganizationName *string `json:"organizationName,optional"`
 }
 
 // The response data of UsageDetail list | UsageDetail列表数据