From 759c5b9f8ef6c503f62da3b766a580a4dd6fa026 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 09 十二月 2019 18:23:21 +0800
Subject: [PATCH] es模块儿做成so
---
algorithm/insertEs/insertDataToEs.go | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/algorithm/insertEs/insertDataToEs.go b/algorithm/insertEs/insertDataToEs.go
index 6515807..f49407a 100644
--- a/algorithm/insertEs/insertDataToEs.go
+++ b/algorithm/insertEs/insertDataToEs.go
@@ -1,10 +1,11 @@
-package insertdata
+package main
import (
"encoding/base64"
"encoding/json"
"errors"
"net"
+ "ruleprocess/insertdata"
"strconv"
"time"
@@ -104,7 +105,11 @@
rules []structure.Result
}
-func InsertToEs(msg structure.ResultMsg){
+func InsertToEs(msg structure.ResultMsg,weedfsUrl1,videoPersonUrl1,serverIp1,serverPort1 string){
+ weedfsUrl = weedfsUrl1
+ videoPersonUrl = videoPersonUrl1
+ serverIp = serverIp1
+ serverPort = serverPort1
for k,results := range msg.RuleResult {
if results != nil && len(results.([]structure.Result)) > 0{
switch k {
@@ -226,7 +231,7 @@
}
if key == "track" && len(face.Liker) == 1{
esid := face.Liker[0].TargetId
- returnMsg, err1 := esutil.AppendTargetInfo(esid, string(requstbody),EsInfo.EsIndex.AIOcean.IndexName,serverIp,serverPort)
+ returnMsg, err1 := esutil.AppendTargetInfo(esid, string(requstbody),structure.EsInfo.EsIndex.AIOcean.IndexName,serverIp,serverPort)
if err1 != nil {
logger.Error("杩藉姞鏁版嵁鍑洪敊锛�---", err1)
} else {
@@ -235,7 +240,7 @@
ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: face.Uuid, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, VideoUrl: msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{"-1"}, Type: 1})
}
} else {
- resp1, err1 := EsReq("POST", videoPersonUrl, requstbody)
+ resp1, err1 := insertdata.EsReq("POST", videoPersonUrl, requstbody)
if err1 != nil {
logger.Error("涓婁紶ES鍑洪敊锛�---", err1)
} else {
@@ -445,7 +450,7 @@
logger.Info("json parse error ", err)
return
}
- resp1, err2 := EsReq("POST", videoPersonUrl, requstbody)
+ resp1, err2 := insertdata.EsReq("POST", videoPersonUrl, requstbody)
if err2 != nil {
logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
} else {
@@ -605,7 +610,7 @@
logger.Info("json parse error ", err)
return
}
- resp1, err2 := EsReq("POST", videoPersonUrl, requstbody)
+ resp1, err2 := insertdata.EsReq("POST", videoPersonUrl, requstbody)
if err2 != nil {
logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
} else {
--
Gitblit v1.8.0