From 9599b2dfd0dceaf4218ee67f9b0cb88ada148538 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 9 Dec 2021 09:56:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/user_business_analysis.go |  1 -
 routers/repo/ai_model_manage.go  | 43 ++++++++++++++++++++++----------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go
index 15f67e858..cf0065282 100644
--- a/models/user_business_analysis.go
+++ b/models/user_business_analysis.go
@@ -649,7 +649,6 @@ func querySolveIssue(start_unix int64, end_unix int64) map[int64]int {
 		}
 	}
 	return resultMap
-
 }
 
 func queryPullRequest(start_unix int64, end_unix int64) map[int64]int {
diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index d3afe61a4..0fdf698c0 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -55,7 +55,7 @@ func saveModelByParameters(jobId string, versionName string, name string, versio
 	cloudType = aiTask.Type
 	//download model zip   //train type
 	if cloudType == models.TypeCloudBrainTwo {
-		modelPath, modelSize, err = downloadModelFromCloudBrainTwo(id, aiTask.JobName, "")
+		modelPath, modelSize, err = downloadModelFromCloudBrainTwo(id, aiTask.JobName, "", aiTask.TrainUrl)
 		if err != nil {
 			log.Info("download model from CloudBrainTwo faild." + err.Error())
 			return err
@@ -141,9 +141,12 @@ func SaveModel(ctx *context.Context) {
 	log.Info("save model end.")
 }
 
-func downloadModelFromCloudBrainTwo(modelUUID string, jobName string, parentDir string) (string, int64, error) {
-
+func downloadModelFromCloudBrainTwo(modelUUID string, jobName string, parentDir string, trainUrl string) (string, int64, error) {
 	objectkey := strings.TrimPrefix(path.Join(setting.TrainJobModelPath, jobName, setting.OutPutPath, parentDir), "/")
+	if trainUrl != "" {
+		objectkey = trainUrl[len(setting.Bucket)+1:]
+	}
+
 	modelDbResult, err := storage.GetOneLevelAllObjectUnderDir(setting.Bucket, objectkey, "")
 	log.Info("bucket=" + setting.Bucket + "  objectkey=" + objectkey)
 	if err != nil {
@@ -392,6 +395,24 @@ func ShowSingleModel(ctx *context.Context) {
 	ctx.JSON(http.StatusOK, models)
 }
 
+func queryUserName(intSlice []int64) map[int64]string {
+	keys := make(map[int64]string)
+	uniqueElements := []int64{}
+	for _, entry := range intSlice {
+		if _, value := keys[entry]; !value {
+			keys[entry] = ""
+			uniqueElements = append(uniqueElements, entry)
+		}
+	}
+	userNames, err := models.GetUserNamesByIDs(uniqueElements)
+	if err == nil {
+		for i, userName := range userNames {
+			keys[uniqueElements[i]] = userName
+		}
+	}
+	return keys
+}
+
 func ShowOneVersionOtherModel(ctx *context.Context) {
 	repoId := ctx.Repo.Repository.ID
 	name := ctx.Query("name")
@@ -404,12 +425,10 @@ func ShowOneVersionOtherModel(ctx *context.Context) {
 		model.IsCanOper = isOper(ctx, model.UserId)
 		userIds[i] = model.UserId
 	}
+	userNameMap := queryUserName(userIds)
 
-	userNames, err := models.GetUserNamesByIDs(userIds)
-	if err == nil {
-		for i, model := range aimodels {
-			model.UserName = userNames[i]
-		}
+	for _, model := range aimodels {
+		model.UserName = userNameMap[model.UserId]
 	}
 
 	if len(aimodels) > 0 {
@@ -479,11 +498,9 @@ func ShowModelPageInfo(ctx *context.Context) {
 		userIds[i] = model.UserId
 	}
 
-	userNames, err := models.GetUserNamesByIDs(userIds)
-	if err == nil {
-		for i, model := range modelResult {
-			model.UserName = userNames[i]
-		}
+	userNameMap := queryUserName(userIds)
+	for _, model := range modelResult {
+		model.UserName = userNameMap[model.UserId]
 	}
 
 	mapInterface := make(map[string]interface{})