修改获取项目进度

domain/service/convert_service.go

@@ -2,9 +2,11 @@ package service
 
 import (
 	"context"
+	"doc-service/domain/entity/serversitemicros/docserverproject"
 	service "doc-service/domain/repository"
 	"doc-service/infra/db"
 	"fmt"
+	"github.com/nacos-group/nacos-sdk-go/v2/common/logger"
 	pb "gitlab.galaxy-immi.com/Backend-group/proto/pb/docservice"
 	"time"
 )
@@ -76,6 +78,9 @@ func (doc *DocServiceService) DoConversion(c context.Context, req *pb.DoConversi
 
 // 获取转换结果
 func (doc *DocServiceService) GetProjectInfo(c context.Context, req *pb.GetProjectRequest) (resp *pb.GetProjectResponse, err error) {
+	resp = &pb.GetProjectResponse{}
+	ConversionInfo := &pb.DoConversionInfo{}
+
 	request := &service.GetTaskRequest{
 		ProjectId:         req.ProjectId,
 		ProjectName:       req.ProjectName,
@@ -85,28 +90,47 @@ func (doc *DocServiceService) GetProjectInfo(c context.Context, req *pb.GetProje
 	}
 	request.RequestDefinition = true
 	if req.ProjectId > 0 {
-		projectData, infoErr := db.GetServerSiteMicrosDB().DocServerProject.Get(c, req.ProjectId)
+		ConversionInfo, infoErr := db.GetServerSiteMicrosDB().DocServerProject.Get(c, req.ProjectId)
+		if infoErr != nil {
+			resp.Msg = err.Error()
+			resp.Code = 100010
+			resp.Data = nil
+			return resp, err
+		}
+		request.ProjectName = ConversionInfo.ProjectName
+		request.TaskId = ConversionInfo.TaskID
+		request.TaskType = ConversionInfo.TargetType
+	} else {
+		projectData, infoErr := db.GetServerSiteMicrosDB().DocServerProject.Query().Where(
+			docserverproject.ProjectNameEQ(request.ProjectName),
+			docserverproject.TargetTypeEQ(request.TaskType),
+			docserverproject.TaskIDEQ(request.TaskId),
+		).First(c)
 		if infoErr != nil {
 			resp.Msg = err.Error()
 			resp.Code = 100010
 			resp.Data = nil
 			return resp, err
 		}
-		request.ProjectName = projectData.ProjectName
-		request.TaskId = projectData.TaskID
-		request.TaskType = projectData.TargetType
+		ConversionInfo.Id = projectData.ID
+		ConversionInfo.ProjectName = projectData.ProjectName
+		ConversionInfo.SourceType = projectData.SourceType
+		ConversionInfo.TargetType = projectData.TargetType
+		ConversionInfo.SourceUrl = *projectData.SourceURL
+		ConversionInfo.TargetUrl = *projectData.TargetURL
+		ConversionInfo.TaskId = projectData.TaskID
 	}
 
-	_, errs := service.NewConversion().GetTaskProject(*request)
+	result, errs := service.NewConversion().GetTaskProject(*request)
+	logger.Info("返回数据", result)
 	if errs != nil {
 		resp.Msg = err.Error()
 		resp.Code = 100010
 		resp.Data = nil
 		return resp, err
 	}
-
 	resp.Msg = "success"
 	resp.Code = 200
-	resp.Data = nil
+	resp.Data = ConversionInfo
 	return resp, nil
 }