liuxiaolong
2019-12-16 74f40b1014b479407ca8494a04f56b3919bd03b2
add PasteRules
4个文件已修改
46 ■■■■ 已修改文件
controllers/cameraTask.go 39 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
go.mod 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
go.sum 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
router/router.go 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
controllers/cameraTask.go
@@ -84,7 +84,7 @@
// @Success 200 {string} json "{"code":200, success:true,  msg:"请求处理成功", data:"所有任务信息"}"
// @Failure 500 {string} json "{"code":500, success:false   msg:"",data:"错误信息内容"}"
// @Router /data/api-v/camera/alltask [post]
func (controller CameraTaskController) FindTasksByCameraIds(c *gin.Context){
func (ctc CameraTaskController) FindTasksByCameraIds(c *gin.Context){
    var mulCamera MultiCamera
    c.BindJSON(&mulCamera)
    var api dbapi.CameraTaskApi
@@ -135,7 +135,7 @@
// @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
// @Failure 500 {string} json "{"code":500, success:false, msg:"", data:""}"
// @Router /data/api-v/camera/task/{cameraId} [get]
func (controller CameraTaskController) CameraTaskAll(c *gin.Context) {
func (ctc CameraTaskController) CameraTaskAll(c *gin.Context) {
    cameraId := c.Param("cameraId")
    if cameraId == "" {
        util.ResponseFormat(c,code.RequestParamError,"摄像机id不能为空")
@@ -176,6 +176,35 @@
        util.ResponseFormat(c,code.Success,data)
    } else {
        util.ResponseFormat(c, code.ComError, data)
    }
}
type PasteRuleArg struct {
    SourceId string `json:"sourceId" binding:"required"`
    TargetIds []string `json:"targetIds" binging:"required"`
}
// @Summary 复制摄像机规则到选定的多个摄像机
// @Description 复制摄像机规则到选定的多个摄像机
// @Accept json
// @Produce json
// @Tags CameraTask
// @Param args body controllers.PasteRuleArg 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/camera/pasteRules [post]
func (ctc CameraTaskController) PasteRules(c *gin.Context) {
    var reqBody PasteRuleArg
    err := c.BindJSON(&reqBody)
    if err != nil {
        util.ResponseFormat(c, code.RequestParamError, "")
        return
    }
    var api dbapi.CameraTaskApi
    if api.PasteRules(reqBody.SourceId, reqBody.TargetIds) {
        util.ResponseFormat(c,code.Success,"")
    } else {
        util.ResponseFormat(c,code.ComError,"")
    }
}
@@ -226,7 +255,7 @@
// @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
// @Failure 500 {string} json "{"code":500, success:false, msg:"", data:""}"
// @Router /data/api-v/cameraTask/saveIsDataTrans [post]
func (controller CameraTaskController) SaveIsDataTrans(c *gin.Context) {
func (ctc CameraTaskController) SaveIsDataTrans(c *gin.Context) {
    var transVo DataTransVo
    if err := c.BindJSON(&transVo);err!=nil {
        util.ResponseFormat(c,code.RequestParamError,"参数有误")
@@ -253,7 +282,7 @@
// @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
// @Failure 500 {string} json "{"code":500, success:false, msg:"", data:""}"
// @Router /data/api-v/cameraTask/saveAlarmLevelByGroup [post]
func (controller CameraTaskController) SaveAlarmLevelByGroup(c *gin.Context) {
func (ctc CameraTaskController) SaveAlarmLevelByGroup(c *gin.Context) {
    var groupLevelVo GroupAlarmLevelVo
    if err := c.BindJSON(&groupLevelVo);err !=nil {
        util.ResponseFormat(c,code.RequestParamError,"参数有误")
@@ -285,7 +314,7 @@
// @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
// @Failure 500 {string} json "{"code":500, success:false, msg:"", data:""}"
// @Router /data/api-v/cameraTask/updateCameraTaskStatus [post]
func (controller CameraTaskController) UpdateCameraTaskStatus(c *gin.Context) {
func (ctc CameraTaskController) UpdateCameraTaskStatus(c *gin.Context) {
    var paramVo CameraTaskStatusVo
    if err := c.BindJSON(&paramVo);err !=nil {
        util.ResponseFormat(c,code.RequestParamError,"参数有误")
go.mod
@@ -3,7 +3,7 @@
go 1.12
require (
    basic.com/dbapi.git v0.0.0-20191214101308-78687a8f4229 // indirect
    basic.com/dbapi.git v0.0.0-20191216030028-03153c1f1f30 // 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
go.sum
@@ -1,5 +1,5 @@
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/dbapi.git v0.0.0-20191216030028-03153c1f1f30 h1:nesVta2Rf3LAqyFtGAqNOI+Mf9SqHa4gz1Dj38nm5bk=
basic.com/dbapi.git v0.0.0-20191216030028-03153c1f1f30/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=
router/router.go
@@ -112,6 +112,7 @@
        camera.POST("/ptzControl", ptzController.Move)
        camera.GET("/statisticRunInfo", cameraController.StatisticRunInfo)
        camera.POST("/pasteRules", cameraTaskController.PasteRules)
    }
    cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")