Commit 01859617 authored by Bess严根旺's avatar Bess严根旺

修改

parent 702b09aa
......@@ -5,6 +5,7 @@ import (
"context"
"doc-service/domain/entity/serversitemicros/docserverproject"
service "doc-service/domain/repository"
service2 "doc-service/domain/service"
"doc-service/infra/db"
"fmt"
"github.com/nacos-group/nacos-sdk-go/v2/common/logger"
......@@ -93,24 +94,7 @@ func GetProjectInfo(c context.Context, projectId int32) int8 {
logger.Error("错误信息" + errs.Error())
return 0
}
createGetProject(c, projectId, *result.Body.Status)
service2.CreateGetProject(c, projectId, *result.Body.Status)
return 1
}
func createGetProject(c context.Context, projectId int32, aliRes string) {
var statusData int8
if aliRes != "Succeeded" {
statusData = 1
} else {
statusData = 2
}
_, _ = db.GetServerSiteMicrosDB().DocServerGetProject.Create().
SetCreatedAt(time.Now()).
SetUpdatedAt(time.Now()).
SetStatus(statusData).
SetCurrNum(1).
SetAliResult(aliRes).
SetServerProjectID(projectId).
Save(c)
}
......@@ -94,13 +94,16 @@ func (doc *DocServiceService) GetProjectInfo(c context.Context, req *pb.GetProje
request := &service.GetTaskRequest{
ProjectId: req.ProjectId,
ProjectName: req.ProjectName,
//TaskType: req.TaskType,
//TaskId: req.TaskId,
//RequestDefinition: req.RequestDefinition,
}
request.RequestDefinition = true
if req.ProjectId > 0 {
if request.ProjectId <= 0 {
resp.Msg = "项目id不能为空"
resp.Code = 100010
resp.Data = nil
return resp, err
}
projectInfo, infoErr := db.GetServerSiteMicrosDB().DocServerProject.Get(c, req.ProjectId)
if infoErr != nil {
resp.Msg = err.Error()
......@@ -120,8 +123,10 @@ func (doc *DocServiceService) GetProjectInfo(c context.Context, req *pb.GetProje
ConversionInfo.SourceType = projectInfo.SourceType
ConversionInfo.TaskId = projectInfo.TaskID
ConversionInfo.TargetType = projectInfo.TargetType
}
result, errs := service.NewConversion().GetTaskProject(*request)
//获取入库
CreateGetProject(c, request.ProjectId, *result.Body.Status)
if errs != nil || *result.StatusCode != 200 || *result.Body.Status != "Succeeded" {
resp.Msg = err.Error()
resp.Code = 100010
......@@ -134,3 +139,20 @@ func (doc *DocServiceService) GetProjectInfo(c context.Context, req *pb.GetProje
resp.Data = ConversionInfo
return resp, nil
}
func CreateGetProject(c context.Context, projectId int32, aliRes string) {
var statusData int8
if aliRes != "Succeeded" {
statusData = 1
} else {
statusData = 2
}
_, _ = db.GetServerSiteMicrosDB().DocServerGetProject.Create().
SetCreatedAt(time.Now()).
SetUpdatedAt(time.Now()).
SetStatus(statusData).
SetCurrNum(1).
SetAliResult(aliRes).
SetServerProjectID(projectId).
Save(c)
}
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