From 379dcbe019f9283f8dc594f582b61523ec458989 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 03 十二月 2019 14:34:04 +0800
Subject: [PATCH] fix
---
go.sum | 4 ++--
controllers/fileAnalysisSetting.go | 17 ++++++++++++++++-
go.mod | 2 +-
controllers/fileAnalysis.go | 7 ++++---
4 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/controllers/fileAnalysis.go b/controllers/fileAnalysis.go
index da6c3af..9009f14 100644
--- a/controllers/fileAnalysis.go
+++ b/controllers/fileAnalysis.go
@@ -16,15 +16,16 @@
// @Description 鑾峰彇鏈湴鏂囦欢鍒楄〃
// @Produce json
// @Tags 鏈湴鏂囦欢
+// @Param fileName query string false "鏍规嵁鏂囦欢鍚嶇О鏌ヨ"
// @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")
var api dbapi.FileAnalysisApi
- arr, _ := api.FindAllFile(fileName)
- if arr !=nil && len(arr) >0 {
- util.ResponseFormat(c,code.Success,arr)
+ b, d := api.FindAllFile(fileName)
+ if b {
+ util.ResponseFormat(c,code.Success, d)
} else {
util.ResponseFormat(c,code.Success,[]interface{}{})
}
diff --git a/controllers/fileAnalysisSetting.go b/controllers/fileAnalysisSetting.go
index b7d7628..11c4f59 100644
--- a/controllers/fileAnalysisSetting.go
+++ b/controllers/fileAnalysisSetting.go
@@ -11,7 +11,13 @@
}
-
+// @Summary 鑾峰彇鏈湴鏂囦欢寮�鍏宠缃�
+// @Description 鑾峰彇鏈湴鏂囦欢寮�鍏宠缃�
+// @Produce json
+// @Tags 鏈湴鏂囦欢
+// @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
+// @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
+// @Router /data/api-v/fileSetting/show [get]
func (fsc FileAnalysisSettingController) Show(c *gin.Context) {
var api dbapi.FileAnalysisApi
setting, err := api.GetFileAnalysisSet()
@@ -26,6 +32,15 @@
Enable bool `json:"enable"`
}
+// @Summary 鍒囨崲鏈湴鏂囦欢鍒嗘瀽寮�鍏�
+// @Description 鍒囨崲鏈湴鏂囦欢鍒嗘瀽寮�鍏�
+// @Accept json
+// @Produce json
+// @Tags 鏈湴鏂囦欢
+// @Param reqBody body controllers.EnableSet 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/fileSetting/changeEnable [post]
func (fsc FileAnalysisSettingController) ChangeEnable(c *gin.Context) {
var reqBody EnableSet
c.BindJSON(&reqBody)
diff --git a/go.mod b/go.mod
index 8796de8..febb60c 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@
go 1.12
require (
- basic.com/dbapi.git v0.0.0-20191202091445-8ddb48697708 // indirect
+ basic.com/dbapi.git v0.0.0-20191203063234-03f4e6e0222e // 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 ec3ae49..4f00bd7 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,5 @@
-basic.com/dbapi.git v0.0.0-20191202091445-8ddb48697708 h1:8lk1xOxDhlOftb7xaFSaB554zP97Y2m2oW4dJrHZnNM=
-basic.com/dbapi.git v0.0.0-20191202091445-8ddb48697708/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
+basic.com/dbapi.git v0.0.0-20191203063234-03f4e6e0222e h1:DyIvWq/zeq+y82NFVWm5xnpGxSs65/8RZWGo2fpVnGo=
+basic.com/dbapi.git v0.0.0-20191203063234-03f4e6e0222e/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