启智章鱼查询数据集类型列表，用途列表接口

Former-commit-id: 033716d66aead29cf367367e9ee50d3e2fe881a6

adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/config/octopusConfig.go

@@ -44,4 +44,6 @@ type OctopusApi struct {
 	CreateNotebook            string
 	GetNotebook               string
 	CreateTrainJob            string
+	GetDatasetApplyList       string
+	GetDatasetTypeList        string
 }

adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getdatasetapplylistlogic.go

@@ -0,0 +1,50 @@
+package logic
+
+import (
+	"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
+	"PCM/common/tool"
+	"context"
+	"strconv"
+
+	"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
+	"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type GetDatasetApplyListLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewGetDatasetApplyListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetDatasetApplyListLogic {
+	return &GetDatasetApplyListLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *GetDatasetApplyListLogic) GetDatasetApplyList(in *octopus.GetDatasetApplyListReq) (*octopus.GetDatasetApplyListResp, error) {
+	resp := &octopus.GetDatasetApplyListResp{}
+
+	var url_prefix = common.OctopusUrls[in.Platform]
+	var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetDatasetApplyList
+
+	token := common.GetToken(in.Platform)
+
+	req := tool.GetACHttpRequest()
+	_, err := req.
+		SetHeader("Authorization", "Bearer "+token).
+		SetQueryString("pageIndex=" + strconv.Itoa(int(in.PageIndex))).
+		SetQueryString("pageSize=" + strconv.Itoa(int(in.PageSize))).
+		SetResult(resp).
+		Get(reqUrl)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return resp, nil
+}

adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getdatasettypelistlogic.go

@@ -0,0 +1,50 @@
+package logic
+
+import (
+	"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
+	"PCM/common/tool"
+	"context"
+	"strconv"
+
+	"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
+	"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type GetDatasetTypeListLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewGetDatasetTypeListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetDatasetTypeListLogic {
+	return &GetDatasetTypeListLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *GetDatasetTypeListLogic) GetDatasetTypeList(in *octopus.GetDatasetTypeListRep) (*octopus.GetDatasetTypeListResp, error) {
+	resp := &octopus.GetDatasetTypeListResp{}
+
+	var url_prefix = common.OctopusUrls[in.Platform]
+	var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetDatasetTypeList
+
+	token := common.GetToken(in.Platform)
+
+	req := tool.GetACHttpRequest()
+	_, err := req.
+		SetHeader("Authorization", "Bearer "+token).
+		SetQueryString("pageIndex=" + strconv.Itoa(int(in.PageIndex))).
+		SetQueryString("pageSize=" + strconv.Itoa(int(in.PageSize))).
+		SetResult(resp).
+		Get(reqUrl)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return resp, nil
+}

adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/server/octopusserver.go

@@ -124,6 +124,16 @@ func (s *OctopusServer) DeleteDataSetVersion(ctx context.Context, in *octopus.De
 	return l.DeleteDataSetVersion(in)
 }
 
+func (s *OctopusServer) GetDatasetApplyList(ctx context.Context, in *octopus.GetDatasetApplyListReq) (*octopus.GetDatasetApplyListResp, error) {
+	l := logic.NewGetDatasetApplyListLogic(ctx, s.svcCtx)
+	return l.GetDatasetApplyList(in)
+}
+
+func (s *OctopusServer) GetDatasetTypeList(ctx context.Context, in *octopus.GetDatasetTypeListRep) (*octopus.GetDatasetTypeListResp, error) {
+	l := logic.NewGetDatasetTypeListLogic(ctx, s.svcCtx)
+	return l.GetDatasetTypeList(in)
+}
+
 // Develop
 func (s *OctopusServer) GetNotebookList(ctx context.Context, in *octopus.GetNotebookListReq) (*octopus.GetNotebookListResp, error) {
 	l := logic.NewGetNotebookListLogic(ctx, s.svcCtx)

adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus/octopus_grpc.pb.go

@@ -44,6 +44,8 @@ type OctopusClient interface {
 	UploadDataSetConfirm(ctx context.Context, in *UploadDataSetConfirmReq, opts ...grpc.CallOption) (*UploadDataSetConfirmResp, error)
 	CreateDataSetVersion(ctx context.Context, in *CreateDataSetVersionReq, opts ...grpc.CallOption) (*CreateDataSetVersionResp, error)
 	DeleteDataSetVersion(ctx context.Context, in *DeleteDataSetVersionReq, opts ...grpc.CallOption) (*DeleteDataSetVersionResp, error)
+	GetDatasetApplyList(ctx context.Context, in *GetDatasetApplyListReq, opts ...grpc.CallOption) (*GetDatasetApplyListResp, error)
+	GetDatasetTypeList(ctx context.Context, in *GetDatasetTypeListRep, opts ...grpc.CallOption) (*GetDatasetTypeListResp, error)
 	// Develop
 	GetNotebookList(ctx context.Context, in *GetNotebookListReq, opts ...grpc.CallOption) (*GetNotebookListResp, error)
 	GetNotebook(ctx context.Context, in *GetNotebookReq, opts ...grpc.CallOption) (*GetNotebookResp, error)
@@ -249,6 +251,24 @@ func (c *octopusClient) DeleteDataSetVersion(ctx context.Context, in *DeleteData
 	return out, nil
 }
 
+func (c *octopusClient) GetDatasetApplyList(ctx context.Context, in *GetDatasetApplyListReq, opts ...grpc.CallOption) (*GetDatasetApplyListResp, error) {
+	out := new(GetDatasetApplyListResp)
+	err := c.cc.Invoke(ctx, "/octopus.Octopus/GetDatasetApplyList", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *octopusClient) GetDatasetTypeList(ctx context.Context, in *GetDatasetTypeListRep, opts ...grpc.CallOption) (*GetDatasetTypeListResp, error) {
+	out := new(GetDatasetTypeListResp)
+	err := c.cc.Invoke(ctx, "/octopus.Octopus/GetDatasetTypeList", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *octopusClient) GetNotebookList(ctx context.Context, in *GetNotebookListReq, opts ...grpc.CallOption) (*GetNotebookListResp, error) {
 	out := new(GetNotebookListResp)
 	err := c.cc.Invoke(ctx, "/octopus.Octopus/GetNotebookList", in, out, opts...)
@@ -383,6 +403,8 @@ type OctopusServer interface {
 	UploadDataSetConfirm(context.Context, *UploadDataSetConfirmReq) (*UploadDataSetConfirmResp, error)
 	CreateDataSetVersion(context.Context, *CreateDataSetVersionReq) (*CreateDataSetVersionResp, error)
 	DeleteDataSetVersion(context.Context, *DeleteDataSetVersionReq) (*DeleteDataSetVersionResp, error)
+	GetDatasetApplyList(context.Context, *GetDatasetApplyListReq) (*GetDatasetApplyListResp, error)
+	GetDatasetTypeList(context.Context, *GetDatasetTypeListRep) (*GetDatasetTypeListResp, error)
 	// Develop
 	GetNotebookList(context.Context, *GetNotebookListReq) (*GetNotebookListResp, error)
 	GetNotebook(context.Context, *GetNotebookReq) (*GetNotebookResp, error)
@@ -465,6 +487,12 @@ func (UnimplementedOctopusServer) CreateDataSetVersion(context.Context, *CreateD
 func (UnimplementedOctopusServer) DeleteDataSetVersion(context.Context, *DeleteDataSetVersionReq) (*DeleteDataSetVersionResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteDataSetVersion not implemented")
 }
+func (UnimplementedOctopusServer) GetDatasetApplyList(context.Context, *GetDatasetApplyListReq) (*GetDatasetApplyListResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetDatasetApplyList not implemented")
+}
+func (UnimplementedOctopusServer) GetDatasetTypeList(context.Context, *GetDatasetTypeListRep) (*GetDatasetTypeListResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetDatasetTypeList not implemented")
+}
 func (UnimplementedOctopusServer) GetNotebookList(context.Context, *GetNotebookListReq) (*GetNotebookListResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetNotebookList not implemented")
 }
@@ -874,6 +902,42 @@ func _Octopus_DeleteDataSetVersion_Handler(srv interface{}, ctx context.Context,
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Octopus_GetDatasetApplyList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetDatasetApplyListReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(OctopusServer).GetDatasetApplyList(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/octopus.Octopus/GetDatasetApplyList",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(OctopusServer).GetDatasetApplyList(ctx, req.(*GetDatasetApplyListReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Octopus_GetDatasetTypeList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetDatasetTypeListRep)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(OctopusServer).GetDatasetTypeList(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/octopus.Octopus/GetDatasetTypeList",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(OctopusServer).GetDatasetTypeList(ctx, req.(*GetDatasetTypeListRep))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _Octopus_GetNotebookList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(GetNotebookListReq)
 	if err := dec(in); err != nil {
@@ -1177,6 +1241,14 @@ var Octopus_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "DeleteDataSetVersion",
 			Handler:    _Octopus_DeleteDataSetVersion_Handler,
 		},
+		{
+			MethodName: "GetDatasetApplyList",
+			Handler:    _Octopus_GetDatasetApplyList_Handler,
+		},
+		{
+			MethodName: "GetDatasetTypeList",
+			Handler:    _Octopus_GetDatasetTypeList_Handler,
+		},
 		{
 			MethodName: "GetNotebookList",
 			Handler:    _Octopus_GetNotebookList_Handler,

adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopusclient/octopus.go

@@ -59,6 +59,10 @@ type (
 	GetAlgorithmListResp          = octopus.GetAlgorithmListResp
 	GetAlgorithmReq               = octopus.GetAlgorithmReq
 	GetAlgorithmResp              = octopus.GetAlgorithmResp
+	GetDatasetApplyListReq        = octopus.GetDatasetApplyListReq
+	GetDatasetApplyListResp       = octopus.GetDatasetApplyListResp
+	GetDatasetTypeListRep         = octopus.GetDatasetTypeListRep
+	GetDatasetTypeListResp        = octopus.GetDatasetTypeListResp
 	GetDatasetVersionListReq      = octopus.GetDatasetVersionListReq
 	GetDatasetVersionListResp     = octopus.GetDatasetVersionListResp
 	GetMyAlgorithmListReq         = octopus.GetMyAlgorithmListReq
@@ -96,6 +100,8 @@ type (
 	PayloadDownloadAlgorithm      = octopus.PayloadDownloadAlgorithm
 	PayloadGetAlgorithm           = octopus.PayloadGetAlgorithm
 	PayloadGetAlgorithmApplyList  = octopus.PayloadGetAlgorithmApplyList
+	PayloadGetDatasetApplyList    = octopus.PayloadGetDatasetApplyList
+	PayloadGetDatasetTypeList     = octopus.PayloadGetDatasetTypeList
 	PayloadGetDatasetVersion      = octopus.PayloadGetDatasetVersion
 	PayloadGetNotebook            = octopus.PayloadGetNotebook
 	PayloadMyAlgorithmList        = octopus.PayloadMyAlgorithmList
@@ -158,6 +164,8 @@ type (
 		UploadDataSetConfirm(ctx context.Context, in *UploadDataSetConfirmReq, opts ...grpc.CallOption) (*UploadDataSetConfirmResp, error)
 		CreateDataSetVersion(ctx context.Context, in *CreateDataSetVersionReq, opts ...grpc.CallOption) (*CreateDataSetVersionResp, error)
 		DeleteDataSetVersion(ctx context.Context, in *DeleteDataSetVersionReq, opts ...grpc.CallOption) (*DeleteDataSetVersionResp, error)
+		GetDatasetApplyList(ctx context.Context, in *GetDatasetApplyListReq, opts ...grpc.CallOption) (*GetDatasetApplyListResp, error)
+		GetDatasetTypeList(ctx context.Context, in *GetDatasetTypeListRep, opts ...grpc.CallOption) (*GetDatasetTypeListResp, error)
 		// Develop
 		GetNotebookList(ctx context.Context, in *GetNotebookListReq, opts ...grpc.CallOption) (*GetNotebookListResp, error)
 		GetNotebook(ctx context.Context, in *GetNotebookReq, opts ...grpc.CallOption) (*GetNotebookResp, error)
@@ -288,6 +296,16 @@ func (m *defaultOctopus) DeleteDataSetVersion(ctx context.Context, in *DeleteDat
 	return client.DeleteDataSetVersion(ctx, in, opts...)
 }
 
+func (m *defaultOctopus) GetDatasetApplyList(ctx context.Context, in *GetDatasetApplyListReq, opts ...grpc.CallOption) (*GetDatasetApplyListResp, error) {
+	client := octopus.NewOctopusClient(m.cli.Conn())
+	return client.GetDatasetApplyList(ctx, in, opts...)
+}
+
+func (m *defaultOctopus) GetDatasetTypeList(ctx context.Context, in *GetDatasetTypeListRep, opts ...grpc.CallOption) (*GetDatasetTypeListResp, error) {
+	client := octopus.NewOctopusClient(m.cli.Conn())
+	return client.GetDatasetTypeList(ctx, in, opts...)
+}
+
 // Develop
 func (m *defaultOctopus) GetNotebookList(ctx context.Context, in *GetNotebookListReq, opts ...grpc.CallOption) (*GetNotebookListResp, error) {
 	client := octopus.NewOctopusClient(m.cli.Conn())

adaptor/PCM-AI/PCM-OCTOPUS/rpc/pb/octopus.proto

@@ -412,6 +412,42 @@ message DeleteDataSetVersionResp{
 message PayloadDeleteDataSetVersion{
   int64 deletedAt = 1;
 }
+
+message GetDatasetApplyListReq{
+  string platform =1;
+  int32 pageIndex =2;
+  int32 pageSize =3;
+}
+
+message GetDatasetApplyListResp{
+  bool success =1;
+  PayloadGetDatasetApplyList payload =2;
+  Error error = 3;
+}
+
+message PayloadGetDatasetApplyList{
+  int32 totalSize = 1;
+  repeated Lables lables =2;
+}
+
+message GetDatasetTypeListRep{
+  string platform =1;
+  int32 pageIndex =2;
+  int32 pageSize =3;
+}
+
+message GetDatasetTypeListResp{
+  bool success =1;
+  PayloadGetDatasetTypeList payload =2;
+  Error error = 3;
+}
+
+message PayloadGetDatasetTypeList{
+  int32 totalSize = 1;
+  repeated Lables lables =2;
+}
+
+
 /******************DatasetService End*************************/
 
 /******************ModelDeployService Start*************************/
@@ -806,7 +842,8 @@ service Octopus {
   rpc UploadDataSetConfirm(UploadDataSetConfirmReq) returns (UploadDataSetConfirmResp);
   rpc CreateDataSetVersion(CreateDataSetVersionReq) returns (CreateDataSetVersionResp); //创建版本
   rpc DeleteDataSetVersion(DeleteDataSetVersionReq) returns (DeleteDataSetVersionResp); //删除版本
-
+  rpc GetDatasetApplyList(GetDatasetApplyListReq) returns (GetDatasetApplyListResp); //查询数据集用途列表
+  rpc GetDatasetTypeList(GetDatasetTypeListRep) returns (GetDatasetTypeListResp); //查询数据集类型列表
 
 
   //ModelDeployService