From ed6ad87a6c92435481de9280dc773c23659fbe2d Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 10 十月 2019 10:36:06 +0800
Subject: [PATCH] sdkNames逗号改成空格
---
insertdata/insertDataToEs.go | 67 ++++++++++++++++++---------------
1 files changed, 37 insertions(+), 30 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 945be3a..12aa46a 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -1,13 +1,13 @@
package insertdata
import (
+ "basic.com/valib/logger.git"
+ "ruleprocess/structure"
"encoding/base64"
"encoding/json"
"errors"
- "fmt"
"net"
"ruleprocess/cache"
- "ruleprocess/logger"
"strconv"
"time"
@@ -29,11 +29,11 @@
DbTablePersons string `yaml:"dbTablePersons"`
}
-func InitInsertEs() {
- weedfsUrl = "http://"+WeedFs.Ip+":"+strconv.Itoa(WeedFs.UploadPort)+"/submit"
- videoPersonUrl = "http://"+EsInfo.Masterip+":"+EsInfo.Httpport+"/"+EsInfo.EsIndex.VideoPersons.IndexName+"/"+EsInfo.EsIndex.VideoPersons.IndexType
- personAction = "http://"+EsInfo.Masterip+":"+EsInfo.Httpport+"/"+EsInfo.EsIndex.Personaction.IndexName+"/"+EsInfo.EsIndex.Personaction.IndexType
-}
+//func InitInsertEs() {
+// weedfsUrl = "http://"+WeedFs.Ip+":"+strconv.Itoa(WeedFs.UploadPort)+"/submit"
+// videoPersonUrl = "http://"+EsInfo.Masterip+":"+EsInfo.Httpport+"/"+EsInfo.EsIndex.VideoPersons.IndexName+"/"+EsInfo.EsIndex.VideoPersons.IndexType
+// personAction = "http://"+EsInfo.Masterip+":"+EsInfo.Httpport+"/"+EsInfo.EsIndex.Personaction.IndexName+"/"+EsInfo.EsIndex.Personaction.IndexType
+//}
// 浜鸿劯鐨勬暟鎹粨鏋�
type PerVideoPicture struct {
@@ -67,7 +67,7 @@
IsAckAlarm int `json:"isAckAlarm"`
IsCollect int `json:"isCollect"`
IsDelete int `json:"isDelete"`
- BaseInfo []*ruleserver.BaseInfo `json:"baseInfo"`
+ BaseInfo []*structure.BaseInfo `json:"baseInfo"`
}
// yolo琛屼负鐨勬暟鎹粨鏋�
@@ -106,8 +106,8 @@
// 涓�涓猣ace瀵瑰涓鍒欑粍鐨勫綊缃汉鑴哥殑缁撴瀯浣�
type FaceAndRules struct {
- ruleserver.Arg
- rules []ruleserver.Result
+ structure.Arg
+ rules []structure.Result
}
// 寰�ES鎻掓暟鎹�
@@ -134,12 +134,19 @@
// // ChangeStatusYolo(msg)
// //}
//}
-func InsertToEs(msg ruleserver.ResultMsg) {
+func InsertToEs(msg structure.ResultMsg) {
defer func() {
if err := recover(); err != nil {
logger.Error("es妯″潡鍎跨殑寮傚父鎹曡幏锛�",err)
}
}()
+ localConfig1, err := cache.GetServerInfo()
+ if err != nil {
+ panic("閰嶇疆鏂囦欢涓嶅悎娉�")
+ }
+ weedfsUrl = "http://"+localConfig1.WebPicIp+":"+strconv.Itoa(int(localConfig1.WebPicPort))+"/submit"
+ videoPersonUrl = "http://"+localConfig1.AlarmIp+":"+strconv.Itoa(int(localConfig1.AlarmPort))+"/"+EsInfo.EsIndex.VideoPersons.IndexName+"/"+EsInfo.EsIndex.VideoPersons.IndexType
+ personAction = "http://"+localConfig1.AlarmIp+":"+strconv.Itoa(int(localConfig1.AlarmPort))+"/"+EsInfo.EsIndex.Personaction.IndexName+"/"+EsInfo.EsIndex.Personaction.IndexType
InsertFace(msg, "")
// 濡傛灉鏍囩涓惈鏈夋寔缁椂闂撮娆℃姤璀︾殑timeLabel鐨勮瘽鍒欎笉闇�瑕佽繃浜轰綋杩借釜锛屼笉鐒跺氨娌＄殑鎻掑叆浜�
fk := ruleserver.TrackOrNot(msg.RuleResult)
@@ -158,8 +165,8 @@
}
// 寰�es涓彃鍏ヤ汉鑴告暟鎹�
-func InsertFace(msg ruleserver.ResultMsg, linkId string) {
- if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.FaceResult)) > 0 {
+func InsertFace(msg structure.ResultMsg, linkId string) {
+ if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]structure.FaceResult)) > 0 {
logger.Info("寰�ES鎻掍汉鑴告暟鎹�")
faces := []*FaceAndRules{}
faces = PutFace(faces,msg)
@@ -185,7 +192,7 @@
err = proto.Unmarshal(bdata, &i)
if imgMaxUrl == "" {
bigPhotoUrl := make(map[string]interface{})
- bigPhotoUrl, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
+ bigPhotoUrl, err = util.DrawPolygonOnImageForFace(msg.Cid, i, msg.RuleResult["face"].([]structure.FaceResult), weedfsUrl)
logger.Debug("========澶у浘璺緞锛�", bigPhotoUrl)
imgMaxUrl = bigPhotoUrl["fileUrl"].(string)
picTime = i.Timestamp
@@ -222,8 +229,8 @@
if linkId != "" {
linksId = linkId
}
- logger.Info("浜鸿劯鐨刬d:",strconv.FormatUint(face.Id, 10))
- logger.Info("浜鸿劯鐨勫垎鍊硷細",face.Score)
+ //logger.Info("浜鸿劯鐨刬d:",strconv.FormatUint(face.Id, 10))
+ //logger.Info("浜鸿劯鐨勫垎鍊硷細",face.Score)
pervideo := PerVideoPicture{
esDataId,
msg.Cid,
@@ -236,9 +243,9 @@
"",
alarmRules,
time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
- strconv.FormatUint(face.Id, 10), //鏆傛敼涓轰汉鑴竔d strconv.FormatUint(face.Id, 10)
+ sex, //鏆傛敼涓轰汉鑴竔d strconv.FormatUint(face.Id, 10)
face.ThftRes.Age,
- fmt.Sprintf("%.2f",face.Score), // 鏆傛敼涓哄垎鍊糵mt.Sprintf("%.2f",face.Score)
+ ageDescription, // 鏆傛敼涓哄垎鍊糵mt.Sprintf("%.2f",face.Score)
race,
face.ThftRes.Smile,
face.ThftRes.Beauty,
@@ -277,9 +284,9 @@
}
// 褰掔疆浜鸿劯
-func PutFace(faces []*FaceAndRules,msg ruleserver.ResultMsg)[]*FaceAndRules{
- if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.FaceResult)) > 0 {
- for _, faceResult := range msg.RuleResult["face"].([]ruleserver.FaceResult) {
+func PutFace(faces []*FaceAndRules,msg structure.ResultMsg)[]*FaceAndRules{
+ if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]structure.FaceResult)) > 0 {
+ for _, faceResult := range msg.RuleResult["face"].([]structure.FaceResult) {
faces = hebingFace(faces, faceResult)
}
return faces
@@ -287,7 +294,7 @@
return nil
}
}
-func hebingFace(faces []*FaceAndRules, faceResult ruleserver.FaceResult) []*FaceAndRules{
+func hebingFace(faces []*FaceAndRules, faceResult structure.FaceResult) []*FaceAndRules{
for _, arg := range faceResult.Args {
// 鎷垮埌姣忎竴寮犱汉鑴�
logger.Info("褰掔疆浜鸿劯鏃剁浉浼艰�呯殑鏁伴噺锛�",len(arg.Liker))
@@ -315,18 +322,18 @@
}
}
if !flag {
- faces = append(faces, &FaceAndRules{arg, []ruleserver.Result{faceResult.Result}})
+ faces = append(faces, &FaceAndRules{arg, []structure.Result{faceResult.Result}})
}
}
return faces
}
// 寰�es涓彃鍏olo鏁版嵁
-func InsertYolo(msg ruleserver.ResultMsg, linkId string) {
- if msg.RuleResult["yolo"] != nil && len(msg.RuleResult["yolo"].([]ruleserver.Result)) > 0 {
+func InsertYolo(msg structure.ResultMsg, linkId string) {
+ if msg.RuleResult["yolo"] != nil && len(msg.RuleResult["yolo"].([]structure.Result)) > 0 {
// 鍏堝垽鏂竴涓嬫暟鎹甫鐨勮鍒欐爣绛炬槸鍚︽湁鍙互鎻掑叆鐨�
flag := false
- for _, res := range msg.RuleResult["yolo"].([]ruleserver.Result) {
+ for _, res := range msg.RuleResult["yolo"].([]structure.Result) {
//logger.Info("瀹氭椂鍣ㄦ墦鐨勬暟瀛楁爣绛撅細",res.Others.TimeLabel)
if res.Others.TimeLabel == "01" || res.Others.TimeLabel == "10" {
flag = true
@@ -337,7 +344,7 @@
var sdkNames string = ""
alarmRules := []AlarmRule{}
url := []string{}
- for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
+ for _, yoloResult := range msg.RuleResult["yolo"].([]structure.Result) {
if yoloResult.Others.TimeLabel == "01" || yoloResult.Others.TimeLabel == "10" {
// 鎷煎嚭sdkname
//logger.Info("搴旇杩涙潵鎵嶅鐨�")
@@ -361,7 +368,7 @@
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
- resp1, err1 := util.DrawPolygonOnImage(msg1.Cid, i, msg1.RuleResult["yolo"].([]ruleserver.Result), weedfsUrl)
+ resp1, err1 := util.DrawPolygonOnImageForYolo(msg1.Cid, i, msg1.RuleResult["yolo"].([]structure.Result), weedfsUrl)
if err1 != nil {
logger.Error("缂撳瓨鏁版嵁鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
} else {
@@ -375,7 +382,7 @@
}
}
linkFlag := false
- for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
+ for _, yoloResult := range msg.RuleResult["yolo"].([]structure.Result) {
if (yoloResult.Others.TimeLabel == "01" || yoloResult.Others.TimeLabel == "10") && yoloResult.Others.LinkCache != nil && len(yoloResult.Others.LinkCache) > 1 {
linkId := uuid.NewV4().String()
for _, msg2 := range yoloResult.Others.LinkCache {
@@ -404,7 +411,7 @@
if len(alarmRules) > 0 {
isAlarm = 1
//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
- resp, err = util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result), weedfsUrl)
+ resp, err = util.DrawPolygonOnImageForYolo(msg.Cid, i, msg.RuleResult["yolo"].([]structure.Result), weedfsUrl)
if err != nil {
logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
return
--
Gitblit v1.8.0