From 5d78b36e851a5862302f2e40c99a4477020c79bc Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 20 九月 2019 13:46:52 +0800
Subject: [PATCH] 查找此人时先切图

---
 controllers/camera.go |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/controllers/camera.go b/controllers/camera.go
index 9956bc1..352f648 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"
 
@@ -19,11 +19,12 @@
 type CameraVo struct {
 	Id        string  `json:"id"`
 	Name      string  `json:"name"`
+	Alias     string  `json:"alias"` //鎽勫儚鏈虹殑鍒悕
 	Type      int     `json:"type" `
 	Addr      string  `json:"addr"`
-	Areaid    string    `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 +267,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