From c775ea17ffd8b064fb5109567e89a169299373a1 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 10 七月 2019 17:24:36 +0800
Subject: [PATCH] 更新cache
---
insertdata/insertDataToEs.go | 63 ++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 18 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 026925f..f67c8ed 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -1,12 +1,13 @@
package insertdata
import (
+ "ruleprocess/logger"
"encoding/json"
"errors"
"fmt"
+ "io/ioutil"
"net"
"ruleprocess/cache"
- "ruleprocess/logger"
"strings"
"time"
@@ -15,9 +16,24 @@
"github.com/satori/go.uuid"
"ruleprocess/ruleserver"
"ruleprocess/util"
+ "github.com/go-yaml/yaml"
)
+var weedfsUrl string
+type conf struct {
+ PhotoUrl string `yaml:"photoUrl"`
+}
+func init() {
+ 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
+}
-var weedfsUrl = "http://192.168.1.182:6333/submit"
// 浜鸿劯鐨勬暟鎹粨鏋�
type PerVideoPicture struct {
Id string `json:"id"`
@@ -43,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"`
@@ -84,6 +101,7 @@
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) {
@@ -102,7 +120,7 @@
// 浜鸿劯妫�娴嬶紝娌℃湁鐩镐技鐨勫簳搴撲汉鍛�
localConfig, err := cache.GetServerInfo()
if err != nil {
- logger.Info("鏌ヨ鏈満淇℃伅澶辫触锛�")
+ logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
serverIp, err := GetLocalIP()
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
@@ -113,16 +131,17 @@
// 鏌ヨcameraName
camera, err := cache.GetCameraById(msg.Cid)
if err != nil {
- logger.Info("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
+ logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
}
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 {
- logger.Info("涓婁紶灏忓浘鍑洪敊")
+ logger.Error("涓婁紶灏忓浘鍑洪敊")
}
+ logger.Info("================灏忓浘鍦板潃:",resp["fileUrl"].(string))
sex := ""
if face.ThftRes.Gender == 1 {
sex = "鐢�"
@@ -149,13 +168,14 @@
race,
face.ThftRes.Smile,
face.ThftRes.Beauty,
- "",
+ string(face.Feature),
[]string{strings.Split(resp["fileUrl"].(string), "/")[1]},
"鏆傛棤闆嗙兢",
localConfig.ServerId,
localConfig.ServerName,
serverIp,
"",
+ face.Score,
1,
0,
0,
@@ -169,10 +189,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("鏌ヨ鏈満淇℃伅澶辫触锛�")
@@ -186,16 +210,17 @@
// 鏌ヨcameraName
camera, err := cache.GetCameraById(msg.Cid)
if err != nil {
- logger.Info("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
+ logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
- logger.Info("-------------------------------------------鐪嬩笅瀹藉拰楂�", i.Width, i.Height)
+ //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 {
- logger.Info("涓婁紶灏忓浘鍑洪敊")
+ logger.Error("涓婁紶灏忓浘鍑洪敊")
}
+ logger.Info("================灏忓浘鍦板潃:",resp["fileUrl"].(string))
sex := ""
if face.ThftRes.Gender == 1 {
sex = "鐢�"
@@ -228,6 +253,7 @@
localConfig.ServerName,
serverIp,
"",
+ face.Score,
1,
0,
0,
@@ -237,7 +263,7 @@
requstbody, err := json.Marshal(pervideo)
if err != nil {
- logger.Info("json parse error ", err)
+ logger.Error("json parse error ", err)
return
}
@@ -272,7 +298,7 @@
//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
resp, err = util.DrawPolygonOnImage(msg.Cid, i,msg.RuleResult["yolo"].([]ruleserver.Result))
if err != nil {
- logger.Info("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+ logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
} else {
logger.Info("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
}
@@ -285,12 +311,12 @@
// 鏌ヨ鏈満淇℃伅
localConfig, err := cache.GetServerInfo()
if err != nil {
- logger.Info("鏌ヨ鏈満淇℃伅澶辫触锛�")
+ logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
// 鏌ヨcameraName
camera, err := cache.GetCameraById(msg.Cid)
if err != nil {
- logger.Info("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
+ logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
}
serverIp, err := GetLocalIP()
peraction := Personaction{
@@ -324,9 +350,10 @@
}
err = EsReq("POST", "http://192.168.1.182:9200/personaction/perVideoAction", requstbody)
if err != nil {
- logger.Info("寰�ES鎻掑叆鏁版嵁澶辫触", err)
+ logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
} else {
- logger.Info("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
+ logger.Warn("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
+ //os.Exit(1)
}
}
}
--
Gitblit v1.8.0