From b871bc358a94e255e38e122dc86f16fb48361232 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 28 六月 2019 11:09:46 +0800
Subject: [PATCH] test
---
controllers/camera.go | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/controllers/camera.go b/controllers/camera.go
index a639c28..087703d 100644
--- a/controllers/camera.go
+++ b/controllers/camera.go
@@ -207,15 +207,15 @@
runTypeStr := c.Query("runType")
cameraName := c.Query("cameraName")
- fmt.Println("runType:",runTypeStr)
- fmt.Println("cameraName:",cameraName)
+ fmt.Println("runType:", runTypeStr)
+ fmt.Println("cameraName:", cameraName)
runType, err := strconv.Atoi(runTypeStr)
if err !=nil || (runType !=0 && runType !=1) {
util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
return
}
var api dbapi.CameraApi
- b,list := api.GetCamerasByRunType(runType)
+ b, list := api.GetCamerasByRunType(runType, cameraName)
if b {
dataBytes, _ := json.Marshal(list)
var cams []CameraVo
@@ -254,26 +254,28 @@
}
}
+type CameraChangeRunVo struct {
+ CameraIds []string `json:"camera_ids"`
+ RunType int `json:"run_type"`
+}
+
// @Summary 鎽勫儚鏈鸿疆璇㈠拰瀹炴椂鐘舵�佸垏鎹�
// @Description 鎽勫儚鏈鸿疆璇㈠拰瀹炴椂鐘舵�佸垏鎹�
// @Produce json
// @Tags camera
-// @Param cameraId query string true "鎽勫儚鏈篿d"
-// @Param runType query int true "0锛氬疄鏃跺垏杞锛�1锛氳疆璇㈠垏瀹炴椂"
+// @Param changeRunBody body controllers.CameraChangeRunVo true "鍙傛暟缁撴瀯浣�,0锛氬疄鏃跺垏杞锛�1锛氳疆璇㈠垏瀹炴椂"
// @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/changeRunType [post]
func (cc CameraController) ChangeRunType(c *gin.Context){
- cameraId := c.PostForm("cameraId")
- runTypeStr := c.PostForm("runType")
- runType,err := strconv.Atoi(runTypeStr)
- if cameraId == "" || err!=nil || (runType !=0 && runType !=1){
+ var ccrVo CameraChangeRunVo
+ if err := c.BindJSON(&ccrVo);err !=nil{
util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
return
}
-
+ paramBody := util.Struct2Map(ccrVo)
var api dbapi.CameraApi
- b, data := api.ChangeRunType(cameraId, runType)
+ b, data := api.ChangeRunType(paramBody)
if b {
util.ResponseFormat(c,code.Success,data)
} else {
--
Gitblit v1.8.0