forked from JointCloud/pcm-coordinator
新增大屏任务列表接口
This commit is contained in:
parent
004c1dc7b9
commit
ce102c300a
|
@ -135,6 +135,10 @@ service pcm {
|
|||
@handler pageListTaskHandler
|
||||
get /core/task/list (pageTaskReq) returns (PageResult)
|
||||
|
||||
@doc "paging queries the task list"
|
||||
@handler ScreenPageTaskHandler
|
||||
get /core/task/screen (pageTaskReq) returns (PageResult)
|
||||
|
||||
@doc "Statistical task status"
|
||||
@handler countTaskStatus
|
||||
get /core/task/countTaskStatus returns (TaskStatusResp)
|
||||
|
|
|
@ -0,0 +1,34 @@
|
|||
package core
|
||||
|
||||
import (
|
||||
"gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result"
|
||||
"gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils"
|
||||
"net/http"
|
||||
|
||||
"github.com/zeromicro/go-zero/rest/httpx"
|
||||
"gitlink.org.cn/JointCloud/pcm-coordinator/internal/logic/core"
|
||||
"gitlink.org.cn/JointCloud/pcm-coordinator/internal/svc"
|
||||
"gitlink.org.cn/JointCloud/pcm-coordinator/internal/types"
|
||||
)
|
||||
|
||||
func ScreenPageTaskHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var req types.PageTaskReq
|
||||
if err := httpx.Parse(r, &req); err != nil {
|
||||
result.ParamErrorResult(r, w, err)
|
||||
return
|
||||
}
|
||||
token := r.Header.Get("Authorization")
|
||||
// 获取用户信息
|
||||
jccUserInfo, err := utils.ParseTokenWithoutVerify(token)
|
||||
if err != nil {
|
||||
result.ParamErrorResult(r, w, err)
|
||||
return
|
||||
}
|
||||
req.UserId = jccUserInfo.Id
|
||||
req.UserName = jccUserInfo.UserName
|
||||
l := core.NewScreenPageTaskLogic(r.Context(), svcCtx)
|
||||
resp, err := l.ScreenPageTask(&req)
|
||||
result.HttpResult(r, w, resp, err)
|
||||
}
|
||||
}
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,77 @@
|
|||
package core
|
||||
|
||||
import (
|
||||
"context"
|
||||
"gitlink.org.cn/JointCloud/pcm-coordinator/internal/scheduler/service/utils/status"
|
||||
"gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result"
|
||||
|
||||
"gitlink.org.cn/JointCloud/pcm-coordinator/internal/svc"
|
||||
"gitlink.org.cn/JointCloud/pcm-coordinator/internal/types"
|
||||
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
)
|
||||
|
||||
type ScreenPageTaskLogic struct {
|
||||
logx.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
taskStatus *status.TaskStatus
|
||||
}
|
||||
|
||||
func NewScreenPageTaskLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ScreenPageTaskLogic {
|
||||
return &ScreenPageTaskLogic{
|
||||
Logger: logx.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
func (l *ScreenPageTaskLogic) ScreenPageTask(req *types.PageTaskReq) (resp *types.PageResult, err error) {
|
||||
res := &types.PageResult{}
|
||||
// 检查请求参数的有效性
|
||||
if req.PageSize <= 0 || req.PageNum <= 0 {
|
||||
return nil, result.NewDefaultError("Invalid page size or page number")
|
||||
}
|
||||
|
||||
limit := req.PageSize
|
||||
offset := req.PageSize * (req.PageNum - 1)
|
||||
var list []*types.TaskModel
|
||||
|
||||
// 构建数据库查询
|
||||
db := l.svcCtx.DbEngin.Model(&types.TaskModel{}).Table("task")
|
||||
|
||||
db = db.Where("deleted_at is null")
|
||||
if req.Name != "" {
|
||||
db = db.Where("name LIKE ?", "%"+req.Name+"%")
|
||||
}
|
||||
if req.Type != "" {
|
||||
db = db.Where("adapter_type_dict = ?", req.Type)
|
||||
}
|
||||
// 计算总数
|
||||
var total int64
|
||||
if err := db.Count(&total).Error; err != nil {
|
||||
return nil, result.NewDefaultError(err.Error())
|
||||
}
|
||||
|
||||
// 查询任务列表
|
||||
if err := db.Limit(limit).Offset(offset).Order("created_time desc").Find(&list).Error; err != nil {
|
||||
return nil, result.NewDefaultError(err.Error())
|
||||
}
|
||||
|
||||
// 更新智算任务状态
|
||||
go l.taskStatus.UpdateTaskStatus(list)
|
||||
go l.taskStatus.UpdateAiTaskStatus(list)
|
||||
|
||||
// 计算每个任务的运行时间x
|
||||
for _, model := range list {
|
||||
model.RunningTime = calculateRunningTime(model.StartTime, model.EndTime)
|
||||
}
|
||||
|
||||
// 填充响应数据
|
||||
res.List = &list
|
||||
res.PageSize = req.PageSize
|
||||
res.PageNum = req.PageNum
|
||||
res.Total = total
|
||||
|
||||
return res, nil
|
||||
}
|
Loading…
Reference in New Issue