From 263c7b18ce7f18f1222318f6e0e499e907895a52 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 13 十一月 2019 19:33:39 +0800
Subject: [PATCH] fix
---
controllers/cameraTaskArgs.go | 66 ++++++++++++--------------------
1 files changed, 25 insertions(+), 41 deletions(-)
diff --git a/controllers/cameraTaskArgs.go b/controllers/cameraTaskArgs.go
index 5ccf893..e28e5ec 100644
--- a/controllers/cameraTaskArgs.go
+++ b/controllers/cameraTaskArgs.go
@@ -3,7 +3,9 @@
import (
"basic.com/dbapi.git"
"github.com/gin-gonic/gin"
+ "strconv"
"webserver/extend/code"
+ "basic.com/valib/logger.git"
"webserver/extend/util"
)
@@ -11,17 +13,6 @@
}
-
-// @Summary 鏍规嵁鎽勫儚鏈篿d鍜屼换鍔d鏌ヨ绠楁硶閰嶇疆璇︽儏
-// @Description 鏍规嵁鎽勫儚鏈篿d鍜屼换鍔d鏌ヨ绠楁硶閰嶇疆璇︽儏
-// @Produce json
-// @Tags CameraTaskArgs
-// @Param cameraId query string true "鎽勫儚鏈篿d"
-// @Param taskId query string true "浠诲姟id"
-// @Param set_type query string 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/getRulesByCameraAndTask [get]
func (controller CameraTaskArgsController) FindByCameraAndTask(c *gin.Context) {
cameraId := c.Query("cameraId")
taskId := c.Query("taskId")
@@ -40,23 +31,15 @@
}
}
-// @Summary 鏍规嵁澶氫釜鎽勫儚鏈篿d鏌ヨ鑱斿姩浠诲姟瑙勫垯璁剧疆
-// @Description 鏍规嵁澶氫釜鎽勫儚鏈篿d鏌ヨ鑱斿姩浠诲姟瑙勫垯璁剧疆
-// @Accept json
-// @Produce json
-// @Tags CameraTaskArgs
-// @Param cameraIds body controllers.MultiCamera true "鎽勫儚鏈篿ds"
-// @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/getLinkRulesByCameraIds [get]
func (controller CameraTaskArgsController) GetLinkRulesByCameraIds(c *gin.Context) {
- var cameraIds MultiCamera
- if err := c.BindJSON(&cameraIds);err !=nil {
+ var cameraIdsVo MultiCamera
+ if err := c.BindJSON(&cameraIdsVo);err !=nil {
util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
return
}
var api dbapi.CameraTaskArgsApi
- flag,data := api.GetLinkRulesByCameraIds()
+ paramBody := util.Struct2Map(cameraIdsVo)
+ flag,data := api.GetLinkRulesByCameraIds(paramBody)
if flag {
util.ResponseFormat(c,code.Success,data)
} else {
@@ -64,14 +47,23 @@
}
}
-// @SUmmary 鏍规嵁鍒嗙粍id鍒犻櫎鎽勫儚鏈虹畻娉曡鍒�
-// @Description 鏍规嵁鍒嗙粍id鍒犻櫎鎽勫儚鏈虹畻娉曡鍒�
-// @Produce json
-// @Tags CameraTaskArgs
-// @Param groupId query string true "浠诲姟绠楁硶鍙傛暟鍒嗙粍id"
-// @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/deleteByGroup [get]
+func (controller CameraTaskArgsController) UpdateDefenceStateByGroup(c *gin.Context){
+ groupId := c.PostForm("groupId")
+ str := c.PostForm("defenceState")
+ logger.Debug("defenceState:",str)
+ defenceState, err := strconv.ParseBool(str)
+ if groupId =="" || err !=nil{
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
+ return
+ }
+ var api dbapi.CameraTaskArgsApi
+ if b,data := api.UpdateDefenceStateByGroup(groupId,defenceState);b{
+ util.ResponseFormat(c,code.UpdateSuccess,data)
+ } else {
+ util.ResponseFormat(c,code.ComError,data)
+ }
+}
+
func (controller CameraTaskArgsController)DeleteByGroup(c *gin.Context) {
groupId := c.Query("groupId")
if groupId == "" {
@@ -79,11 +71,11 @@
return
}
var api dbapi.CameraTaskArgsApi
- flag,data:=api.DeleteByGroup(groupId)
+ flag,data := api.DeleteByGroup(groupId)
if flag {
util.ResponseFormat(c,code.Success,data)
} else {
- util.ResponseFormat(c,code.ComError,data)
+ util.ResponseFormat(c,code.ComError,"鍒犻櫎澶辫触")
}
}
@@ -115,14 +107,6 @@
GroupId string `json:"group_id"`//鍒嗙粍id
}
-// @Summary 淇濆瓨鑱斿姩浠诲姟瑙勫垯鍙傛暟
-// @Description 淇濆瓨鑱斿姩浠诲姟瑙勫垯鍙傛暟
-// @Accept json
-// @Produce json
-// @Param saveBody body controllers.SaveLinkRulesGroupVo 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/saveLinkRulesByGroup [post]
func (controller CameraTaskArgsController) SaveLinkRulesByGroup(c *gin.Context) {
var saveBody SaveLinkRulesGroupVo
if err := c.BindJSON(&saveBody);err !=nil {
--
Gitblit v1.8.0