From f851fa7727e4b2384bd5c32793bd58c07e55a53d Mon Sep 17 00:00:00 2001 From: liuxiaolong <736321739@qq.com> Date: 星期四, 12 十二月 2019 14:24:24 +0800 Subject: [PATCH] FindAllFile add page and size --- go.sum | 4 ++-- go.mod | 2 +- controllers/fileAnalysis.go | 7 ++++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/controllers/fileAnalysis.go b/controllers/fileAnalysis.go index 0bf98dd..29d6807 100644 --- a/controllers/fileAnalysis.go +++ b/controllers/fileAnalysis.go @@ -3,6 +3,7 @@ import ( "basic.com/dbapi.git" "github.com/gin-gonic/gin" + "strconv" "webserver/extend/code" "webserver/extend/util" ) @@ -17,13 +18,17 @@ // @Produce json // @Tags 鏈湴鏂囦欢 // @Param fileName query string false "鏍规嵁鏂囦欢鍚嶇О鏌ヨ" +// @Param page query int true "褰撳墠椤�" +// @Param size query int true "姣忛〉鏁伴噺" // @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}" // @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}" // @Router /data/api-v/fileAnalysis/findAllFile [get] func (fac FileAnalysisController) FindAllFile(c *gin.Context) { fileName := c.Query("fileName") + page,_ := strconv.Atoi(c.Query("page")) + size,_ := strconv.Atoi(c.Query("size")) var api dbapi.FileAnalysisApi - b, d := api.FindAllFile(fileName) + b, d := api.FindAllFile(fileName, page, size) if b { util.ResponseFormat(c,code.Success, d) } else { diff --git a/go.mod b/go.mod index 274e350..4a65c2e 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ go 1.12 require ( - basic.com/dbapi.git v0.0.0-20191206094402-4095cde22505 // indirect + basic.com/dbapi.git v0.0.0-20191212060052-90d268dbd544 // indirect basic.com/fileServer/WeedFSClient.git v0.0.0-20190919054037-0182b6c3f5cb // indirect basic.com/gb28181api.git v0.0.0-20191028082253-472438a8407b // indirect basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48 // indirect diff --git a/go.sum b/go.sum index 25b3a6b..faa2f5e 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -basic.com/dbapi.git v0.0.0-20191206094402-4095cde22505 h1:S0ACgBXa7J+eQ+0zC+tmJ8NZsqs3CjXm/eQjKaQQZLw= -basic.com/dbapi.git v0.0.0-20191206094402-4095cde22505/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q= +basic.com/dbapi.git v0.0.0-20191212060052-90d268dbd544 h1:bcy08xFgjJnXa4T0LzsV6+wQIWauq9wG4ZoPY+j7aFw= +basic.com/dbapi.git v0.0.0-20191212060052-90d268dbd544/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q= basic.com/fileServer/WeedFSClient.git v0.0.0-20190919054037-0182b6c3f5cb h1:fM6DojeInFSCFO+wkba1jtyPiSDqw0jYKi4Tk+e+ka4= basic.com/fileServer/WeedFSClient.git v0.0.0-20190919054037-0182b6c3f5cb/go.mod h1:FTryK8BsVLfUplx8a3+l8hJWub6VbAWZCUH7sPRZaso= basic.com/gb28181api.git v0.0.0-20191028082253-472438a8407b h1:Qh7x2PY3HA9B404Llq+olY5/YlGYrM58bpOHa2CGcro= -- Gitblit v1.8.0