From d227d2593af911fcf89989e88f4b988d1570b444 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 10 七月 2019 18:19:42 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.14:10010/r/webserver
---
service/CamraUpdatesnashot.go | 11 +++++++----
controllers/taglist.go | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/controllers/taglist.go b/controllers/taglist.go
index fda7488..6ad4914 100644
--- a/controllers/taglist.go
+++ b/controllers/taglist.go
@@ -25,7 +25,7 @@
url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
"/" + config.EsInfo.EsIndex.DbTables.IndexName + "/_search"
- prama := "{\"query\":{\"bool\":{\"filter\":[{\"term\":{\"isDelete\":0}}]}},\"_source\":[\"tableName\",\"uuid\"]}"
+ prama := "{\"query\":{\"bool\":{\"filter\":[{\"term\":{\"isDelete\":0}}]}},\"_source\":[\"tableName\",\"id\"]}"
tokenRes := esutil.GetEsDataReq(url, prama, true)
sources := make([]map[string]interface{}, 0)
diff --git a/service/CamraUpdatesnashot.go b/service/CamraUpdatesnashot.go
index 20678e9..c56ecd1 100644
--- a/service/CamraUpdatesnashot.go
+++ b/service/CamraUpdatesnashot.go
@@ -103,13 +103,16 @@
if err != nil {
return "", nil
}
-
- piclocal := fmt.Sprintf("%s%s.jpg", *storelocal, time.Now().String())
- cmd := exec.Command("ffmpeg", "-i", caminfo.Rtsp, "-y", "-f", "image2", "-t", "0.001", "-vf", "select='eq(pict_type\\,I)',setpts='N/(25*TB)'", "-s", "1920*1080", piclocal)
+ //piclocal := fmt.Sprintf("%s%s.jpg", *storelocal, time.Now().String())
+ piclocal := fmt.Sprintf("%s%s.jpg", *storelocal, time.Now().Format("2006-01-02_15_04_05.000000000"))
+ cmd := exec.Command("ffmpeg", "-i", caminfo.Rtsp,
+ //"-y", "-f", "image2", "-t", "0.001",
+ //"-vf", "select='eq(pict_type\\,I)',setpts='N/(25*TB)'",
+ "-s", "1920*1080", piclocal)
err = cmd.Run()
if err != nil {
- return "", err
+ //return "", err //ignore error
}
return piclocal, nil
}
--
Gitblit v1.8.0