From 5e31a32f6ce2572cb01388150ddb325724ff15b8 Mon Sep 17 00:00:00 2001 From: liuxiaolong <736321739@qq.com> Date: 星期五, 28 六月 2019 19:29:20 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.1.14:10010/r/webserver --- controllers/camera.go | 84 +++++++++++++++++++++--------------------- 1 files changed, 42 insertions(+), 42 deletions(-) diff --git a/controllers/camera.go b/controllers/camera.go index 087703d..9cf2351 100644 --- a/controllers/camera.go +++ b/controllers/camera.go @@ -15,25 +15,25 @@ type CameraController struct{} type CameraVo struct { - Id string `json:"id"` - Name string `json:"name"` - Type int `json:"type" ` - Addr string `json:"addr"` - Areaid uint `json:"areaid"` - Longitude float64 `json:"longitude"` - Latitude float64 `json:"latitude"` - Rtsp string `json:"rtsp"` - Ip string `json:"ip"` - Port int `json:"port"` - Username string `json:"username"` - Password string `json:"password"` - Brand string `json:"brand"` - Reserved string `json:"reserved"` + Id string `json:"id"` + Name string `json:"name"` + Type int `json:"type" ` + Addr string `json:"addr"` + Areaid uint `json:"areaid"` + Longitude float64 `json:"longitude"` + Latitude float64 `json:"latitude"` + Rtsp string `json:"rtsp"` + Ip string `json:"ip"` + Port int `json:"port"` + Username string `json:"username"` + Password string `json:"password"` + Brand string `json:"brand"` + Reserved string `json:"reserved"` - IsRunning bool `json:"is_running"`//鏄惁姝e湪瑙g爜 - RunEnable bool `json:"run_enable"`//鎺у埗瀹炴椂澶勭悊鎴栬疆璇㈠鐞嗙殑寮�鍏� - RunType int `json:"run_type"`//澶勭悊绫诲瀷锛�0锛氳疆璇紝1锛氬疄鏃� - RunServerId string `json:"run_server_id"`//褰撳墠姝e湪澶勭悊鐨勫垎鏋愭湇鍔″櫒id + IsRunning bool `json:"is_running"` //鏄惁姝e湪瑙g爜 + RunEnable bool `json:"run_enable"` //鎺у埗瀹炴椂澶勭悊鎴栬疆璇㈠鐞嗙殑寮�鍏� + RunType int `json:"run_type"` //澶勭悊绫诲瀷锛�0锛氳疆璇紝1锛氬疄鏃� + RunServerId string `json:"run_server_id"` //褰撳墠姝e湪澶勭悊鐨勫垎鏋愭湇鍔″櫒id } // @Summary 娣诲姞鎽勫儚鏈� @@ -55,7 +55,7 @@ return } cam.Id = util.PseudoUuid() - paramBody :=util.Struct2Map(cam) + paramBody := util.Struct2Map(cam) if api.CameraAdd(paramBody) { util.ResponseFormat(c, code.Success, cam) return @@ -82,7 +82,7 @@ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟閿欒") return } - paramBody :=util.Struct2Map(cam) + paramBody := util.Struct2Map(cam) if api.CameraAdd(paramBody) { util.ResponseFormat(c, code.Success, cam) return @@ -103,11 +103,11 @@ var api dbapi.CameraApi cid := c.Param("cid") - if api.CameraDelete(cid){ + if api.CameraDelete(cid) { util.ResponseFormat(c, code.Success, "鍒犻櫎鎴愬姛") return } - util.ResponseFormat(c, code.ComError,"鍒犻櫎澶辫触") + util.ResponseFormat(c, code.ComError, "鍒犻櫎澶辫触") } // @Summary 鏄剧ず鎽勫儚鏈� @@ -121,9 +121,9 @@ func (ac CameraController) CameraSel(c *gin.Context) { var api dbapi.CameraApi cid := c.Param("cid") - camera,err := api.GetCameraById(cid) - if err !=nil { - util.ResponseFormat(c,code.ComError,"鏌ヨ澶辫触") + camera, err := api.GetCameraById(cid) + if err != nil { + util.ResponseFormat(c, code.ComError, "鏌ヨ澶辫触") return } @@ -210,8 +210,8 @@ 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,"鍙傛暟鏈夎") + if err != nil || (runType != 0 && runType != 1) { + util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎") return } var api dbapi.CameraApi @@ -220,9 +220,9 @@ dataBytes, _ := json.Marshal(list) var cams []CameraVo json.Unmarshal(dataBytes, &cams) - util.ResponseFormat(c,code.Success,cams) + util.ResponseFormat(c, code.Success, cams) } else { - util.ResponseFormat(c,code.ComError,err) + util.ResponseFormat(c, code.ComError, err) } } @@ -235,28 +235,28 @@ // @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/updateRunEnable [post] -func (cc CameraController) UpdateRunEnable(c *gin.Context){ +func (cc CameraController) UpdateRunEnable(c *gin.Context) { cameraId := c.PostForm("cameraId") enableStr := c.PostForm("runEnable") runEnable, err := strconv.ParseBool(enableStr) - if cameraId == "" || err !=nil { - util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎") + if cameraId == "" || err != nil { + util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎") return } var api dbapi.CameraApi b, data := api.UpdateRunEnable(cameraId, runEnable) - fmt.Println("data:",data) + fmt.Println("data:", data) if b { - util.ResponseFormat(c,code.Success,data) + util.ResponseFormat(c, code.Success, data) } else { - util.ResponseFormat(c,code.ComError,"鏇存柊澶辫触") + util.ResponseFormat(c, code.ComError, "鏇存柊澶辫触") } } type CameraChangeRunVo struct { CameraIds []string `json:"camera_ids"` - RunType int `json:"run_type"` + RunType int `json:"run_type"` } // @Summary 鎽勫儚鏈鸿疆璇㈠拰瀹炴椂鐘舵�佸垏鎹� @@ -267,18 +267,18 @@ // @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){ +func (cc CameraController) ChangeRunType(c *gin.Context) { var ccrVo CameraChangeRunVo - if err := c.BindJSON(&ccrVo);err !=nil{ - util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎") + 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(paramBody) if b { - util.ResponseFormat(c,code.Success,data) + util.ResponseFormat(c, code.Success, data) } else { - util.ResponseFormat(c,code.ComError,"鏇存柊澶辫触") + util.ResponseFormat(c, code.ComError, "鏇存柊澶辫触") } -} \ No newline at end of file +} -- Gitblit v1.8.0