Commit 315bbf0f authored by Euan游根明's avatar Euan游根明

feat: getTask返回

parent 0b57ed34
......@@ -50,7 +50,8 @@ func (con ApiController) Conversion(c *gin.Context) {
req.TargetType = c.PostForm("target_type")
req.SourceURI = c.PostForm("source_url")
req.TargetURI = c.PostForm("target_url")
req.IsPrivate = false
IsPrivate := c.PostForm("is_private")
req.IsPrivate = IsPrivate == "1"
//创建项目
createErr := service.NewConversion().CreateProject()
......@@ -71,6 +72,7 @@ func (con ApiController) Conversion(c *gin.Context) {
//入库
db.SaveProject(req, result)
ret["result"] = result
res(c, http.StatusOK, "成功", ret)
}
......@@ -82,12 +84,15 @@ func (con ApiController) GetTaskProject(c *gin.Context) {
req.ProjectName = c.Query("project_name")
req.TaskId = c.Query("task_id")
req.TaskType = c.Query("task_type")
//requestDefinition := c.Query("request_definition")
req.RequestDefinition = true
result, errs := service.NewConversion().GetTaskProject(req)
if errs != nil {
ret["errmsg"] = errs.Error()
ret["errcode"] = 100011
}
ret["url"] = result
ret["result"] = result
res(c, http.StatusOK, "成功", ret)
return
}
......@@ -12,7 +12,7 @@ func ApiRoutersInit(r *gin.Engine) {
{
apiRouters.GET("/", controllers.ApiController{}.Index)
apiRouters.GET("/plist", controllers.ApiController{}.Plist)
apiRouters.POST("/doc-to-pdf", controllers.ApiController{}.Conversion)
apiRouters.POST("/doctopdf", controllers.ApiController{}.Conversion)
apiRouters.GET("/get-pro", controllers.ApiController{}.GetTaskProject)
apiRouters.GET("/index", controllers.ApiController{}.Index)
}
......
......@@ -4,6 +4,7 @@ import (
"doc-service/common/log"
"encoding/json"
"errors"
"fmt"
openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client"
imm20200930 "github.com/alibabacloud-go/imm-20200930/v4/client"
openapiutil "github.com/alibabacloud-go/openapi-util/service"
......@@ -122,11 +123,14 @@ func (o *Conversion) checkGetTaskParam(arg GetTaskRequest) error {
}
// 文件转换
func (o *Conversion) DoConversion(arg ConversionRequest) (string, error) {
// DoConversion 文件转换
func (o *Conversion) DoConversion(arg ConversionRequest) (map[string]interface{}, error) {
ret := make(map[string]interface{}, 0)
//校验参数
checkErr := o.checkParam(arg)
if checkErr != nil {
return "", checkErr
return ret, checkErr
}
client := NewConversion()
......@@ -134,11 +138,11 @@ func (o *Conversion) DoConversion(arg ConversionRequest) (string, error) {
sourceParseUrl, parseErr := url.Parse(arg.SourceURI)
if parseErr != nil {
return "", parseErr
return ret, parseErr
}
targetParseUrl, parseTargetErr := url.Parse(arg.TargetURI)
if parseTargetErr != nil {
return "", parseTargetErr
return ret, parseTargetErr
}
// query params
queries := map[string]interface{}{}
......@@ -154,7 +158,7 @@ func (o *Conversion) DoConversion(arg ConversionRequest) (string, error) {
ossClient, _err := client.CreateClient()
if _err != nil {
return "", _err
return ret, _err
}
log.Info("转换请求参数: %s", queries)
......@@ -162,16 +166,10 @@ func (o *Conversion) DoConversion(arg ConversionRequest) (string, error) {
res, err := ossClient.CallApi(params, request, runtime)
log.Info("DoConversion result返回:%s", res)
if err != nil {
log.Error("创建任务报错%s", err)
return "", err
return ret, err
}
return res, err
body, ok := res["body"].(map[string]interface{})
if !ok {
return "", err
}
log.Info("返回的task_id :%s", body["TaskId"].(string))
return body["TaskId"].(string), nil
}
func (o *Conversion) CreateImClient() (_result *imm20200930.Client, _err error) {
......@@ -246,36 +244,31 @@ func (o *Conversion) CreateProject() (_err error) {
return nil
}
// 获取项目
func (o *Conversion) GetTaskProject(args GetTaskRequest) (string, error) {
checkErr := o.checkGetTaskParam(args)
if checkErr != nil {
return "", checkErr
}
func (o *Conversion) GetTaskProject(args GetTaskRequest) (*imm20200930.GetTaskResponse, error) {
client, _err := o.CreateImClient()
resp := &imm20200930.GetTaskResponse{}
if _err != nil {
return "", _err
return resp, _err
}
getTaskRequest := &imm20200930.GetTaskRequest{}
getTaskRequest.ProjectName = &args.ProjectName
getTaskRequest.TaskId = &args.TaskId
getTaskRequest.TaskType = &args.TaskType
getTaskRequest.ProjectName = &args.ProjectName
getTaskRequest.RequestDefinition = &args.RequestDefinition
runtime := &util.RuntimeOptions{}
tryErr := func() (_e error) {
resp, tryErr := func() (*imm20200930.GetTaskResponse, error) {
defer func() {
if r := tea.Recover(recover()); r != nil {
_e = r
_err = r
}
}()
// 复制代码运行请自行打印 API 的返回值
_, _err = client.GetTaskWithOptions(getTaskRequest, runtime)
resp, _err = client.GetTaskWithOptions(getTaskRequest, runtime)
if _err != nil {
return _err
return nil, _err
}
return nil
fmt.Println("获取任务返回参数", resp)
return resp, _err
}()
if tryErr != nil {
......@@ -298,8 +291,8 @@ func (o *Conversion) GetTaskProject(args GetTaskRequest) (string, error) {
}
_, _err = util.AssertAsString(err.Message)
if _err != nil {
return "", _err
return resp, _err
}
}
return "", _err
return resp, _err
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment