feat: flow design & page query refactor

server/internal/flow/application/procinst.go

@@ -2,67 +2,46 @@ package application
 
 import (
 	"context"
-	"fmt"
-	"mayfly-go/internal/event"
 	"mayfly-go/internal/flow/application/dto"
 	"mayfly-go/internal/flow/domain/entity"
 	"mayfly-go/internal/flow/domain/repository"
 	"mayfly-go/internal/flow/imsg"
-	msgdto "mayfly-go/internal/msg/application/dto"
 	"mayfly-go/internal/pkg/consts"
 	"mayfly-go/pkg/base"
 	"mayfly-go/pkg/contextx"
 	"mayfly-go/pkg/errorx"
-	"mayfly-go/pkg/global"
-	"mayfly-go/pkg/i18n"
 	"mayfly-go/pkg/logx"
 	"mayfly-go/pkg/model"
 	"mayfly-go/pkg/utils/anyx"
 	"mayfly-go/pkg/utils/jsonx"
 	"mayfly-go/pkg/utils/stringx"
-
-	"github.com/may-fly/cast"
 )
 
 type Procinst interface {
 	base.App[*entity.Procinst]
 
-	GetPageList(condition *entity.ProcinstQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
-
-	// 获取流程实例审批节点任务
-	GetProcinstTasks(condition *entity.ProcinstTaskQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.ProcinstQuery, orderBy ...string) (*model.PageResult[*entity.Procinst], error)
 
 	// StartProc 根据流程定义启动一个流程实例
 	StartProc(ctx context.Context, procdefId uint64, reqParam *dto.StarProc) (*entity.Procinst, error)
 
-	// 取消流程
+	// CancelProc 取消流程
 	CancelProc(ctx context.Context, procinstId uint64) error
 
-	// 完成任务
-	CompleteTask(ctx context.Context, taskId uint64, remark string) error
-
-	// 拒绝任务
-	RejectTask(ctx context.Context, taskId uint64, remark string) error
-
-	// 驳回任务（允许重新提交）
-	BackTask(ctx context.Context, taskId uint64, remark string) error
+	// CompletedProc 完成流程
+	CompletedProc(ctx context.Context, procinstId uint64) error
 }
 
 type procinstAppImpl struct {
 	base.AppImpl[*entity.Procinst, repository.Procinst]
 
-	procinstTaskRepo repository.ProcinstTask `inject:"T"`
-	procdefApp       Procdef                 `inject:"T"`
+	procdefApp Procdef `inject:"T"`
 }
 
 var _ (Procinst) = (*procinstAppImpl)(nil)
 
-func (p *procinstAppImpl) GetPageList(condition *entity.ProcinstQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return p.Repo.GetPageList(condition, pageParam, toEntity, orderBy...)
-}
-
-func (p *procinstAppImpl) GetProcinstTasks(condition *entity.ProcinstTaskQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return p.procinstTaskRepo.GetPageList(condition, pageParam, toEntity, orderBy...)
+func (p *procinstAppImpl) GetPageList(condition *entity.ProcinstQuery, orderBy ...string) (*model.PageResult[*entity.Procinst], error) {
+	return p.Repo.GetPageList(condition, orderBy...)
 }
 
 func (p *procinstAppImpl) StartProc(ctx context.Context, procdefId uint64, reqParam *dto.StarProc) (*entity.Procinst, error) {
@@ -74,6 +53,9 @@ func (p *procinstAppImpl) StartProc(ctx context.Context, procdefId uint64, reqPa
 	if procdef.Status != entity.ProcdefStatusEnable {
 		return nil, errorx.NewBizI(ctx, imsg.ErrProcdefNotEnable)
 	}
+	if flowdef := procdef.GetFlowDef(); flowdef == nil || len(flowdef.Nodes) == 0 {
+		return nil, errorx.NewBizI(ctx, imsg.ErrProcdefFlowNotExist)
+	}
 
 	bizKey := reqParam.BizKey
 	if bizKey == "" {
@@ -88,15 +70,15 @@ func (p *procinstAppImpl) StartProc(ctx context.Context, procdefId uint64, reqPa
 		ProcdefName: procdef.Name,
 		Remark:      reqParam.Remark,
 		Status:      entity.ProcinstStatusActive,
+		FlowDef:     procdef.FlowDef,
 	}
 
-	task := p.getNextTask(procdef, "")
-	procinst.TaskKey = task.TaskKey
-
-	if err := p.Save(ctx, procinst); err != nil {
-		return nil, err
-	}
-	return procinst, p.createProcinstTask(ctx, procinst, task)
+	return procinst, p.Tx(ctx, func(ctx context.Context) error {
+		if err := p.Save(ctx, procinst); err != nil {
+			return err
+		}
+		return flowEventBus.PublishSync(ctx, EventTopicFlowProcinstCreate, procinst)
+	})
 }
 
 func (p *procinstAppImpl) CancelProc(ctx context.Context, procinstId uint64) error {
@@ -117,119 +99,35 @@ func (p *procinstAppImpl) CancelProc(ctx context.Context, procinstId uint64) err
 	procinst.SetEnd()
 
 	return p.Tx(ctx, func(ctx context.Context) error {
-		return p.cancelInstTasks(ctx, procinstId, i18n.T(imsg.ErrProcinstCancelled))
-	}, func(ctx context.Context) error {
-		return p.Save(ctx, procinst)
-	}, func(ctx context.Context) error {
-		return p.triggerProcinstStatusChangeEvent(ctx, procinst)
-	})
-}
-
-func (p *procinstAppImpl) CompleteTask(ctx context.Context, instTaskId uint64, remark string) error {
-	instTask, err := p.getAndValidInstTask(ctx, instTaskId)
-	if err != nil {
-		return err
-	}
-
-	// 赋值状态和备注
-	instTask.Status = entity.ProcinstTaskStatusPass
-	instTask.Remark = remark
-	instTask.SetEnd()
-
-	procinst, _ := p.GetById(instTask.ProcinstId)
-	procdef, _ := p.procdefApp.GetById(procinst.ProcdefId)
-
-	// 获取下一实例审批任务
-	task := p.getNextTask(procdef, instTask.TaskKey)
-	if task == nil {
-		procinst.Status = entity.ProcinstStatusCompleted
-		procinst.SetEnd()
-	} else {
-		procinst.TaskKey = task.TaskKey
-
-	}
-
-	return p.Tx(ctx, func(ctx context.Context) error {
-		return p.UpdateById(ctx, procinst)
-	}, func(ctx context.Context) error {
-		return p.procinstTaskRepo.UpdateById(ctx, instTask)
-	}, func(ctx context.Context) error {
-		return p.createProcinstTask(ctx, procinst, task)
-	}, func(ctx context.Context) error {
-		// 下一审批节点任务不存在，说明该流程已结束
-		if task == nil {
-			return p.triggerProcinstStatusChangeEvent(ctx, procinst)
+		if err := p.Save(ctx, procinst); err != nil {
+			return err
 		}
-		return nil
+
+		return flowEventBus.PublishSync(ctx, EventTopicFlowProcinstCancel, procinstId)
 	})
 }
 
-func (p *procinstAppImpl) RejectTask(ctx context.Context, instTaskId uint64, remark string) error {
-	instTask, err := p.getAndValidInstTask(ctx, instTaskId)
+func (p *procinstAppImpl) CompletedProc(ctx context.Context, procinstId uint64) error {
+	procinst, err := p.GetById(procinstId)
 	if err != nil {
 		return err
 	}
+	// 已完成或已终止，则不进行后续处理
+	if procinst.Status == entity.ProcinstStatusCompleted || procinst.Status == entity.ProcinstStatusTerminated {
+		return nil
+	}
 
-	// 赋值状态和备注
-	instTask.Status = entity.ProcinstTaskStatusReject
-	instTask.Remark = remark
-	instTask.SetEnd()
-
-	procinst, _ := p.GetById(instTask.ProcinstId)
-	// 更新流程实例为终止状态，无法重新提交
-	procinst.Status = entity.ProcinstStatusTerminated
-	procinst.BizStatus = entity.ProcinstBizStatusNo
+	procinst.Status = entity.ProcinstStatusCompleted
 	procinst.SetEnd()
 
-	return p.Tx(ctx, func(ctx context.Context) error {
-		return p.UpdateById(ctx, procinst)
-	}, func(ctx context.Context) error {
-		return p.procinstTaskRepo.UpdateById(ctx, instTask)
-	}, func(ctx context.Context) error {
-		return p.triggerProcinstStatusChangeEvent(ctx, procinst)
-	})
+	// 业务处理
+	p.bizHandle(ctx, procinst)
+
+	return p.Save(ctx, procinst)
 }
 
-func (p *procinstAppImpl) BackTask(ctx context.Context, instTaskId uint64, remark string) error {
-	instTask, err := p.getAndValidInstTask(ctx, instTaskId)
-	if err != nil {
-		return err
-	}
-
-	// 赋值状态和备注
-	instTask.Status = entity.ProcinstTaskStatusBack
-	instTask.Remark = remark
-
-	procinst, _ := p.GetById(instTask.ProcinstId)
-
-	// 更新流程实例为挂起状态，等待重新提交
-	procinst.Status = entity.ProcinstStatusSuspended
-
-	return p.Tx(ctx, func(ctx context.Context) error {
-		return p.UpdateById(ctx, procinst)
-	}, func(ctx context.Context) error {
-		return p.procinstTaskRepo.UpdateById(ctx, instTask)
-	}, func(ctx context.Context) error {
-		return p.triggerProcinstStatusChangeEvent(ctx, procinst)
-	})
-}
-
-// 取消处理中的流程实例任务
-func (p *procinstAppImpl) cancelInstTasks(ctx context.Context, procinstId uint64, cancelReason string) error {
-	// 流程实例任务信息
-	instTasks, _ := p.procinstTaskRepo.SelectByCond(&entity.ProcinstTask{ProcinstId: procinstId, Status: entity.ProcinstTaskStatusProcess})
-	for _, instTask := range instTasks {
-		instTask.Status = entity.ProcinstTaskStatusCanceled
-		instTask.Remark = cancelReason
-		instTask.SetEnd()
-		p.procinstTaskRepo.UpdateById(ctx, instTask)
-	}
-	return nil
-}
-
-// 触发流程实例状态改变事件
-func (p *procinstAppImpl) triggerProcinstStatusChangeEvent(ctx context.Context, procinst *entity.Procinst) error {
-
+// 业务处理
+func (p *procinstAppImpl) bizHandle(ctx context.Context, procinst *entity.Procinst) {
 	handleRes, err := FlowBizHandle(ctx, &BizHandleParam{
 		Procinst: *procinst,
 	})
@@ -239,100 +137,17 @@ func (p *procinstAppImpl) triggerProcinstStatusChangeEvent(ctx context.Context,
 	}
 
 	if err != nil {
-		// 业务处理错误，非完成状态则终止流程
-		if procinst.Status != entity.ProcinstStatusCompleted {
-			procinst.Status = entity.ProcinstStatusTerminated
-			procinst.SetEnd()
-			p.cancelInstTasks(ctx, procinst.Id, i18n.T(imsg.ErrBizHandlerFail))
-		}
 		procinst.BizStatus = entity.ProcinstBizStatusFail
 		if procinst.BizHandleRes == "" {
 			procinst.BizHandleRes = err.Error()
 		} else {
 			logx.Errorf("process business [%s] processing failed: %v", procinst.BizKey, err.Error())
 		}
-		return p.UpdateById(ctx, procinst)
+		return
 	}
 
-	// 处理成功，并且状态为完成，则更新业务状态为成功
-	if procinst.Status == entity.ProcinstStatusCompleted {
-		procinst.BizStatus = entity.ProcinstBizStatusSuccess
-		if procinst.BizHandleRes == "" {
-			procinst.BizHandleRes = "success"
-		}
-		return p.UpdateById(ctx, procinst)
+	procinst.BizStatus = entity.ProcinstBizStatusSuccess
+	if procinst.BizHandleRes == "" {
+		procinst.BizHandleRes = "success"
 	}
-	return err
-}
-
-// 获取并校验实例任务
-func (p *procinstAppImpl) getAndValidInstTask(ctx context.Context, instTaskId uint64) (*entity.ProcinstTask, error) {
-	instTask, err := p.procinstTaskRepo.GetById(instTaskId)
-	if err != nil {
-		return nil, errorx.NewBiz("procinst not found")
-	}
-
-	la := contextx.GetLoginAccount(ctx)
-	if instTask.Assignee != fmt.Sprintf("%d", la.Id) {
-		return nil, errorx.NewBiz("the current user is not a task handler and cannot complete the task")
-	}
-
-	return instTask, nil
-}
-
-// 创建流程实例节点任务
-func (p *procinstAppImpl) createProcinstTask(ctx context.Context, procinst *entity.Procinst, task *entity.ProcdefTask) error {
-	if task == nil {
-		return nil
-	}
-
-	procinstTask := &entity.ProcinstTask{
-		ProcinstId: procinst.Id,
-		Status:     entity.ProcinstTaskStatusProcess,
-
-		TaskKey:  task.TaskKey,
-		TaskName: task.Name,
-		Assignee: task.UserId,
-	}
-
-	if err := p.procinstTaskRepo.Insert(ctx, procinstTask); err != nil {
-		return err
-	}
-
-	// 发送通知消息
-	global.EventBus.Publish(ctx, event.EventTopicBizMsgTmplSend, msgdto.BizMsgTmplSend{
-		BizType: FlowTaskNotifyBizKey,
-		BizId:   procinst.ProcdefId,
-		Params: map[string]any{
-			"creator":        procinst.Creator,
-			"procdefName":    procinst.ProcdefName,
-			"bizKey":         procinst.BizKey,
-			"taskName":       task.Name,
-			"procinstRemark": procinst.Remark,
-		},
-		ReceiverIds: []uint64{cast.ToUint64(task.UserId)},
-	})
-
-	return nil
-}
-
-// 获取下一审批节点任务
-func (p *procinstAppImpl) getNextTask(procdef *entity.Procdef, nowTaskKey string) *entity.ProcdefTask {
-	tasks := procdef.GetTasks()
-	if len(tasks) == 0 {
-		return nil
-	}
-
-	if nowTaskKey == "" {
-		// nowTaskKey为空，则说明为刚启动该流程实例
-		return tasks[0]
-	}
-
-	for index, t := range tasks {
-		if (t.TaskKey == nowTaskKey) && (index < len(tasks)-1) {
-			return tasks[index+1]
-		}
-	}
-
-	return nil
 }