From a7df63f9e866280ddd380fa4d18d83a1caadb891 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 10 七月 2019 11:46:24 +0800
Subject: [PATCH] ---
---
insertdata/insertDataToEs.go | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 354b682..35d3e3a 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -1,13 +1,13 @@
package insertdata
import (
+ "ruleprocess/logger"
"encoding/json"
"errors"
"fmt"
"io/ioutil"
"net"
"ruleprocess/cache"
- "ruleprocess/logger"
"strings"
"time"
@@ -20,18 +20,18 @@
)
var weedfsUrl string
type conf struct {
- PhotoUrl string
+ PhotoUrl string `yaml:"photoUrl"`
}
func init() {
- logger.Info("_________________________________________鑰佸瓙鎯崇湅浣犳墽琛屼簡娌�")
- fmt.Println("_________________________________________鑰佸瓙鎯崇湅浣犳墽琛屼簡娌�")
- data, _ := ioutil.ReadFile("conf.yml")
+ data, err := ioutil.ReadFile("./config/conf.yml")
+ if err != nil {
+ fmt.Println("璇诲彇閰嶇疆鏂囦欢鍑洪敊--",err)
+ logger.Error("璇诲彇閰嶇疆鏂囦欢鍑洪敊--",err)
+ }
c := conf{}
//鎶妝aml褰㈠紡鐨勫瓧绗︿覆瑙ｆ瀽鎴恠truct绫诲瀷
yaml.Unmarshal(data, &c)
weedfsUrl = c.PhotoUrl
- fmt.Println("weedfsUrl鐨勫�间负锛�",weedfsUrl)
- logger.Info("weedfsUrl鐨勫�间负锛�",weedfsUrl)
}
// 浜鸿劯鐨勬暟鎹粨鏋�
@@ -59,6 +59,7 @@
AnalyServerName string `json:"analyServerName"`
AnalyServerIp string `json:"analyServerIp"`
ClusterId string `json:"clusterId"`
+ DetectScore float64 `json:"detectScore"`
IsAlarm int `json:"isAlarm"`
IsAckAlarm int `json:"isAckAlarm"`
IsCollect int `json:"isCollect"`
@@ -100,7 +101,7 @@
func InsertToEs(msg ruleserver.ResultMsg) {
// 鐩存帴浠庤鍒欑殑鏍囩鏁版嵁閲屾嬁绗﹀悎瑙勫垯鐨勪汉鑴哥粨鏋�
- logger.Info("------------------------------------浠庨厤缃枃浠惰鍙栫殑鍊硷細",weedfsUrl)
+ //logger.Info("------------------------------------浠庨厤缃枃浠惰鍙栫殑鍊硷細",weedfsUrl)
if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.Arg)) > 0 {
logger.Info("寰�ES鎻掍汉鑴告暟鎹�")
for _, face := range msg.RuleResult["face"].([]ruleserver.Arg) {
@@ -134,7 +135,7 @@
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
- //logger.Info("-------------------------------------------鐪嬩笅瀹藉拰楂�", i.Width, i.Height)
+ logger.Info("-------------------------------------------鐪嬩笅瀹藉拰楂�", int(face.Location.X),int(face.Location.Y),int(face.Location.X+face.Location.Width),int(face.Location.Y+face.Location.Height))
bytes := util.SubImg(i, int(face.Location.X), int(face.Location.Y), int(face.Location.X+face.Location.Width), int(face.Location.Y+face.Location.Height))
resp, err := util.PostFormBufferData1(weedfsUrl, bytes, uuid.NewV4().String())
if err != nil {
@@ -174,6 +175,7 @@
localConfig.ServerName,
serverIp,
"",
+ face.Score,
1,
0,
0,
@@ -187,10 +189,13 @@
return
}
- err = EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
+ err1 := EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
+ if err1 != nil {
+ logger.Error("涓婁紶ES鍑洪敊锛�---",err1)
+ }
//logger.Info(err.Error())
} else {
- // 浜鸿劯鎻愬彇
+ // 浜鸿劯姣斿
localConfig, err := cache.GetServerInfo()
if err != nil {
logger.Info("鏌ヨ鏈満淇℃伅澶辫触锛�")
@@ -247,6 +252,7 @@
localConfig.ServerName,
serverIp,
"",
+ face.Score,
1,
0,
0,
@@ -345,7 +351,8 @@
if err != nil {
logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
} else {
- logger.Info("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
+ logger.Warn("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
+ //os.Exit(1)
}
}
}
--
Gitblit v1.8.0