From c514f25ed39ff47e96096376e6006a95b806e6d5 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期三, 03 六月 2020 11:56:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/webserver
---
controllers/cameraTaskArgs.go | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/controllers/cameraTaskArgs.go b/controllers/cameraTaskArgs.go
index ebc6b1b..325d59f 100644
--- a/controllers/cameraTaskArgs.go
+++ b/controllers/cameraTaskArgs.go
@@ -174,22 +174,26 @@
}
}
+type RuleApply2AllVo struct {
+ CameraId string `json:"camera_id" binding:"required"`//瑙勫垯鎷ユ湁鑰卛d
+}
+
// @Summary 灏嗘湰鏉¤鍒欏簲鐢ㄥ埌鎵�鏈夋湰鍦拌棰�
// @Description 灏嗘湰鏉¤鍒欏簲鐢ㄥ埌鎵�鏈夋湰鍦拌棰�
// @Produce json
// @Tags CameraTaskArgs
-// @Param args body controllers.CameraTaskSaveArg true "瑙勫垯搴旂敤鍒版墍鏈夋湰鍦拌棰戣姹傚弬鏁�"
+// @Param args body controllers.RuleApply2AllVo 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/cameraTaskArgs/ruleApply2All [post]
func (controller CameraTaskArgsController) RuleApply2All(c *gin.Context) {
- var saveBody CameraTaskSaveArg
+ var saveBody RuleApply2AllVo
err := c.BindJSON(&saveBody)
- if err !=nil || saveBody.TaskId == "" || len(saveBody.CameraIds) !=1 || saveBody.GroupText == "" || len(saveBody.GroupRule) ==0 {
+ if err !=nil {
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
return
}
- if !strings.HasPrefix(saveBody.CameraIds[0], File_Video_Id_Pre) && !strings.HasPrefix(saveBody.CameraIds[0], File_Img_Id_Pre) && !!strings.HasPrefix(saveBody.CameraIds[0], File_Audio_Id_Pre) {
+ if !strings.HasPrefix(saveBody.CameraId, File_Video_Id_Pre) && !strings.HasPrefix(saveBody.CameraId, File_Img_Id_Pre) && !!strings.HasPrefix(saveBody.CameraId, File_Audio_Id_Pre) {
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
return
}
--
Gitblit v1.8.0