From eff19d68fed3bbeb1e671455b502885f98fc11cb Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 02 三月 2020 17:20:12 +0800
Subject: [PATCH] fix
---
controllers/fileAnalysis.go | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/controllers/fileAnalysis.go b/controllers/fileAnalysis.go
index 6fd5fa4..b212ded 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,19 @@
// @Produce json
// @Tags 鏈湴鏂囦欢
// @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]
func (fac FileAnalysisController) FindAllFile(c *gin.Context) {
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)
+ b, d := api.FindAllFile(fileName, fType, page, size)
if b {
util.ResponseFormat(c,code.Success, d)
} else {
@@ -38,13 +45,19 @@
type SortVo struct {
Id string `json:"id" binding:"required"`
- Direct int `json:"direct" binding:"required" example:"1:鍚戜笂锛�2锛氬悜涓�"`
+ Direct int `json:"direct" binding:"required"`
}
type FileStatusVo struct {
Ids []string `json:"ids" binding:"required"`
Status int `json:"status" binding:"required"`
}
+
+const (
+ File_Img_Id_Pre = "img_"
+ File_Video_Id_Pre = "video_"
+ File_Audio_Id_Pre = "audio_"
+)
// @Security ApiKeyAuth
// @Summary 寮�鍚垨鏆傚仠鏂囦欢鍒嗘瀽
@@ -129,3 +142,41 @@
}
}
+
+// @Security ApiKeyAuth
+// @Summary 鎸夋暟鎹爤id鏌ユ壘鏂囦欢
+// @Description 鎸夋暟鎹爤id鏌ユ壘鏂囦欢
+// @Accept json
+// @Produce json
+// @Tags 鏈湴鏂囦欢
+// @Param stackId query string true "stackId"
+// @Param type query int true "type"
+// @Param name query string "鎼滅储鏉′欢"
+// @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/findByStackId [get]
+func (fac FileAnalysisController) FindByStackId(c *gin.Context) {
+ stackId := c.Query("stackId")
+ if stackId == "" {
+ util.ResponseFormat(c,code.RequestParamError, "")
+ return
+ }
+ typ,_ := strconv.Atoi(c.Query("type"))
+ page,_ := strconv.Atoi(c.Query("page"))
+ size,_ := strconv.Atoi(c.Query("size"))
+ if page <= 0 {
+ page = 1
+ }
+ if size <= 0 {
+ size = 20
+ }
+ var api dbapi.FileAnalysisApi
+ arr,err := api.FindByStackId(stackId, typ, page, size)
+ if err !=nil {
+ util.ResponseFormat(c,code.ComError, "")
+ } else {
+ util.ResponseFormat(c,code.Success, arr)
+ }
+}
--
Gitblit v1.8.0