From 3134f08a8772f30d463bef22654e0a927eda025b Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 30 七月 2019 20:12:56 +0800
Subject: [PATCH] 联动任务缓存数据
---
insertdata/insertDataToEs.go | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index f4611a7..7926e92 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -120,8 +120,10 @@
logger.Debug("鎻掑叆鏁版嵁鍓嶇湅鐪嬫姤璀︽爣蹇椾綅锛�", timeLabel)
if timeLabel == "01" { // 鏃犲畾鏃跺櫒鐘舵�佽鎻掑叆鐨勬姤璀︽暟鎹�
InsertFace(msg)
- ruleserver.BodyIsSame(msg.SdkMessage)
- InsertYolo(msg)
+ flag := ruleserver.BodyIsSame(msg.SdkMessage)
+ if !flag {
+ InsertYolo(msg)
+ }
}
if timeLabel == "10" { // 瀹氭椂鍣ㄧ姸鎬佽鎻掑叆鐨勯甯ф姤璀︽暟鎹�傝繛甯︾潃瀹氭椂鍣ㄥ紑鍚椂鐨勯偅甯�
InsertFace(msg)
@@ -354,26 +356,28 @@
}
serverIp, err := GetLocalIP()
url := []string{}
- url = append(url, strings.Split(resp["fileUrl"].(string), "/")[1])
if msg.RuleResult["cacheData"] != nil {
- InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
+ //InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
// 鎶婄紦瀛樼殑鏁版嵁涓婁紶鍚庡緱鍒板湴鍧�瀛樿繘鍘�
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
- msg1 := msg.RuleResult["cacheData"].(ruleserver.ResultMsg)
- bdata, err := util.UnCompress(msg1.Data)
- if err != nil {
- panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ msgs := msg.RuleResult["cacheData"].([]ruleserver.ResultMsg)
+ for _,msg1 := range msgs {
+ bdata, err := util.UnCompress(msg1.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata, &i)
+ resp1, err1 := util.DrawPolygonOnImage(msg1.Cid, i, msg1.RuleResult["yolo"].([]ruleserver.Result), weedfsUrl)
+ if err1 != nil {
+ logger.Error("缂撳瓨鏁版嵁鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+ } else {
+ logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp1)
+ }
+ url = append(url, strings.Split(resp1["fileUrl"].(string), "/")[1])
}
- i := protomsg.Image{}
- err = proto.Unmarshal(bdata, &i)
- resp1, err1 := util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result), weedfsUrl)
- if err1 != nil {
- logger.Error("缂撳瓨鏁版嵁鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
- } else {
- logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp1)
- }
- url = append(url, strings.Split(resp1["fileUrl"].(string), "/")[1])
}
+ url = append(url, strings.Split(resp["fileUrl"].(string), "/")[1])
esDataId := uuid.NewV4().String()
peraction := Personaction{
esDataId,
--
Gitblit v1.8.0