From e87b04d7f9d6b25c858d421432bed5443f91b9df Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 16 九月 2019 11:10:34 +0800
Subject: [PATCH] update goffmpeg and capture
---
controllers/camera.go | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/controllers/camera.go b/controllers/camera.go
index 3017cdf..e16b611 100644
--- a/controllers/camera.go
+++ b/controllers/camera.go
@@ -4,7 +4,7 @@
"encoding/json"
"fmt"
"strconv"
- "webserver/extend/logger"
+ "basic.com/valib/logger.git"
"github.com/gin-gonic/gin"
@@ -21,9 +21,9 @@
Name string `json:"name"`
Type int `json:"type" `
Addr string `json:"addr"`
- Areaid uint `json:"areaid"`
- Longitude float64 `json:"longitude"`
- Latitude float64 `json:"latitude"`
+ Areaid string `json:"areaid"`
+ Longitude float32 `json:"longitude"`
+ Latitude float32 `json:"latitude"`
Rtsp string `json:"rtsp"`
Ip string `json:"ip"`
Port int `json:"port"`
@@ -266,8 +266,10 @@
// @Router /data/api-v/camera/updateSnapshotUrl/{cid} [get]
func(cc CameraController) UpdateSnapshotUrl(c *gin.Context){
cid := c.Param("cid")
- filename, err := service.UpdateSnapshotUrl(cid)
+ //filename, err := service.UpdateSnapshotUrl(cid)
+ filename, err := service.UpdateCapture(cid)
if err != nil {
+ logger.Debug("UpdateSnapshotUrl.err:",err)
util.ResponseFormat(c, code.ComError, "鏇存柊澶辫触")
return
}
--
Gitblit v1.8.0