forked from Gitlink/gitea-1120-rc1
[FIX]statistic use timestamp
This commit is contained in:
parent
9c92113a43
commit
cb5e96134f
|
@ -5,6 +5,7 @@ import (
|
||||||
"code.gitea.io/gitea/modules/context"
|
"code.gitea.io/gitea/modules/context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -17,12 +18,12 @@ func GetActivity(ctx *context.APIContext) {
|
||||||
// parameters:
|
// parameters:
|
||||||
// - name: from
|
// - name: from
|
||||||
// in: query
|
// in: query
|
||||||
// description: Query begin date
|
// description: Query begin timestamp
|
||||||
// type: string
|
// type: string
|
||||||
// required: false
|
// required: false
|
||||||
// - name: to
|
// - name: to
|
||||||
// in: query
|
// in: query
|
||||||
// description: Query end date
|
// description: Query end timestamp
|
||||||
// type: string
|
// type: string
|
||||||
// required: false
|
// required: false
|
||||||
// responses:
|
// responses:
|
||||||
|
@ -61,12 +62,12 @@ func GetActivityDevelop(ctx *context.APIContext) {
|
||||||
// parameters:
|
// parameters:
|
||||||
// - name: from
|
// - name: from
|
||||||
// in: query
|
// in: query
|
||||||
// description: Query begin date
|
// description: Query begin timestamp
|
||||||
// type: string
|
// type: string
|
||||||
// required: false
|
// required: false
|
||||||
// - name: to
|
// - name: to
|
||||||
// in: query
|
// in: query
|
||||||
// description: Query end date
|
// description: Query end timestamp
|
||||||
// type: string
|
// type: string
|
||||||
// required: false
|
// required: false
|
||||||
// - name: top
|
// - name: top
|
||||||
|
@ -114,12 +115,12 @@ func GetActivityProject(ctx *context.APIContext) {
|
||||||
// parameters:
|
// parameters:
|
||||||
// - name: from
|
// - name: from
|
||||||
// in: query
|
// in: query
|
||||||
// description: Query begin date
|
// description: Query begin timestamp
|
||||||
// type: string
|
// type: string
|
||||||
// required: false
|
// required: false
|
||||||
// - name: to
|
// - name: to
|
||||||
// in: query
|
// in: query
|
||||||
// description: Query end date
|
// description: Query end timestamp
|
||||||
// type: string
|
// type: string
|
||||||
// required: false
|
// required: false
|
||||||
// - name: top
|
// - name: top
|
||||||
|
@ -195,41 +196,33 @@ func GetParamOption(ctx *context.APIContext) (opt *models.GetGetActivityOptions)
|
||||||
}
|
}
|
||||||
|
|
||||||
//##from
|
//##from
|
||||||
from:=ctx.QueryTrim("from")
|
FromDate, err := strconv.ParseInt(ctx.QueryTrim("from"), 10, 64)
|
||||||
if from=="" {
|
|
||||||
ctx.Error(http.StatusBadRequest,"param.from", fmt.Errorf("请指定from参数"))
|
|
||||||
return
|
|
||||||
//from=time.Now().Format("2006-01-02")
|
|
||||||
}
|
|
||||||
if len(from)<=10 {
|
|
||||||
from = from + " 00:00:00"
|
|
||||||
}
|
|
||||||
t,err:= time.ParseInLocation(Layout,from,time.Local)
|
|
||||||
if err!=nil {
|
if err!=nil {
|
||||||
ctx.Error(http.StatusBadRequest,"param.from", err)
|
ctx.Error(http.StatusBadRequest,"param.from", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
FromDate:=t.Unix()
|
if FromDate <= 0 {
|
||||||
|
ctx.Error(http.StatusBadRequest,"param.from", fmt.Errorf("请指定from参数"))
|
||||||
|
return
|
||||||
|
//from=time.Now().Format("2006-01-02")
|
||||||
|
}
|
||||||
|
|
||||||
|
from := time.Unix(FromDate, 0).Format(Layout)
|
||||||
//fmt.Println("********from:",from," ", FromDate," convert:",time.Unix( FromDate,0).Format("2006-01-02 15:04:05"))
|
//fmt.Println("********from:",from," ", FromDate," convert:",time.Unix( FromDate,0).Format("2006-01-02 15:04:05"))
|
||||||
|
|
||||||
|
|
||||||
//##to
|
//##to
|
||||||
to:=ctx.QueryTrim("to")
|
ToDate, err := strconv.ParseInt(ctx.QueryTrim("to"), 10, 64)
|
||||||
if to =="" {
|
|
||||||
ctx.Error(http.StatusBadRequest,"param.to", fmt.Errorf("请指定to参数"))
|
|
||||||
return
|
|
||||||
//to =time.Now().Format("2006-01-02")
|
|
||||||
}
|
|
||||||
if len(to )<=10 {
|
|
||||||
to = to + " 23:59:59"
|
|
||||||
}
|
|
||||||
|
|
||||||
t,err= time.ParseInLocation(Layout,to ,time.Local)
|
|
||||||
if err!=nil {
|
if err!=nil {
|
||||||
ctx.Error(http.StatusBadRequest,"param.to ", err)
|
ctx.Error(http.StatusBadRequest,"param.to ", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
ToDate:=t.Unix()
|
if ToDate <= 0 {
|
||||||
|
ctx.Error(http.StatusBadRequest,"param.to", fmt.Errorf("请指定to参数"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
to := time.Unix(ToDate, 0).Format(Layout)
|
||||||
|
|
||||||
//fmt.Println("********to:",to ," ", ToDate," convert:",time.Unix( ToDate,0).Format(Layout))
|
//fmt.Println("********to:",to ," ", ToDate," convert:",time.Unix( ToDate,0).Format(Layout))
|
||||||
opt= &models.GetGetActivityOptions{
|
opt= &models.GetGetActivityOptions{
|
||||||
|
|
|
@ -36,13 +36,13 @@
|
||||||
"parameters": [
|
"parameters": [
|
||||||
{
|
{
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"description": "Query begin date",
|
"description": "Query begin timestamp",
|
||||||
"name": "from",
|
"name": "from",
|
||||||
"in": "query"
|
"in": "query"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"description": "Query end date",
|
"description": "Query end timestamp",
|
||||||
"name": "to",
|
"name": "to",
|
||||||
"in": "query"
|
"in": "query"
|
||||||
}
|
}
|
||||||
|
@ -70,13 +70,13 @@
|
||||||
"parameters": [
|
"parameters": [
|
||||||
{
|
{
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"description": "Query begin date",
|
"description": "Query begin timestamp",
|
||||||
"name": "from",
|
"name": "from",
|
||||||
"in": "query"
|
"in": "query"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"description": "Query end date",
|
"description": "Query end timestamp",
|
||||||
"name": "to",
|
"name": "to",
|
||||||
"in": "query"
|
"in": "query"
|
||||||
},
|
},
|
||||||
|
@ -110,13 +110,13 @@
|
||||||
"parameters": [
|
"parameters": [
|
||||||
{
|
{
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"description": "Query begin date",
|
"description": "Query begin timestamp",
|
||||||
"name": "from",
|
"name": "from",
|
||||||
"in": "query"
|
"in": "query"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"description": "Query end date",
|
"description": "Query end timestamp",
|
||||||
"name": "to",
|
"name": "to",
|
||||||
"in": "query"
|
"in": "query"
|
||||||
},
|
},
|
||||||
|
@ -15932,4 +15932,4 @@
|
||||||
"TOTPHeader": []
|
"TOTPHeader": []
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue