From b7e65bd6d482ce9d95bd423e64c80344938d21d5 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 12 七月 2019 19:58:27 +0800
Subject: [PATCH] 改造定时器
---
insertdata/insertDataToEs.go | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index b50614c..99e8323 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,11 +20,14 @@
)
var weedfsUrl string
type conf struct {
- PhotoUrl string
+ PhotoUrl string `yaml:"photoUrl"`
}
func init() {
- logger.Info("_________________________________________鑰佸瓙鎯崇湅浣犳墽琛屼簡娌�")
- 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)
@@ -56,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"`
@@ -97,7 +101,6 @@
func InsertToEs(msg ruleserver.ResultMsg) {
// 鐩存帴浠庤鍒欑殑鏍囩鏁版嵁閲屾嬁绗﹀悎瑙勫垯鐨勪汉鑴哥粨鏋�
- 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) {
@@ -131,7 +134,6 @@
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
- //logger.Info("-------------------------------------------鐪嬩笅瀹藉拰楂�", i.Width, i.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 {
@@ -171,6 +173,7 @@
localConfig.ServerName,
serverIp,
"",
+ face.Score,
1,
0,
0,
@@ -184,10 +187,14 @@
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 {
- // 浜鸿劯鎻愬彇
+ // 浜鸿劯姣斿
+ logger.Warn("___________________________________________杩欐槸鏈塨aseinfo鐨�")
localConfig, err := cache.GetServerInfo()
if err != nil {
logger.Info("鏌ヨ鏈満淇℃伅澶辫触锛�")
@@ -244,6 +251,7 @@
localConfig.ServerName,
serverIp,
"",
+ face.Score,
1,
0,
0,
@@ -258,9 +266,7 @@
}
err = EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
- logger.Info("璺熷簳搴撶殑鐩镐技鏁版嵁---------锛�", face.Liker)
-
- fmt.Println("------------------------------------------鍝堝搱鍝堝搱锛屽簳搴撴湁浜�")
+ logger.Info("------------------------------------------鍝堝搱鍝堝搱锛屽簳搴撴湁浜�")
}
}
@@ -290,7 +296,7 @@
if err != nil {
logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
} else {
- logger.Info("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
+ logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細",resp)
}
} else {
isAlarm = 0
@@ -342,7 +348,8 @@
if err != nil {
logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
} else {
- logger.Info("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
+ logger.Warn("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
+ //os.Exit(1)
}
}
}
--
Gitblit v1.8.0