From bd7b0cee71f306969a97e47c8c3df774c608fdea Mon Sep 17 00:00:00 2001 From: tzwang Date: Fri, 15 Sep 2023 10:00:11 +0800 Subject: [PATCH] =?UTF-8?q?pcm=20api=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 528898e30240dfb33e757c1522ff8dbfa38614dd --- api/desc/pcm.api | 8 +++---- api/internal/pkg/storeLink/storeLink.go | 28 +++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/api/desc/pcm.api b/api/desc/pcm.api index f4640e4c..a7fc4b12 100644 --- a/api/desc/pcm.api +++ b/api/desc/pcm.api @@ -302,14 +302,14 @@ service pcm { get /storelink/getImageList (GetLinkImageListReq) returns (GetLinkImageListResp) @handler DeleteLinkImageHandler - delete /storelink/deleteImageList (DeleteLinkImageReq) returns (DeleteLinkImageResp) + delete /storelink/deleteImage (DeleteLinkImageReq) returns (DeleteLinkImageResp) @handler SubmitLinkTaskHandler - post /storelink/submitLinkTask (SubmitLinkTaskReq) returns (SubmitLinkTaskResp) + post /storelink/submitTask (SubmitLinkTaskReq) returns (SubmitLinkTaskResp) @handler GetLinkTaskHandler - get /storelink/getLinkTask (GetLinkTaskReq) returns (GetLinkTaskResp) + get /storelink/getTask (GetLinkTaskReq) returns (GetLinkTaskResp) @handler DeleteLinkTaskHandler - delete /storelink/deleteLinkTask (DeleteLinkTaskReq) returns (DeleteLinkTaskResp) + delete /storelink/deleteTask (DeleteLinkTaskReq) returns (DeleteLinkTaskResp) } \ No newline at end of file diff --git a/api/internal/pkg/storeLink/storeLink.go b/api/internal/pkg/storeLink/storeLink.go index 78827944..24906091 100644 --- a/api/internal/pkg/storeLink/storeLink.go +++ b/api/internal/pkg/storeLink/storeLink.go @@ -21,6 +21,14 @@ const ( COMMA = "," ) +var ( + OctImgStatus = map[int32]string{ + 1: "未上传", + 3: "制作完成", + 4: "制作失败", + } +) + type StoreLink struct { ILinkage Linkage } @@ -37,14 +45,30 @@ func ConvertType[T any](in *T) (interface{}, error) { var resp types.GetLinkImageListResp inresp := (interface{})(in).(*octopus.GetUserImageListResp) resp.Success = inresp.Success - resp.ErrorMsg = inresp.Error.Message + if inresp.Error == nil { + resp.ErrorMsg = "" + } else { + resp.ErrorMsg = inresp.Error.Message + } for _, v := range inresp.Payload.Images { var image types.ImageSl image.ImageId = v.Image.Id image.ImageName = v.Image.ImageName + image.ImageStatus = OctImgStatus[v.Image.ImageStatus] resp.Images = append(resp.Images, image) } - + return resp, nil + case *octopus.DeleteImageResp: + var resp types.DeleteLinkImageResp + return resp, nil + case *octopus.CreateTrainJobResp: + var resp types.SubmitLinkTaskResp + return resp, nil + case *octopus.GetTrainJobResp: + var resp types.GetLinkTaskResp + return resp, nil + case *octopus.DeleteTrainJobResp: + var resp types.DeleteLinkTaskResp return resp, nil default: return nil, errors.New("type convert fail")