From 4843548fd06fd9198e98d81804298f8df351ab09 Mon Sep 17 00:00:00 2001
From: junleea <354425203@qq.com>
Date: Sat, 29 Mar 2025 13:38:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 handler/file.go        |  4 ++--
 proto/file_req.go      | 10 +++++++++-
 service/fileService.go | 15 +++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/handler/file.go b/handler/file.go
index 20e2e92..f8831f6 100644
--- a/handler/file.go
+++ b/handler/file.go
@@ -34,8 +34,8 @@ func GetUserFileList(c *gin.Context) {
 	var req GetUserFileListReq
 	if err := c.ShouldBind(&req); err == nil {
 		if req.Type == "all" {
-			fileList, files := dao.FileUserFileList(user_id, proto.UserFileTypeFile)
-			c.JSON(http.StatusOK, gin.H{"code": proto.SuccessCode, "msg": "success", "data": fileList, "files": files})
+			userFiles := service.FindUserFileList(user_id, proto.UserFileTypeFile)
+			c.JSON(http.StatusOK, gin.H{"code": proto.SuccessCode, "msg": "success", "data": userFiles})
 		} else if req.Type == "search" {
 			fileList := dao.FindFileByUserFileName(req.FileName, user_id)
 			c.JSON(http.StatusOK, gin.H{"code": proto.SuccessCode, "msg": "success", "data": fileList})
diff --git a/proto/file_req.go b/proto/file_req.go
index a0bbae3..a711fe2 100644
--- a/proto/file_req.go
+++ b/proto/file_req.go
@@ -1,6 +1,9 @@
 package proto
 
-import "time"
+import (
+	"StuAcaWorksAI/dao"
+	"time"
+)
 
 type FileUploadReq struct {
 	UploadType string `json:"upload_type" form:"upload_type" binding:"required"`
@@ -30,3 +33,8 @@ type SearchOneConfigFileResp struct {
 	FilePath  string    `json:"file_path" form:"file_path"`
 	Content   string    `json:"content" form:"content"`
 }
+
+type UserFileListResp struct {
+	dao.FileAuth
+	FileStoreName string `json:"file_store_name" form:"file_store_name"`
+}
diff --git a/service/fileService.go b/service/fileService.go
index 1e29216..dd27c29 100644
--- a/service/fileService.go
+++ b/service/fileService.go
@@ -247,3 +247,18 @@ func CreateUserFile(userID int, fileAuthName string, fileID int, UploadType stri
 	fileAuth := dao.CreateFileAuth(userID, fileID, fileAuthName, UploadType, 1, "")
 	return fileAuth
 }
+
+func FindUserFileList(userID int, uploadType string) []proto.UserFileListResp {
+	fileList, files := dao.FileUserFileList(userID, uploadType)
+	filesM := make(map[uint]dao.File)
+	for _, file := range files {
+		filesM[file.ID] = file
+	}
+	var res []proto.UserFileListResp
+	for _, file := range fileList {
+		fileStoreName := filesM[uint(file.FileID)].FileStoreName
+		r := proto.UserFileListResp{FileAuth: file, FileStoreName: fileStoreName}
+		res = append(res, r)
+	}
+	return res
+}