fix

Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: 5e50a3782f

api/desc/core/pcm-core.api

@@ -166,6 +166,18 @@ type (
         ReqBody     []string `json:"reqBody"`
 		Replicas    int64      `json:"replicas,string"`
     }
+
+	PodLogsReq {
+		TaskId string `json:"taskId"`
+		TaskName string `json:"taskName"`
+		ClusterId string `json:"clusterId"`
+		ClusterName string `json:"clusterName"`
+		AdapterId string `json:"adapterId"`
+		AdapterName string `json:"adapterName"`
+		PodName string  `json:"podName"`
+		stream  bool `json:"stream"`
+	
+	}
 )
 
 type deleteTaskReq {

api/desc/pcm.api

@@ -231,6 +231,9 @@ service pcm {
 	@doc "Create cloud computing common tasks"
 	@handler commitGeneralTask
 	post /cloud/task/create (GeneralTaskReq) returns ()
+
+	@handler podLogs
+	post /cloud/pod/logs (PodLogsReq) returns (string)
 }
 
 //智算二级接口

api/internal/handler/cloud/podlogshandler.go

@@ -0,0 +1,24 @@
+package cloud
+
+import (
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/logic/cloud"
+	"gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc"
+	"gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result"
+	"net/http"
+)
+
+func PodLogsHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.PodLogsReq
+		if err := httpx.Parse(r, &req); err != nil {
+			result.ParamErrorResult(r, w, err)
+			return
+		}
+
+		l := cloud.NewPodLogsLogic(r.Context(), svcCtx, w)
+		resp, err := l.PodLogs(&req, w)
+		result.HttpResult(r, w, resp, err)
+	}
+}

api/internal/handler/routes.go

@@ -277,6 +277,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/cloud/task/create",
 				Handler: cloud.CommitGeneralTaskHandler(serverCtx),
 			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/cloud/pod/logs",
+				Handler: cloud.PodLogsHandler(serverCtx),
+			},
 		},
 		rest.WithPrefix("/pcm/v1"),
 	)

api/internal/logic/cloud/commitgeneraltasklogic.go

@@ -99,6 +99,8 @@ func (l *CommitGeneralTaskLogic) CommitGeneralTask(req *types.GeneralTaskReq) er
 		Strategy:        strategy,
 	}
 	var taskClouds []cloud.TaskCloudModel
+	adapterName := ""
+	tx.Table("t_adapter").Select("name").Where("id=?", adapterId).Find(&adapterName)
 	for _, r := range rs {
 		for _, s := range req.ReqBody {
 			sStruct := UnMarshalK8sStruct(s, int64(r.Replica))
@@ -107,6 +109,7 @@ func (l *CommitGeneralTaskLogic) CommitGeneralTask(req *types.GeneralTaskReq) er
 			taskCloud.TaskId = uint(taskModel.Id)
 			clusterId, _ := strconv.ParseUint(r.ClusterId, 10, 64)
 			taskCloud.AdapterId = uint(adapterId)
+			taskCloud.AdapterName = adapterName
 			taskCloud.ClusterId = uint(clusterId)
 			taskCloud.ClusterName = r.ClusterName
 			taskCloud.Status = constants.Saved
@@ -116,8 +119,6 @@ func (l *CommitGeneralTaskLogic) CommitGeneralTask(req *types.GeneralTaskReq) er
 			taskClouds = append(taskClouds, taskCloud)
 		}
 	}
-	adapterName := ""
-	tx.Table("t_adapter").Select("name").Where("id=?", adapterId).Find(&adapterName)
 	noticeInfo := clientCore.NoticeInfo{
 		AdapterId:   int64(adapterId),
 		AdapterName: adapterName,

api/internal/logic/cloud/podlogslogic.go

@@ -0,0 +1,30 @@
+package cloud
+
+import (
+	"context"
+	"github.com/zeromicro/go-zero/core/logx"
+	"gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc"
+	"gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types"
+	"net/http"
+)
+
+type PodLogsLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	w      http.ResponseWriter
+}
+
+func NewPodLogsLogic(ctx context.Context, svcCtx *svc.ServiceContext, w http.ResponseWriter) *PodLogsLogic {
+	return &PodLogsLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		w:      w,
+	}
+}
+
+func (l *PodLogsLogic) PodLogs(req *types.PodLogsReq, w http.ResponseWriter) (resp string, err error) {
+	// todo: add your logic here and delete this line
+	return
+}

api/internal/logic/core/pagelisttasklogic.go

@@ -2,13 +2,12 @@ package core
 
 import (
 	"context"
+	"gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc"
+	"gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types"
 	"gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result"
 	"gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils/timeutils"
 	"time"
 
-	"gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc"
-	"gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types"
-
 	"github.com/zeromicro/go-zero/core/logx"
 )
 
@@ -51,15 +50,15 @@ func (l *PageListTaskLogic) PageListTask(req *types.PageTaskReq) (resp *types.Pa
 		return nil, result.NewDefaultError(err.Error())
 	}
 	for _, model := range list {
-		if model.EndTime != "" && model.StartTime != "" {
+		if model.StartTime != "" && model.EndTime == "" {
+			startTime := timeutils.TimeStringToGoTime(model.StartTime)
+			model.RunningTime = int64(time.Now().Sub(startTime).Seconds())
+		}
+		if model.StartTime != "" && model.EndTime != "" {
 			startTime := timeutils.TimeStringToGoTime(model.StartTime)
 			endTime := timeutils.TimeStringToGoTime(model.EndTime)
 			model.RunningTime = int64(endTime.Sub(startTime).Seconds())
 		}
-		if model.StartTime != "" {
-			startTime := timeutils.TimeStringToGoTime(model.StartTime)
-			model.RunningTime = int64(time.Now().Sub(startTime).Seconds())
-		}
 	}
 	resp.List = &list
 	resp.PageSize = req.PageSize

api/internal/types/types.go

@@ -150,6 +150,17 @@ type GeneralTaskReq struct {
 	Replicas        int64            `json:"replicas,string"`
 }
 
+type PodLogsReq struct {
+	TaskId      string `json:"taskId"`
+	TaskName    string `json:"taskName"`
+	ClusterId   string `json:"clusterId"`
+	ClusterName string `json:"clusterName"`
+	AdapterId   string `json:"adapterId"`
+	AdapterName string `json:"adapterName"`
+	PodName     string `json:"podName"`
+	Stream      bool   `json:"stream"`
+}
+
 type DeleteTaskReq struct {
 	Id int64 `path:"id"`
 }
@@ -938,6 +949,184 @@ type ListResult struct {
 	List interface{} `json:"list,omitempty"`
 }
 
+type HpcInfo struct {
+	Id          int64  `json:"id"`           // id
+	TaskId      int64  `json:"task_id"`      // 任务id
+	JobId       string `json:"job_id"`       // 作业id(在第三方系统中的作业id)
+	AdapterId   int64  `json:"adapter_id"`   // 执行任务的适配器id
+	ClusterId   int64  `json:"cluster_id"`   // 执行任务的集群id
+	ClusterType string `json:"cluster_type"` // 执行任务的集群类型
+	Name        string `json:"name"`         // 名称
+	Status      string `json:"status"`       // 状态
+	CmdScript   string `json:"cmd_script"`
+	StartTime   string `json:"start_time"`   // 开始时间
+	RunningTime int64  `json:"running_time"` // 运行时间
+	DerivedEs   string `json:"derived_es"`
+	Cluster     string `json:"cluster"`
+	BlockId     int64  `json:"block_id"`
+	AllocNodes  int64  `json:"alloc_nodes"`
+	AllocCpu    int64  `json:"alloc_cpu"`
+	CardCount   int64  `json:"card_count"` // 卡数
+	Version     string `json:"version"`
+	Account     string `json:"account"`
+	WorkDir     string `json:"work_dir"` // 工作路径
+	AssocId     int64  `json:"assoc_id"`
+	ExitCode    int64  `json:"exit_code"`
+	WallTime    string `json:"wall_time"`  // 最大运行时间
+	Result      string `json:"result"`     // 运行结果
+	DeletedAt   string `json:"deleted_at"` // 删除时间
+	YamlString  string `json:"yaml_string"`
+	AppType     string `json:"app_type"`     // 	应用类型
+	AppName     string `json:"app_name"`     // 	应用名称
+	Queue       string `json:"queue"`        // 队列名称
+	SubmitType  string `json:"submit_type"`  // cmd（命令行模式）
+	NNode       string `json:"n_node"`       // 节点个数（当指定该参数时，GAP_NODE_STRING必须为""）
+	StdOutFile  string `json:"std_out_file"` // 工作路径/std.err.%j
+	StdErrFile  string `json:"std_err_file"` // 工作路径/std.err.%j
+	StdInput    string `json:"std_input"`
+	Environment string `json:"environment"`
+	DeletedFlag int64  `json:"deleted_flag"` // 是否删除（0-否，1-是）
+	CreatedBy   int64  `json:"created_by"`   // 创建人
+	CreateTime  string `json:"created_time"` // 创建时间
+	UpdatedBy   int64  `json:"updated_by"`   // 更新人
+	UpdateTime  string `json:"updated_time"` // 更新时间
+}
+
+type CloudInfo struct {
+	Participant int64  `json:"participant,omitempty"`
+	Id          int64  `json:"id,omitempty"`
+	TaskId      int64  `json:"taskId,omitempty"`
+	ApiVersion  string `json:"apiVersion,omitempty"`
+	Kind        string `json:"kind,omitempty"`
+	Namespace   string `json:"namespace,omitempty"`
+	Name        string `json:"name,omitempty"`
+	Status      string `json:"status,omitempty"`
+	StartTime   string `json:"startTime,omitempty"`
+	RunningTime int64  `json:"runningTime,omitempty"`
+	Result      string `json:"result,omitempty"`
+	YamlString  string `json:"yamlString,omitempty"`
+}
+
+type AiInfo struct {
+	ParticipantId  int64  `json:"participantId,omitempty"`
+	TaskId         int64  `json:"taskId,omitempty"`
+	ProjectId      string `json:"project_id,omitempty"`
+	Name           string `json:"name,omitempty"`
+	Status         string `json:"status,omitempty"`
+	StartTime      string `json:"startTime,omitempty"`
+	RunningTime    int64  `json:"runningTime,omitempty"`
+	Result         string `json:"result,omitempty"`
+	JobId          string `json:"jobId,omitempty"`
+	CreateTime     string `json:"createTime,omitempty"`
+	ImageUrl       string `json:"imageUrl,omitempty"`
+	Command        string `json:"command,omitempty"`
+	FlavorId       string `json:"flavorId,omitempty"`
+	SubscriptionId string `json:"subscriptionId,omitempty"`
+	ItemVersionId  string `json:"itemVersionId,omitempty"`
+}
+
+type VmInfo struct {
+	ParticipantId       int64  `json:"participantId,omitempty"`
+	TaskId              int64  `json:"taskId,omitempty"`
+	Name                string `json:"name,omitempty"`
+	FlavorRef           string `json:"flavor_ref,omitempty"`
+	ImageRef            string `json:"image_ref,omitempty"`
+	NetworkUuid         string `json:"network_uuid,omitempty"`
+	BlockUuid           string `json:"block_uuid,omitempty"`
+	SourceType          string `json:"source_type,omitempty"`
+	DeleteOnTermination bool   `json:"delete_on_termination,omitempty"`
+	Status              string `json:"status,omitempty"`
+	MinCount            string `json:"min_count,omitempty"`
+	Platform            string `json:"platform,omitempty"`
+	Uuid                string `json:"uuid,omitempty"`
+}
+
+type PullTaskInfoReq struct {
+	AdapterId int64 `form:"adapterId"`
+}
+
+type PullTaskInfoResp struct {
+	HpcInfoList   []*HpcInfo   `json:"HpcInfoList,omitempty"`
+	CloudInfoList []*CloudInfo `json:"CloudInfoList,omitempty"`
+	AiInfoList    []*AiInfo    `json:"AiInfoList,omitempty"`
+	VmInfoList    []*VmInfo    `json:"VmInfoList,omitempty"`
+}
+
+type PushTaskInfoReq struct {
+	AdapterId     int64        `json:"adapterId"`
+	HpcInfoList   []*HpcInfo   `json:"hpcInfoList"`
+	CloudInfoList []*CloudInfo `json:"cloudInfoList"`
+	AiInfoList    []*AiInfo    `json:"aiInfoList"`
+	VmInfoList    []*VmInfo    `json:"vmInfoList"`
+}
+
+type PushTaskInfoResp struct {
+	Code int64  `json:"code"`
+	Msg  string `json:"msg"`
+}
+
+type PushResourceInfoReq struct {
+	AdapterId     int64           `json:"adapterId"`
+	ResourceStats []ResourceStats `json:"resourceStats"`
+}
+
+type PushResourceInfoResp struct {
+	Code int64  `json:"code"`
+	Msg  string `json:"msg"`
+}
+
+type NoticeInfo struct {
+	AdapterId   int64  `json:"adapterId"`
+	AdapterName string `json:"adapterName"`
+	ClusterId   int64  `json:"clusterId"`
+	ClusterName string `json:"clusterName"`
+	NoticeType  string `json:"noticeType"`
+	TaskName    string `json:"taskName"`
+	Incident    string `json:"incident"`
+}
+
+type ListNoticeReq struct {
+}
+
+type ListNoticeResp struct {
+	Code int64        `json:"code"`
+	Msg  string       `json:"msg"`
+	Data []NoticeInfo `json:"data"`
+}
+
+type PushNoticeReq struct {
+	NoticeInfo NoticeInfo `json:"noticeInfo"`
+}
+
+type PushNoticeResp struct {
+	Code int64  `json:"code"`
+	Msg  string `json:"msg"`
+}
+
+type ResourceStats struct {
+	ClusterId    int64   `json:"clusterId"`
+	Name         string  `json:"name"`
+	CpuCoreAvail int64   `json:"cpuCoreAvail"`
+	CpuCoreTotal int64   `json:"cpuCoreTotal"`
+	MemAvail     float64 `json:"memAvail"`
+	MemTotal     float64 `json:"memTotal"`
+	DiskAvail    float64 `json:"diskAvail"`
+	DiskTotal    float64 `json:"diskTotal"`
+	GpuAvail     int64   `json:"gpuAvail"`
+	CardsAvail   []*Card `json:"cardsAvail"`
+	CpuCoreHours float64 `json:"cpuCoreHours"`
+	Balance      float64 `json:"balance"`
+}
+
+type Card struct {
+	Platform   string  `json:"platform"`
+	Type       string  `json:"type"`
+	Name       string  `json:"name"`
+	TOpsAtFp16 float64 `json:"TOpsAtFp16"`
+	CardHours  float64 `json:"cardHours"`
+	CardNum    int32   `json:"cardNum"`
+}
+
 type TaskStatusResp struct {
 	Succeeded int `json:"Succeeded"`
 	Failed    int `json:"Failed"`

pkg/models/cloud/task_cloud.go

@@ -8,6 +8,7 @@ import (
 type TaskCloudModel struct {
 	Id          uint       `json:"id" gorm:"primarykey;not null;comment:id"`
 	TaskId      uint       `json:"taskId" gorm:"not null;comment:task表id"`
+	AdapterName string     `json:"adapterName" gorm:"not null;comment:适配器名称"`
 	AdapterId   uint       `json:"adapterId" gorm:"not null;comment:适配器id"`
 	ClusterId   uint       `json:"clusterId" gorm:"not null;comment:集群id"`
 	ClusterName string     `json:"clusterName" gorm:"not null;comment:集群名称"`