xiugai

controllers/apiController.go

 package controllers
 
 import (
-	service "doc-service/Service"
-	models "doc-service/modes"
 	"doc-service/modes/db"
+	"doc-service/service"
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
 	"net/http"
@@ -71,17 +70,8 @@ func (con ApiController) Conversion(c *gin.Context) {
 	ret["task_id"] = result
 
 	//入库
-	insertProject := &db.DocServerProject{}
-	insertProject.ProjectName = req.ProjectName
-	insertProject.SourceType = req.SourceType
-	insertProject.TargetType = req.TargetType
-	insertProject.SourceUrl = req.SourceURI
-	insertProject.TargetUrl = req.TargetURI
-	insertProject.Status = 0
-	insertProject.AppId = 1
-	insertProject.CreatedAt = models.GetDate()
-	insertProject.TaskId = result
-	models.DB.Create(insertProject)
+	db.SaveProject(req, result)
+
 	res(c, http.StatusOK, "成功", ret)
 }
 

modes/db/doc_server_project.go

 package db
 
+import (
+	models "doc-service/modes"
+	"doc-service/service"
+)
+
 type DocServerProject struct {
 	Id          int    `db:"id" gorm:"primaryKey"`
 	ProjectName string `db:"project_name"`
@@ -16,3 +21,19 @@ type DocServerProject struct {
 func (a DocServerProject) TableName() string {
 	return "doc_server_project"
 }
+
+func SaveProject(req service.ConversionRequest, result string) int {
+	//入库
+	insertProject := &DocServerProject{}
+	insertProject.ProjectName = req.ProjectName
+	insertProject.SourceType = req.SourceType
+	insertProject.TargetType = req.TargetType
+	insertProject.SourceUrl = req.SourceURI
+	insertProject.TargetUrl = req.TargetURI
+	insertProject.Status = 0
+	insertProject.AppId = 1
+	insertProject.CreatedAt = models.GetDate()
+	insertProject.TaskId = result
+	models.DB.Create(insertProject)
+	return 0
+}

routers/apiRouters.go

@@ -12,7 +12,7 @@ func ApiRoutersInit(r *gin.Engine) {
 	{
 		apiRouters.GET("/", controllers.ApiController{}.Index)
 		apiRouters.GET("/plist", controllers.ApiController{}.Plist)
-		apiRouters.POST("/doctopdf", controllers.ApiController{}.Conversion)
+		apiRouters.POST("/doc-to-pdf", controllers.ApiController{}.Conversion)
 		apiRouters.GET("/get-pro", controllers.ApiController{}.GetTaskProject)
 		apiRouters.GET("/index", controllers.ApiController{}.Index)
 	}

service/conversionService.go

@@ -107,6 +107,20 @@ func (o *Conversion) checkParam(arg ConversionRequest) error {
 	return nil
 }
 
+func (o *Conversion) checkGetTaskParam(arg GetTaskRequest) error {
+
+	if arg.ProjectName == "" {
+		return errors.New("ProjectName 不能为空")
+	}
+	if arg.TaskType == "" {
+		return errors.New("SourceType 不能为空")
+	}
+	if arg.TaskId == "" {
+		return errors.New("TargetType 不能为空")
+	}
+	return nil
+}
+
 // 文件转换
 func (o *Conversion) DoConversion(arg ConversionRequest) (string, error) {
 	//校验参数
@@ -234,6 +248,11 @@ func (o *Conversion) CreateProject() (_err error) {
 
 // 获取项目
 func (o *Conversion) GetTaskProject(args GetTaskRequest) (string, error) {
+	checkErr := o.checkGetTaskParam(args)
+	if checkErr != nil {
+		return "", checkErr
+	}
+
 	client, _err := o.CreateImClient()
 	if _err != nil {
 		return "", _err
@@ -242,6 +261,7 @@ func (o *Conversion) GetTaskProject(args GetTaskRequest) (string, error) {
 	getTaskRequest := &imm20200930.GetTaskRequest{}
 	getTaskRequest.TaskId = &args.TaskId
 	getTaskRequest.TaskType = &args.TaskType
+	getTaskRequest.ProjectName = &args.ProjectName
 	runtime := &util.RuntimeOptions{}
 	tryErr := func() (_e error) {
 		defer func() {