From 309e0c7f3d09baa04f9b57fdf732de469cdcbf39 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 06 十二月 2019 17:51:56 +0800
Subject: [PATCH] add RuleApply2All
---
go.sum | 4 ++--
go.mod | 2 +-
controllers/cameraTaskArgs.go | 32 +++++++++++++++++++++++++++++++-
router/router.go | 2 ++
4 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/controllers/cameraTaskArgs.go b/controllers/cameraTaskArgs.go
index 0b3d25f..6ec97ca 100644
--- a/controllers/cameraTaskArgs.go
+++ b/controllers/cameraTaskArgs.go
@@ -2,10 +2,11 @@
import (
"basic.com/dbapi.git"
+ "basic.com/valib/logger.git"
"github.com/gin-gonic/gin"
"strconv"
+ "strings"
"webserver/extend/code"
- "basic.com/valib/logger.git"
"webserver/extend/util"
)
@@ -171,4 +172,33 @@
} else {
util.ResponseFormat(c,code.ComError,data)
}
+}
+
+// @Summary 灏嗘湰鏉¤鍒欏簲鐢ㄥ埌鎵�鏈夋湰鍦拌棰�
+// @Description 灏嗘湰鏉¤鍒欏簲鐢ㄥ埌鎵�鏈夋湰鍦拌棰�
+// @Produce json
+// @Tags CameraTaskArgs
+// @Param args body Controllers.CameraTaskSaveArg 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
+ err := c.BindJSON(&saveBody)
+ if err !=nil || saveBody.TaskId == "" || len(saveBody.CameraIds) !=1 || saveBody.GroupText == "" || len(saveBody.GroupRule) ==0 {
+ 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) {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
+ return
+ }
+ var api dbapi.CameraTaskApi
+ paramBody := util.Struct2Map(saveBody)
+ flag, data := api.RuleApply2All(paramBody)
+ if flag {
+ util.ResponseFormat(c,code.Success,data)
+ } else {
+ util.ResponseFormat(c, code.ComError, data)
+ }
}
\ No newline at end of file
diff --git a/go.mod b/go.mod
index 2d6f2b2..274e350 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@
go 1.12
require (
- basic.com/dbapi.git v0.0.0-20191204094909-66f2832e579e // indirect
+ basic.com/dbapi.git v0.0.0-20191206094402-4095cde22505 // 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 92ef025..25b3a6b 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,5 @@
-basic.com/dbapi.git v0.0.0-20191204094909-66f2832e579e h1:z4Q3H6oQVfme7w4IEuhaYeO3R5CcY9UR4bQiJmCqJqY=
-basic.com/dbapi.git v0.0.0-20191204094909-66f2832e579e/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
+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/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=
diff --git a/router/router.go b/router/router.go
index 0171b32..0400d5c 100644
--- a/router/router.go
+++ b/router/router.go
@@ -120,6 +120,8 @@
cameraTaskArgsApi.POST("/getLinkRulesByCameraIds", cameraTaskArgsController.GetLinkRulesByCameraIds)
cameraTaskArgsApi.POST("/saveLinkRulesByGroup", cameraTaskArgsController.SaveLinkRulesByGroup)
cameraTaskArgsApi.POST("/updateDefenceStateByGroup", cameraTaskArgsController.UpdateDefenceStateByGroup)
+
+ cameraTaskArgsApi.POST("/ruleApply2All", cameraTaskArgsController.RuleApply2All)
}
cameraTaskApi := r.Group(urlPrefix + "/cameraTask")
--
Gitblit v1.8.0