From a4a2f50eb9bf1887067e564c729ad7859ac08011 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 13 七月 2019 17:22:31 +0800
Subject: [PATCH] 暂时去掉人脸的定时追踪
---
insertdata/insertDataToEs.go | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index c2e4fee..f967650 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -114,12 +114,11 @@
}
if timeLabel == "10" { // 瀹氭椂鍣ㄧ姸鎬佽鎻掑叆鐨勯甯ф姤璀︽暟鎹�傝繛甯︾潃瀹氭椂鍣ㄥ紑鍚椂鐨勯偅甯�
InsertFace(msg)
- InsertFace(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
InsertYolo(msg)
- InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
+
}
if timeLabel == "12" { // 骞堕潪鎶ヨ鏁版嵁锛屽彧鏄姸鎬佹敼鍙樼殑鏁版嵁
- ChangeStatusFace(msg)
+ //ChangeStatusFace(msg)
ChangeStatusYolo(msg)
}
}
@@ -170,7 +169,7 @@
uuid.NewV4().String(),
msg.Cid,
camera.Addr,
- time.Now().Format("2006-01-02 15:04:05"),
+ i.Timestamp,
strings.Split(bigPhotoUrl["fileUrl"].(string), "/")[1],
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
@@ -211,7 +210,7 @@
}
}
func ChangeStatusFace(msg ruleserver.ResultMsg) {
- logger.Info("寰�ES鎻掗潪鎶ヨ浣嗘槸鐘舵�佽浆鎹㈡暟鎹�")
+ logger.Info("寰�ES鎻掑叆浜鸿劯闈炴姤璀︿絾鏄姸鎬佽浆鎹㈡暟鎹�")
// 涓婁紶澶у浘
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
bdata, err := util.UnCompress(msg.Data)
@@ -239,7 +238,7 @@
uuid.NewV4().String(),
msg.Cid,
camera.Addr,
- time.Now().Format("2006-01-02 15:04:05"),
+ i.Timestamp,
strings.Split(bigPhotoUrl["fileUrl"].(string), "/")[1],
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
@@ -276,6 +275,9 @@
if err1 != nil {
logger.Error("涓婁紶ES鍑洪敊锛�---", err1)
}
+ //if msg.RuleResult["cacheData"] != nil {
+ // InsertFace(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
+ //}
}
// 寰�es涓彃鍏olo鏁版嵁
@@ -291,15 +293,15 @@
}
isAlarm := 0
resp := make(map[string]interface{})
+ // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
+ bdata, err := util.UnCompress(msg.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata, &i)
if len(alarmRules) > 0 {
isAlarm = 1
- // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
- bdata, err := util.UnCompress(msg.Data)
- if err != nil {
- panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
- }
- i := protomsg.Image{}
- err = proto.Unmarshal(bdata, &i)
//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
resp, err = util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result))
if err != nil {
@@ -339,7 +341,7 @@
serverIp,
"",
[]string{strings.Split(resp["fileUrl"].(string), "/")[1]},
- time.Now().Format("2006-01-02 15:04:05"),
+ i.Timestamp,
"",
isAlarm,
0,
@@ -359,6 +361,9 @@
} else {
logger.Warn("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
//os.Exit(1)
+ }
+ if msg.RuleResult["cacheData"] != nil {
+ InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
}
}
}
@@ -406,7 +411,7 @@
serverIp,
"",
[]string{strings.Split(resp["fileUrl"].(string), "/")[1]},
- time.Now().Format("2006-01-02 15:04:05"),
+ i.Timestamp,
"",
0,
0,
--
Gitblit v1.8.0