From bae7a9a30b89c519460746cfa19cd7e66a0196e2 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期日, 19 一月 2020 17:13:07 +0800
Subject: [PATCH] update _source list and struct
---
controllers/camera.go | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/controllers/camera.go b/controllers/camera.go
index 374accf..882e043 100644
--- a/controllers/camera.go
+++ b/controllers/camera.go
@@ -1,10 +1,12 @@
package controllers
import (
+ "basic.com/pubsub/protomsg.git"
"encoding/json"
"fmt"
"strconv"
"basic.com/valib/logger.git"
+ "strings"
"webserver/cache"
"github.com/gin-gonic/gin"
@@ -333,13 +335,42 @@
func(cc CameraController) UpdateSnapshotUrl(c *gin.Context){
cid := c.Param("cid")
//filename, err := service.UpdateSnapshotUrl(cid)
+ if cid == "" {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
+ return
+ }
+ if strings.HasPrefix(cid, File_Video_Id_Pre) || strings.HasPrefix(cid, File_Img_Id_Pre) || strings.HasPrefix(cid, File_Audio_Id_Pre) {
+ var fileApi dbapi.FileAnalysisApi
+ b, d := fileApi.Show(cid)
+ if b {
+ var file protomsg.FileAnalysis
+ bytes, _ := json.Marshal(d)
+ err := json.Unmarshal(bytes, &file)
+ if err == nil {
+ util.ResponseFormat(c, code.Success, map[string]string{
+ "cameraId": cid,
+ "snapshotUrl": file.SnapshotUrl,
+ })
+ return
+ } else {
+ util.ResponseFormat(c, code.ComError, "鏇存柊澶辫触")
+ return
+ }
+ } else {
+ util.ResponseFormat(c, code.ComError, "鏇存柊澶辫触")
+ return
+ }
+ }
filename, err := service.UpdateCapture(cid)
if err != nil {
logger.Debug("UpdateSnapshotUrl.err:",err)
util.ResponseFormat(c, code.ComError, "鏇存柊澶辫触")
return
}
- util.ResponseFormat(c, code.Success, filename)
+ util.ResponseFormat(c, code.Success, map[string]string{
+ "cameraId": cid,
+ "snapshotUrl": filename,
+ })
}
type CameraChangeRunVo struct {
--
Gitblit v1.8.0