提交代码。

Signed-off-by: zouap <zouap@pcl.ac.cn>

models/user_business_analysis.go

@@ -183,10 +183,10 @@ func getLastCountDate() int64 {
 	return pageStartTime.Unix()
 }
 
-func QueryUserStaticDataCurrentMonth(page int, pageSize int, tableName string) ([]*UserBusinessAnalysisAll, int64) {
+func QueryUserStaticDataByTableName(page int, pageSize int, tableName string) ([]*UserBusinessAnalysisAll, int64) {
 	statictisSess := xStatistic.NewSession()
 	defer statictisSess.Close()
-	allCount, err := statictisSess.Count(new(UserBusinessAnalysisAll))
+	allCount, err := statictisSess.Count(tableName)
 	if err != nil {
 		log.Info("query error." + err.Error())
 		return nil, 0

routers/api/v1/api.go

@@ -550,6 +550,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 		m.Get("/query_user_last30_day", operationReq, repo_ext.QueryUserStaticLast30Day)
 		m.Get("/query_user_last_month", operationReq, repo_ext.QueryUserStaticLastMonth)
 		m.Get("/query_user_yesterday", operationReq, repo_ext.QueryUserStaticYesterday)
+		m.Get("/query_user_all", operationReq, repo_ext.QueryUserStaticAll)
 		// Users
 		m.Group("/users", func() {
 			m.Get("/search", user.Search)

routers/repo/user_data_analysis.go

@@ -15,7 +15,7 @@ import (
 	"github.com/360EntSecGroup-Skylar/excelize/v2"
 )
 
-func QueryUserStaticCurrentMonth(ctx *context.Context) {
+func queryUserDataPage(ctx *context.Context, tableName string) {
 	page := ctx.QueryInt("page")
 	if page <= 0 {
 		page = 1
@@ -24,31 +24,39 @@ func QueryUserStaticCurrentMonth(ctx *context.Context) {
 	if pageSize <= 0 {
 		pageSize = setting.UI.IssuePagingNum
 	}
-	re, count := models.QueryUserStaticDataCurrentMonth(page, pageSize, "user_business_analysis_current_month")
+	re, count := models.QueryUserStaticDataByTableName(page, pageSize, tableName)
 	mapInterface := make(map[string]interface{})
 	mapInterface["data"] = re
 	mapInterface["count"] = count
 	ctx.JSON(http.StatusOK, mapInterface)
 }
 
-func QueryUserStaticCurrentWeek(ctx *context.Context) {
+func QueryUserStaticCurrentMonth(ctx *context.Context) {
+	queryUserDataPage(ctx, "user_business_analysis_current_month")
+}
 
+func QueryUserStaticCurrentWeek(ctx *context.Context) {
+	queryUserDataPage(ctx, "user_business_analysis_current_week")
 }
 
 func QueryUserStaticCurrentYear(ctx *context.Context) {
-
+	queryUserDataPage(ctx, "user_business_analysis_current_year")
 }
 
 func QueryUserStaticLast30Day(ctx *context.Context) {
-
+	queryUserDataPage(ctx, "user_business_analysis_last30_day")
 }
 
 func QueryUserStaticLastMonth(ctx *context.Context) {
-
+	queryUserDataPage(ctx, "user_business_analysis_last_month")
 }
 
 func QueryUserStaticYesterday(ctx *context.Context) {
+	queryUserDataPage(ctx, "user_business_analysis_yesterday")
+}
 
+func QueryUserStaticAll(ctx *context.Context) {
+	queryUserDataPage(ctx, "user_business_analysis_all")
 }
 
 func QueryUserStaticDataPage(ctx *context.Context) {

web_src/js/components/UserAnalysis.vue

@@ -282,58 +282,38 @@
                 }else{
                     switch(type_val){
                         case "yesterday_usr":{
-                            var now = new Date();
-                            var tmp = new Date(now.setTime(now.getTime()-24*60*60*1000));
-                            var yesterday = this.formatDate(tmp.getFullYear(),tmp.getMonth()+1,tmp.getDate());
-                            this.params.startDate = yesterday
-                            this.params.endDate = yesterday
                             this.value_time=[]
-                            // document.getElementById("yesterday_usr").style.backgroundColor="409effd6"
-                            // document.getElementById("current_week_usr")
+                            url = '../api/v1/query_user_yesterday';
                             break
                         }
                         case "current_week_usr":{
-                            var now = new Date(); // 当前日期
-                            var nowDayOfWeek = now.getDay(); // 今天本周的第几天
-                            var day = nowDayOfWeek || 7;
-                            this.params.startDate = this.formatDate(now.getFullYear(), nowMonth+1, nowDay + 1 - day);
-                            this.params.endDate = today
                             this.value_time=[]
+                            url = '../api/v1/query_user_current_week';
                             break
                         }
                         case "current_month_usr":{
-                            console.log("go " + type_val)
-                            this.params.startDate =  this.formatDate(nowYear,nowMonth+1,1);
-                            this.params.endDate = today
                             this.value_time=[]
                             url = '../api/v1/query_user_current_month';
                             break
                         }
                         case "last_month_usr":{
-                            this.params.startDate=this.formatDate(nowYear, lastMonth+1, 1);
-                            this.params.endDate=this.formatDate(nowYear, lastMonth+1, this.getMonthDays(nowYear,lastMonth));
                             this.value_time=[]
+                            url = '../api/v1/query_user_last_month';
                             break
-
                         }
                         case "monthly_usr":{
-                            var temp=new Date(now - 1000 * 60 * 60 * 24 * 30)
-                            this.params.startDate = this.formatDate(temp.getFullYear(),temp.getMonth()+1,temp.getDate());
-                            this.params.endDate = today
                             this.value_time=[]
+                            url = '../api/v1/query_user_last30_day';
                             break
                         }
                         case "current_year_usr":{
-                            this.params.startDate = this.formatDate(now.getFullYear(), 1, 1);
-                            this.params.endDate = today
                             this.value_time=[]
+                            url = '../api/v1/query_user_current_year';
                             break
                         }
                         case "all_usr":{
-                            console.log("e:"+today)
-                            this.params.startDate = 'all'//this.formatDate(2000, 1, 1); //this.recordBeginTime//
-                            this.params.endDate = today
                             this.value_time=[]
+                            url = '../api/v1/query_user_all';
                             break
                         }
                     }