From 45184ccbcb5f787f09b62b0ddf4308004a46d27a Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 10 七月 2019 10:28:21 +0800
Subject: [PATCH] 关掉yolo插入es
---
insertdata/insertDataToEs.go | 184 ++++++++++++++++++++++++---------------------
1 files changed, 97 insertions(+), 87 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 5fb10f5..10cafc5 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,10 +20,14 @@
)
var weedfsUrl string
type conf struct {
- PhotoUrl string
+ PhotoUrl string `yaml:"photoUrl"`
}
func init() {
- 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)
@@ -55,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"`
@@ -96,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) {
@@ -130,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 {
@@ -170,6 +175,7 @@
localConfig.ServerName,
serverIp,
"",
+ face.Score,
1,
0,
0,
@@ -183,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("鏌ヨ鏈満淇℃伅澶辫触锛�")
@@ -243,6 +252,7 @@
localConfig.ServerName,
serverIp,
"",
+ face.Score,
1,
0,
0,
@@ -264,86 +274,86 @@
}
}
}
- if msg.RuleResult["yolo"] != nil && len(msg.RuleResult["yolo"].([]ruleserver.Result)) > 0 {
- logger.Info("寰�ES鎻抷olo鏁版嵁")
- var sdkNames string = ""
- alarmRules := []AlarmRule{}
- for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
- sdkNames = sdkNames + yoloResult.SdkName
- alarm := ChangeToString(yoloResult.AlarmLevel)
- alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText})
- }
- isAlarm := 0
- resp := make(map[string]interface{})
- if len(alarmRules) > 0 {
- isAlarm = 1
- // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
- bdata, err := util.UnCompress(msg.Data)
- if err != nil {
- panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
- }
- i := protomsg.Image{}
- err = proto.Unmarshal(bdata, &i)
- //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.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
- } else {
- logger.Info("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
- }
- } else {
- isAlarm = 0
- // 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
- return
- }
- // logger.Println("鍥剧墖涓婁紶杩斿洖鍊硷細", resp)
- // 鏌ヨ鏈満淇℃伅
- localConfig, err := cache.GetServerInfo()
- if err != nil {
- logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
- }
- // 鏌ヨcameraName
- camera, err := cache.GetCameraById(msg.Cid)
- if err != nil {
- logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
- }
- serverIp, err := GetLocalIP()
- peraction := Personaction{
- uuid.NewV4().String(),
- msg.Cid,
- camera.Name,
- camera.Addr,
- msg.Tasklab.Taskid,
- msg.Tasklab.Taskname,
- sdkNames,
- "",
- alarmRules,
- localConfig.ServerId,
- localConfig.ServerName,
- serverIp,
- "",
- []string{strings.Split(resp["fileUrl"].(string), "/")[1]},
- time.Now().Format("2006-01-02 15:04:05"),
- "",
- isAlarm,
- 0,
- 0,
- 0,
- }
- requstbody, err := json.Marshal(peraction)
-
- if err != nil {
- logger.Info("json parse error ", err)
- return
-
- }
- err = EsReq("POST", "http://192.168.1.182:9200/personaction/perVideoAction", requstbody)
- if err != nil {
- logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
- } else {
- logger.Info("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
- }
- }
+ //if msg.RuleResult["yolo"] != nil && len(msg.RuleResult["yolo"].([]ruleserver.Result)) > 0 {
+ // logger.Info("寰�ES鎻抷olo鏁版嵁")
+ // var sdkNames string = ""
+ // alarmRules := []AlarmRule{}
+ // for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
+ // sdkNames = sdkNames + yoloResult.SdkName
+ // alarm := ChangeToString(yoloResult.AlarmLevel)
+ // alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText})
+ // }
+ // isAlarm := 0
+ // resp := make(map[string]interface{})
+ // if len(alarmRules) > 0 {
+ // isAlarm = 1
+ // // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
+ // bdata, err := util.UnCompress(msg.Data)
+ // if err != nil {
+ // panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ // }
+ // i := protomsg.Image{}
+ // err = proto.Unmarshal(bdata, &i)
+ // //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.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+ // } else {
+ // logger.Info("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
+ // }
+ // } else {
+ // isAlarm = 0
+ // // 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
+ // return
+ // }
+ // // logger.Println("鍥剧墖涓婁紶杩斿洖鍊硷細", resp)
+ // // 鏌ヨ鏈満淇℃伅
+ // localConfig, err := cache.GetServerInfo()
+ // if err != nil {
+ // logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
+ // }
+ // // 鏌ヨcameraName
+ // camera, err := cache.GetCameraById(msg.Cid)
+ // if err != nil {
+ // logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
+ // }
+ // serverIp, err := GetLocalIP()
+ // peraction := Personaction{
+ // uuid.NewV4().String(),
+ // msg.Cid,
+ // camera.Name,
+ // camera.Addr,
+ // msg.Tasklab.Taskid,
+ // msg.Tasklab.Taskname,
+ // sdkNames,
+ // "",
+ // alarmRules,
+ // localConfig.ServerId,
+ // localConfig.ServerName,
+ // serverIp,
+ // "",
+ // []string{strings.Split(resp["fileUrl"].(string), "/")[1]},
+ // time.Now().Format("2006-01-02 15:04:05"),
+ // "",
+ // isAlarm,
+ // 0,
+ // 0,
+ // 0,
+ // }
+ // requstbody, err := json.Marshal(peraction)
+ //
+ // if err != nil {
+ // logger.Info("json parse error ", err)
+ // return
+ //
+ // }
+ // err = EsReq("POST", "http://192.168.1.182:9200/personaction/perVideoAction", requstbody)
+ // if err != nil {
+ // logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
+ // } else {
+ // logger.Info("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
+ // }
+ //}
}
// 鑾峰彇鏈満ip
--
Gitblit v1.8.0