refactor(service): 重构服务代码结构并更新配置

dao/compose_session_dao.go

@@ -2,82 +2,75 @@ package dao
 
 import (
 	"context"
-
 	"prompts-core/consts/public"
 	"prompts-core/model/entity"
 
 	"gitea.com/red-future/common/db/gfdb"
+	"github.com/gogf/gf/v2/util/gconv"
 )
 
 var ComposeSession = &composeSessionDao{}
 
 type composeSessionDao struct{}
 
-func (d *composeSessionDao) Insert(ctx context.Context, m *entity.ComposeSession) (id int64, err error) {
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameComposeSession).Data(m).Insert()
+// Insert 插入
+func (d *composeSessionDao) Insert(ctx context.Context, req *entity.ComposeSession) (id int64, err error) {
+	var m = new(entity.ComposeTask)
+	err = gconv.Struct(req, &m)
 	if err != nil {
-		return 0, err
+		return
+	}
+	r, err := gfdb.DB(ctx, public.DbNameModelGateway).Model(ctx, public.TableNameComposeSession).
+		Insert(m)
+	if err != nil {
+		return
 	}
 	return r.LastInsertId()
 }
 
-func (d *composeSessionDao) Update(ctx context.Context, m *entity.ComposeSession) (rows int64, err error) {
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameComposeSession).
-		Where(entity.ComposeSessionCol.Id, m.Id).
-		Data(m).
+// Update 更新
+func (d *composeSessionDao) Update(ctx context.Context, req *entity.ComposeSession) (rows int64, err error) {
+	r, err := gfdb.DB(ctx, public.DbNameModelGateway).Model(ctx, public.TableNameComposeSession).
 		OmitEmpty().
+		Data(&req).
+		Where(entity.ComposeSessionCol.Id, req.Id).
 		Update()
 	if err != nil {
-		return 0, err
+		return
 	}
 	return r.RowsAffected()
 }
 
-func (d *composeSessionDao) List(ctx context.Context, page, size int, where map[string]any) (list []*entity.ComposeSession, total int, err error) {
-	model := gfdb.DB(ctx).Model(ctx, public.TableNameComposeSession).
-		Where("deleted_at IS NULL")
-
-	// 动态拼接查询条件
-	for k, v := range where {
-		model = model.Where(k, v)
+// List 查询编排会话列表
+func (d *composeSessionDao) List(ctx context.Context, req *entity.ComposeSession, page, size int, fields ...string) (list []*entity.ComposeSession, total int, err error) {
+	if page <= 0 {
+		page = 1
 	}
-
-	// 查询总数
-	total, err = model.Count()
+	if size <= 0 {
+		size = 10
+	}
+	model := gfdb.DB(ctx, public.DbNameModelGateway).Model(ctx, public.TableNameComposeSession).
+		Fields(fields).
+		OmitEmpty()
+	model.Where(entity.ComposeSessionCol.Creator, req.Creator)
+	model.Where(entity.ComposeSessionCol.SessionId, req.SessionId)
+	model.OrderDesc(entity.ComposeSessionCol.CreatedAt)
+	model.Page(page, size)
+	r, total, err := model.AllAndCount(false)
 	if err != nil {
-		return nil, 0, err
+		return
 	}
-
-	// 分页查询
-	err = model.Order("created_at DESC").
-		Page(page, size).
-		Scan(&list)
-
+	err = r.Structs(&list)
 	return
 }
 
-func (d *composeSessionDao) GetListBySessionId(ctx context.Context, sessionId string, limit int) ([]*entity.ComposeSession, error) {
-	var sessions []*entity.ComposeSession
-	err := gfdb.DB(ctx).Model(ctx, public.TableNameComposeSession).
-		Where(entity.ComposeSessionCol.SessionId, sessionId).
-		WhereNull(entity.ComposeSessionCol.DeletedAt).
-		OrderDesc(entity.ComposeSessionCol.Id).
-		Limit(limit).
-		Scan(&sessions)
-	if err != nil {
-		return nil, err
-	}
-	// 反转成时间正序
-	for i, j := 0, len(sessions)-1; i < j; i, j = i+1, j-1 {
-		sessions[i], sessions[j] = sessions[j], sessions[i]
-	}
-	return sessions, nil
-}
-
-func (d *composeSessionDao) GetById(ctx context.Context, Id int64) (m *entity.ComposeSession, err error) {
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameComposeSession).
-		Where(entity.ComposeSessionCol.Id, Id).
-		One()
+// Get 查询编排会话
+func (d *composeSessionDao) Get(ctx context.Context, req *entity.ComposeSession, fields ...string) (m *entity.ComposeSession, err error) {
+	r, err := gfdb.DB(ctx, public.DbNameModelGateway).Model(ctx, public.TableNameComposeSession).
+		OmitEmpty().
+		Where(entity.ComposeSessionCol.Id, req.Id).
+		Where(entity.ComposeSessionCol.SessionId, req.SessionId).
+		Fields(fields).One()
 	if err != nil {
 		return nil, err
 	}
@@ -88,29 +81,15 @@ func (d *composeSessionDao) GetById(ctx context.Context, Id int64) (m *entity.Co
 	return
 }
 
-func (d *composeSessionDao) GetBySessionId(ctx context.Context, sessionId string) (m *entity.ComposeSession, err error) {
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameComposeSession).
-		Where(entity.ComposeSessionCol.SessionId, sessionId).
-		One()
+// Delete 软删除编排会话
+func (d *composeSessionDao) Delete(ctx context.Context, req *entity.ComposeSession) (rows int64, err error) {
+	r, err := gfdb.DB(ctx, public.DbNameModelGateway).Model(ctx, public.TableNameComposeSession).
+		OmitEmpty().
+		Where(entity.ComposeSessionCol.Id, req.Id).
+		Where(entity.ComposeSessionCol.SessionId, req.SessionId).
+		Delete()
 	if err != nil {
-		return nil, err
-	}
-	if r.IsEmpty() {
-		return nil, nil
-	}
-	err = r.Struct(&m)
-	return
-}
-
-func (d *composeSessionDao) DeleteBySessionId(ctx context.Context, sessionId string) (rows int64, err error) {
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameComposeSession).
-		Where(entity.ComposeSessionCol.SessionId, sessionId).
-		Data(map[string]any{
-			entity.ComposeSessionCol.DeletedAt: "NOW()",
-		}).
-		Update()
-	if err != nil {
-		return 0, err
+		return
 	}
 	return r.RowsAffected()
 }

dao/compose_task_dao.go

@@ -2,47 +2,54 @@ package dao
 
 import (
 	"context"
-
 	"prompts-core/consts/public"
 	"prompts-core/model/entity"
 
 	"gitea.com/red-future/common/db/gfdb"
+	"github.com/gogf/gf/v2/util/gconv"
 )
 
 var ComposeTask = &composeTaskDao{}
 
 type composeTaskDao struct{}
 
-func (d *composeTaskDao) Insert(ctx context.Context, m *entity.ComposeTask) (id int64, err error) {
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameComposeTask).Data(m).Insert()
+// Insert 插入
+func (d *composeTaskDao) Insert(ctx context.Context, req *entity.ComposeTask) (id int64, err error) {
+	var m = new(entity.ComposeTask)
+	err = gconv.Struct(req, &m)
 	if err != nil {
-		return 0, err
+		return
+	}
+	r, err := gfdb.DB(ctx, public.DbNameModelGateway).Model(ctx, public.TableNameComposeTask).
+		Insert(m)
+	if err != nil {
+		return
 	}
 	return r.LastInsertId()
 }
 
-func (d *composeTaskDao) GetByTaskId(ctx context.Context, taskId string) (m *entity.ComposeTask, err error) {
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameComposeTask).
-		Where(entity.ComposeTaskCol.TaskId, taskId).
-		One()
+// Get 获取
+func (d *composeTaskDao) Get(ctx context.Context, req *entity.ComposeTask, fields ...string) (m *entity.ComposeTask, err error) {
+	r, err := gfdb.DB(ctx, public.DbNameModelGateway).Model(ctx, public.TableNameComposeTask).
+		OmitEmpty().
+		Where(entity.ComposeTaskCol.TaskId, req.TaskId).
+		Fields(fields).One()
 	if err != nil {
-		return nil, err
-	}
-	if r.IsEmpty() {
-		return nil, nil
+		return
 	}
 	err = r.Struct(&m)
 	return
 }
 
-func (d *composeTaskDao) UpdateByTaskId(ctx context.Context, taskId string, data map[string]any) (rows int64, err error) {
-	data[entity.ComposeTaskCol.Updater] = ""
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameComposeTask).
-		Where(entity.ComposeTaskCol.TaskId, taskId).
-		Data(data).
+// Update 更新
+func (d *composeTaskDao) Update(ctx context.Context, req *entity.ComposeTask) (rows int64, err error) {
+	r, err := gfdb.DB(ctx, public.DbNameModelGateway).Model(ctx, public.TableNameComposeTask).
+		OmitEmpty().
+		Data(&req).
+		Where(entity.ComposeTaskCol.TaskId, req.TaskId).
 		Update()
 	if err != nil {
-		return 0, err
+		return
 	}
 	return r.RowsAffected()
 }

dao/model_dao.go

@@ -2,62 +2,27 @@ package dao
 
 import (
 	"context"
-	"fmt"
 	"prompts-core/consts/public"
 	"prompts-core/model/entity"
 
 	"gitea.com/red-future/common/db/gfdb"
-	"gitea.com/red-future/common/utils"
 )
 
 var Model = &modelDao{}
 
 type modelDao struct{}
 
-func (d *modelDao) GetByModelName(ctx context.Context, modelName string) (m *entity.AsynchModel, err error) {
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameModel).
-		Where(entity.AsynchModelCol.ModelName, modelName).
-		One()
+// Get 获取模型
+func (d *modelDao) Get(ctx context.Context, req *entity.AsynchModel, fields ...string) (m *entity.AsynchModel, err error) {
+	r, err := gfdb.DB(ctx, public.DbNameModelGateway).Model(ctx, public.TableNameModel).
+		OmitEmpty().
+		Where(entity.AsynchModelCol.Creator, req.Creator).
+		Where(entity.AsynchModelCol.IsChatModel, req.IsChatModel).
+		Where(entity.AsynchModelCol.ModelName, req.ModelName).
+		Fields(fields).One()
 	if err != nil {
-		return nil, err
-	}
-	if r.IsEmpty() {
-		return nil, nil
+		return
 	}
 	err = r.Struct(&m)
 	return
 }
-
-func (d *modelDao) GetByIsChatModel(ctx context.Context) (m *entity.AsynchModel, err error) {
-	userInfo, err := utils.GetUserInfo(ctx)
-	if err != nil {
-		return nil, err
-	}
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameModel).
-		Where(entity.AsynchModelCol.IsChatModel, 1).
-		Where(entity.AsynchModelCol.Creator, userInfo.UserName).
-		One()
-	if err != nil {
-		return nil, err
-	}
-	if r.IsEmpty() {
-		return nil, nil
-	}
-	err = r.Struct(&m)
-	return
-}
-
-// GetBySuperAdmin 查询超级管理员（tenant_id=1）的模型
-func (d *modelDao) GetBySuperAdmin(ctx context.Context, modelName string) (m *entity.AsynchModel, err error) {
-	sql := fmt.Sprintf("SELECT * FROM %s WHERE model_name = ? AND tenant_id = 1 AND deleted_at IS NULL LIMIT 1", public.TableNameModel)
-	r, err := gfdb.DB(ctx).GetAll(ctx, sql, modelName)
-	if err != nil {
-		return nil, err
-	}
-	if len(r) == 0 {
-		return nil, nil
-	}
-
-	err = r[0].Struct(&m)
-	return
-}

dao/prompt_dao.go

@@ -1,97 +0,0 @@
-package dao
-
-import (
-	"context"
-
-	"prompts-core/consts/public"
-	"prompts-core/model/entity"
-
-	"gitea.com/red-future/common/db/gfdb"
-	"github.com/gogf/gf/v2/util/gconv"
-)
-
-var Prompt = &promptDao{}
-
-type promptDao struct{}
-
-func (d *promptDao) Insert(ctx context.Context, m *entity.PromptConfig) (id int64, err error) {
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNamePromptConfig).Data(m).Insert()
-	if err != nil {
-		return 0, err
-	}
-	return r.LastInsertId()
-}
-
-func (d *promptDao) UpdateByID(ctx context.Context, id int64, data map[string]any) (rows int64, err error) {
-	// 触发 gfdb 的 updateHook 自动填充 updater，需要显式带 updater 字段
-	data[entity.PromptConfigCol.Updater] = ""
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNamePromptConfig).
-		Where(entity.PromptConfigCol.Id, id).
-		Data(data).
-		Update()
-	if err != nil {
-		return 0, err
-	}
-	return r.RowsAffected()
-}
-
-func (d *promptDao) DeleteByID(ctx context.Context, id int64) (rows int64, err error) {
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNamePromptConfig).
-		Where(entity.PromptConfigCol.Id, id).
-		Delete()
-	if err != nil {
-		return 0, err
-	}
-	return r.RowsAffected()
-}
-
-func (d *promptDao) GetByID(ctx context.Context, id int64) (m *entity.PromptConfig, err error) {
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNamePromptConfig).
-		Where(entity.PromptConfigCol.Id, id).
-		One()
-	if err != nil {
-		return nil, err
-	}
-	if r.IsEmpty() {
-		return nil, nil
-	}
-	err = r.Struct(&m)
-	return
-}
-
-func (d *promptDao) GetLatestEnabledByModelTypeID(ctx context.Context, modelTypeID int) (m *entity.PromptConfig, err error) {
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNamePromptConfig).
-		Where("deleted_at IS NULL").
-		Where(entity.PromptConfigCol.ModelTypeId, modelTypeID).
-		Where(entity.PromptConfigCol.Enabled, 1).
-		OrderDesc(entity.PromptConfigCol.CreatedAt).
-		One()
-	if err != nil {
-		return nil, err
-	}
-	if r.IsEmpty() {
-		return nil, nil
-	}
-	err = r.Struct(&m)
-	return
-}
-
-func (d *promptDao) List(ctx context.Context, pageNum, pageSize int, modelTypeID *int, modelTypeLike string) (list []*entity.PromptConfig, total int64, err error) {
-	model := gfdb.DB(ctx).Model(ctx, public.TableNamePromptConfig).Where("deleted_at IS NULL").OrderDesc(entity.PromptConfigCol.CreatedAt)
-	if modelTypeID != nil && *modelTypeID > 0 {
-		model = model.Where(entity.PromptConfigCol.ModelTypeId, *modelTypeID)
-	}
-	if modelTypeLike != "" {
-		model = model.WhereLike(entity.PromptConfigCol.ModelType, "%"+modelTypeLike+"%")
-	}
-	if pageNum > 0 && pageSize > 0 {
-		model = model.Page(pageNum, pageSize)
-	}
-	r, totalInt, err := model.AllAndCount(false)
-	if err != nil {
-		return nil, 0, err
-	}
-	total = gconv.Int64(totalInt)
-	err = r.Structs(&list)
-	return
-}

dao/provider_protocol_dao.go

@@ -0,0 +1,91 @@
+package dao
+
+import (
+	"context"
+	"prompts-core/consts/public"
+	"prompts-core/model/entity"
+
+	"gitea.com/red-future/common/db/gfdb"
+)
+
+var ProviderProtocol = &providerProtocolDao{}
+
+type providerProtocolDao struct{}
+
+// Insert 新增协议配置
+func (d *providerProtocolDao) Insert(ctx context.Context, req *entity.ProviderProtocol) (id int64, err error) {
+	r, err := gfdb.DB(ctx, public.DbNameModelGateway).Model(ctx, public.TableNameProviderProtocol).OmitEmpty().Data(req).Insert()
+	if err != nil {
+		return 0, err
+	}
+	return r.LastInsertId()
+}
+
+// Get 查询协议配置
+func (d *providerProtocolDao) Get(ctx context.Context, req *entity.ProviderProtocol, fields ...string) (res *entity.ProviderProtocol, err error) {
+	r, err := gfdb.DB(ctx, public.DbNameModelGateway).Model(ctx, public.TableNameProviderProtocol).
+		NoTenantId(ctx).
+		OmitEmpty().
+		Where(entity.ProviderProtocolCol.Id, req.Id).
+		Where(entity.ProviderProtocolCol.ProviderName, req.ProviderName). //主要是根据运营商查询
+		Where(entity.ProviderProtocolCol.Status, 1).
+		Fields(fields).One()
+	if err != nil {
+		return nil, err
+	}
+	if r.IsEmpty() {
+		return nil, nil
+	}
+	err = r.Struct(&res)
+	return
+}
+
+// List 列表查询
+func (d *providerProtocolDao) List(ctx context.Context, req *entity.ProviderProtocol, page, size int, fields ...string) (list []*entity.ProviderProtocol, total int, err error) {
+	if page <= 0 {
+		page = 1
+	}
+	if size <= 0 {
+		size = 10
+	}
+	model := gfdb.DB(ctx, public.DbNameModelGateway).Model(ctx, public.TableNameProviderProtocol).
+		Fields(fields).
+		OmitEmpty()
+	model.Where(entity.ProviderProtocolCol.ProviderName, req.ProviderName)
+	model.Where(entity.ProviderProtocolCol.Status, req.Status)
+	model.OrderDesc(entity.ProviderProtocolCol.CreatedAt)
+	model.Page(page, size)
+	r, total, err := model.AllAndCount(false)
+	if err != nil {
+		return
+	}
+	err = r.Structs(&list)
+	return
+}
+
+// Update 更新协议配置
+func (d *providerProtocolDao) Update(ctx context.Context, req *entity.ProviderProtocol) (rows int64, err error) {
+	r, err := gfdb.DB(ctx, public.DbNameModelGateway).Model(ctx, public.TableNameProviderProtocol).
+		OmitEmpty().
+		Where(entity.ProviderProtocolCol.Id, req.Id).
+		Data(req).
+		Update()
+	if err != nil {
+		return 0, err
+	}
+	return r.RowsAffected()
+}
+
+// Delete 软删除协议配置
+func (d *providerProtocolDao) Delete(ctx context.Context, id int64) (rows int64, err error) {
+	r, err := gfdb.DB(ctx, public.DbNameModelGateway).Model(ctx, public.TableNameProviderProtocol).
+		Where(entity.ProviderProtocolCol.Id, id).
+		Data(map[string]any{
+			entity.ProviderProtocolCol.DeletedAt: "NOW()",
+		}).
+		Update()
+	if err != nil {
+		return 0, err
+	}
+	return r.RowsAffected()
+}