From 3c60550adb68bfcfb1e5df0ea6920aa0e344bd4a Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 1 Dec 2022 16:13:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=85=AC=E6=9C=89=E7=A7=81?=
 =?UTF-8?q?=E6=9C=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/ai_model_manage.go            | 1 +
 models/user_analysis_for_activity.go | 9 +++++++++
 routers/api/v1/api.go                | 1 +
 routers/repo/ai_model_manage.go      | 5 ++++-
 routers/repo/user_data_analysis.go   | 6 ++++++
 5 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/models/ai_model_manage.go b/models/ai_model_manage.go
index 5b14b9ba2..3083c4266 100644
--- a/models/ai_model_manage.go
+++ b/models/ai_model_manage.go
@@ -33,6 +33,7 @@ type AiModelManage struct {
 	CodeBranch        string             `xorm:"varchar(400) NULL" json:"codeBranch"`
 	CodeCommitID      string             `xorm:"NULL" json:"codeCommitID"`
 	UserId            int64              `xorm:"NOT NULL" json:"userId"`
+	IsPrivate         bool               `xorm:"DEFAULT false" json:"isPrivate"`
 	UserName          string             `json:"userName"`
 	UserRelAvatarLink string             `json:"userRelAvatarLink"`
 	TrainTaskInfo     string             `xorm:"text NULL" json:"trainTaskInfo"`
diff --git a/models/user_analysis_for_activity.go b/models/user_analysis_for_activity.go
index 2066697d2..f52b127c6 100644
--- a/models/user_analysis_for_activity.go
+++ b/models/user_analysis_for_activity.go
@@ -449,3 +449,12 @@ func QueryUserLoginInfo(userIds []int64) []*UserLoginLog {
 
 	return loginList
 }
+
+func QueryUserAnnualReport(userId int64) *UserSummaryCurrentYear {
+	statictisSess := xStatistic.NewSession()
+	defer statictisSess.Close()
+	var re *UserSummaryCurrentYear
+	statictisSess.ID(userId).Get(re)
+
+	return re
+}
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 14badfdb4..a6e0eb737 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -610,6 +610,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 		m.Get("/query_invitation_yesterday", operationReq, repo_ext.QueryInvitationYesterday)
 		m.Get("/query_invitation_all", operationReq, repo_ext.QueryInvitationAll)
 		m.Get("/query_invitation_userdefine", operationReq, repo_ext.QueryUserDefineInvitationPage)
+		m.Get("/query_user_annual_report", repo_ext.QueryUserAnnualReport)
 
 		m.Get("/download_invitation_detail", operationReq, repo_ext.DownloadInvitationDetail)
 
diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 7eedb9bc4..d93905d7c 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -93,7 +93,7 @@ func saveModelByParameters(jobId string, versionName string, name string, versio
 	log.Info("accuracyJson=" + string(accuracyJson))
 	aiTask.ContainerIp = ""
 	aiTaskJson, _ := json.Marshal(aiTask)
-
+	isPrivate := ctx.QueryBool("isPrivate")
 	model := &models.AiModelManage{
 		ID:            id,
 		Version:       version,
@@ -114,6 +114,7 @@ func saveModelByParameters(jobId string, versionName string, name string, versio
 		TrainTaskInfo: string(aiTaskJson),
 		Accuracy:      string(accuracyJson),
 		Status:        STATUS_COPY_MODEL,
+		IsPrivate:     isPrivate,
 	}
 
 	err = models.SaveModelToDb(model)
@@ -216,6 +217,7 @@ func SaveLocalModel(ctx *context.Context) {
 	description := ctx.Query("description")
 	engine := ctx.QueryInt("engine")
 	taskType := ctx.QueryInt("type")
+	isPrivate := ctx.QueryBool("isPrivate")
 	modelActualPath := ""
 	if taskType == models.TypeCloudBrainOne {
 		destKeyNamePrefix := Model_prefix + models.AttachmentRelativePath(id) + "/"
@@ -262,6 +264,7 @@ func SaveLocalModel(ctx *context.Context) {
 		TrainTaskInfo: "",
 		Accuracy:      "",
 		Status:        STATUS_FINISHED,
+		IsPrivate:     isPrivate,
 	}
 
 	err := models.SaveModelToDb(model)
diff --git a/routers/repo/user_data_analysis.go b/routers/repo/user_data_analysis.go
index 508addf75..a6de283a4 100755
--- a/routers/repo/user_data_analysis.go
+++ b/routers/repo/user_data_analysis.go
@@ -907,3 +907,9 @@ func QueryUserLoginInfo(ctx *context.Context) {
 		log.Info("writer exel error." + err.Error())
 	}
 }
+
+func QueryUserAnnualReport(ctx *context.Context) {
+	log.Info("start to QueryUserAnnualReport ")
+	result := models.QueryUserAnnualReport(ctx.User.ID)
+	ctx.JSON(http.StatusOK, result)
+}