From c6bc736739b2f95c9c9717127c6aad66bb8068d5 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 18 九月 2019 19:49:27 +0800
Subject: [PATCH] 给定时器加锁
---
insertdata/insertDataToEs.go | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 6ad03ce..3e3a447 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -160,6 +160,8 @@
faces = PutFace(faces,msg)
//logger.Info("鏁寸悊鍚庣殑鏁版嵁锛�",faces)
if faces != nil {
+ var imgMaxUrl string = ""
+ var picTime string = ""
for _,face := range faces {
// 涓婁紶澶у浘
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
@@ -176,9 +178,13 @@
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
- bigPhotoUrl := make(map[string]interface{})
- bigPhotoUrl, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
- logger.Debug("========澶у浘璺緞锛�", bigPhotoUrl)
+ if imgMaxUrl == "" {
+ bigPhotoUrl := make(map[string]interface{})
+ bigPhotoUrl, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
+ logger.Debug("========澶у浘璺緞锛�", bigPhotoUrl)
+ imgMaxUrl = bigPhotoUrl["fileUrl"].(string)
+ picTime = i.Timestamp
+ }
// 浜鸿劯妫�娴嬶紝娌℃湁鐩镐技鐨勫簳搴撲汉鍛�
localConfig, err := cache.GetServerInfo()
if err != nil {
@@ -217,8 +223,8 @@
esDataId,
msg.Cid,
camera.Addr,
- i.Timestamp,
- bigPhotoUrl["fileUrl"].(string),
+ picTime,
+ imgMaxUrl,
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
"浜鸿劯",
--
Gitblit v1.8.0