From 65b556e1fe3c98320475b580cf78eef4e2cace64 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 17 May 2022 15:39:59 +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   |  2 +-
 routers/repo/user_data_analysis.go | 24 ++++++++++--------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go
index 86c0cfc13..ca6936904 100644
--- a/models/user_business_analysis.go
+++ b/models/user_business_analysis.go
@@ -228,7 +228,7 @@ func getLastCountDate() int64 {
 	return pageStartTime.Unix()
 }
 
-func QueryMetricsPage(start int64, end int64, page int, pageSize int) ([]*UserMetrics, int64) {
+func QueryMetricsPage(start int64, end int64) ([]*UserMetrics, int64) {
 
 	statictisSess := xStatistic.NewSession()
 	defer statictisSess.Close()
diff --git a/routers/repo/user_data_analysis.go b/routers/repo/user_data_analysis.go
index 82143a57b..4a3ff5f38 100755
--- a/routers/repo/user_data_analysis.go
+++ b/routers/repo/user_data_analysis.go
@@ -256,14 +256,6 @@ func queryUserDataPage(ctx *context.Context, tableName string, queryObj interfac
 
 func queryMetrics(ctx *context.Context, tableName string, startTime time.Time, endTime time.Time) {
 
-	page := ctx.QueryInt("page")
-	if page <= 0 {
-		page = 1
-	}
-	pageSize := ctx.QueryInt("pageSize")
-	if pageSize <= 0 {
-		pageSize = setting.UI.IssuePagingNum
-	}
 	IsReturnFile := ctx.QueryBool("IsReturnFile")
 
 	var count int64
@@ -275,7 +267,7 @@ func queryMetrics(ctx *context.Context, tableName string, startTime time.Time, e
 		result = models.QueryMetricsForAll(startTime.Unix(), endTime.Unix())
 		count = int64(len(result))
 	} else {
-		result, count = models.QueryMetricsPage(startTime.Unix(), endTime.Unix(), page, pageSize)
+		result, count = models.QueryMetricsPage(startTime.Unix(), endTime.Unix())
 	}
 	if IsReturnFile {
 		//writer exec file.
@@ -297,6 +289,9 @@ func queryMetrics(ctx *context.Context, tableName string, startTime time.Time, e
 		//设置默认打开的表单
 		xlsx.SetActiveSheet(index)
 		filename := sheetName + "_" + ctx.Tr("user.static."+tableName) + ".xlsx"
+		if tableName == "" {
+			filename = sheetName + "_" + startTime.Format("20060102") + "_" + endTime.Format("20060102")
+		}
 		ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+url.QueryEscape(filename))
 		ctx.Resp.Header().Set("Content-Type", "application/octet-stream")
 		if _, err := xlsx.WriteTo(ctx.Resp); err != nil {
@@ -433,12 +428,13 @@ func QueryUserMetricDataPage(ctx *context.Context) {
 	if pageSize <= 0 {
 		pageSize = setting.UI.IssuePagingNum
 	}
-	result, count := models.QueryMetricsPage(startTime.Unix(), endTime.Unix(), page, pageSize)
+	queryMetrics(ctx, "", startTime, endTime)
+	// result, count := models.QueryMetricsPage(startTime.Unix(), endTime.Unix(), page, pageSize)
 
-	mapInterface := make(map[string]interface{})
-	mapInterface["data"] = result
-	mapInterface["count"] = count
-	ctx.JSON(http.StatusOK, mapInterface)
+	// mapInterface := make(map[string]interface{})
+	// mapInterface["data"] = result
+	// mapInterface["count"] = count
+	// ctx.JSON(http.StatusOK, mapInterface)
 }
 
 func QueryUserStaticDataPage(ctx *context.Context) {