From 2541583d12b49a1072caa57bc316ff15ba8a6d2f Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 14 十二月 2019 18:14:56 +0800
Subject: [PATCH] FindAllFile add arg
---
go.sum | 8 ++++----
go.mod | 4 ++--
controllers/fileAnalysis.go | 4 +++-
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/controllers/fileAnalysis.go b/controllers/fileAnalysis.go
index 29d6807..863601c 100644
--- a/controllers/fileAnalysis.go
+++ b/controllers/fileAnalysis.go
@@ -20,6 +20,7 @@
// @Param fileName query string false "鏍规嵁鏂囦欢鍚嶇О鏌ヨ"
// @Param page query int true "褰撳墠椤�"
// @Param size query int true "姣忛〉鏁伴噺"
+// @Param type query int true "0:澶勭悊瀹屾垚锛�1:澶勭悊涓紝2:鏈厤瑙勫垯锛�3:澶勭悊澶辫触"
// @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]
@@ -27,8 +28,9 @@
fileName := c.Query("fileName")
page,_ := strconv.Atoi(c.Query("page"))
size,_ := strconv.Atoi(c.Query("size"))
+ fType,_ := strconv.Atoi(c.Query("type"))
var api dbapi.FileAnalysisApi
- b, d := api.FindAllFile(fileName, page, size)
+ b, d := api.FindAllFile(fileName, fType, page, size)
if b {
util.ResponseFormat(c,code.Success, d)
} else {
diff --git a/go.mod b/go.mod
index 1815fae..2c15d51 100644
--- a/go.mod
+++ b/go.mod
@@ -3,12 +3,12 @@
go 1.12
require (
- basic.com/dbapi.git v0.0.0-20191213115425-eab8959710d4 // indirect
+ basic.com/dbapi.git v0.0.0-20191214101308-78687a8f4229 // 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
basic.com/pubsub/esutil.git v0.0.0-20191120125514-865efa73a9ae // indirect
- basic.com/pubsub/protomsg.git v0.0.0-20191204083653-a32445f65a09 // indirect
+ basic.com/pubsub/protomsg.git v0.0.0-20191214074537-d14cd01b7d11 // indirect
basic.com/valib/capture.git v0.0.0-20191126081138-bf954c0fa627 // indirect
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051
basic.com/valib/gopherdiscovery.git v0.0.0-20190605034340-15d89d8b4e28 // indirect
diff --git a/go.sum b/go.sum
index 3411eba..8046aff 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,5 @@
-basic.com/dbapi.git v0.0.0-20191213115425-eab8959710d4 h1:SGXoh3HxiCgWI0TnESJGLWXLNCcNLXtm/cVRhPpyGkw=
-basic.com/dbapi.git v0.0.0-20191213115425-eab8959710d4/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
+basic.com/dbapi.git v0.0.0-20191214101308-78687a8f4229 h1:FexzsjiZQfcDyUuzYQ+lBr30LR+Sh/HyprJASS4YCks=
+basic.com/dbapi.git v0.0.0-20191214101308-78687a8f4229/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=
@@ -8,8 +8,8 @@
basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48/go.mod h1:gHLJZz2ee1cGL0X0ae69fs56bAxkDgEQwDhhXZJNUcY=
basic.com/pubsub/esutil.git v0.0.0-20191120125514-865efa73a9ae h1:/j1dIDLxzEp51N+ZHZIq1xeYVK9zz8epWEAfw01uWe8=
basic.com/pubsub/esutil.git v0.0.0-20191120125514-865efa73a9ae/go.mod h1:yIvppFPFGC61DOdm71ujnsxZBMFUu2yKjr5O43bMWCw=
-basic.com/pubsub/protomsg.git v0.0.0-20191204083653-a32445f65a09 h1:3Aiyv/In6oJvjUI6jb5N+vt7S4jUqUf+bVEbOKxK6k0=
-basic.com/pubsub/protomsg.git v0.0.0-20191204083653-a32445f65a09/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
+basic.com/pubsub/protomsg.git v0.0.0-20191214074537-d14cd01b7d11 h1:w3sAb5ntp+io6lgGevU1W/ue9bvdvpm8cDvcjlDDwlE=
+basic.com/pubsub/protomsg.git v0.0.0-20191214074537-d14cd01b7d11/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/valib/capture.git v0.0.0-20191126081138-bf954c0fa627 h1:26J3wU05U/v72SvUvtFc6Ymgvlill9SXbRn/cMGE5k0=
basic.com/valib/capture.git v0.0.0-20191126081138-bf954c0fa627/go.mod h1:y+h7VUnoSQ3jOtf2K3twXNA8fYDfyUsifSswcyKLgNw=
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051/go.mod h1:bkYiTUGzckyNOjAgn9rB/DOjFzwoSHJlruuWQ6hu6IY=
--
Gitblit v1.8.0