From e8166a1b997086554a83c486d99d3887733c322d Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期日, 29 九月 2019 11:21:33 +0800
Subject: [PATCH] 删减冗余代码 把分值和id改回性别和年龄描述
---
insertdata/insertDataToEs.go | 53 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 17 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 1f53641..e153444 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -1,13 +1,12 @@
package insertdata
import (
+ "basic.com/valib/logger.git"
"encoding/base64"
"encoding/json"
"errors"
- "fmt"
"net"
"ruleprocess/cache"
- "ruleprocess/logger"
"strconv"
"time"
@@ -29,11 +28,11 @@
DbTablePersons string `yaml:"dbTablePersons"`
}
-func init() {
- 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 {
@@ -135,6 +134,18 @@
// //}
//}
func InsertToEs(msg ruleserver.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)
@@ -160,6 +171,8 @@
faces = PutFace(faces,msg)
//logger.Info("鏁寸悊鍚庣殑鏁版嵁锛�",faces)
if faces != nil {
+ var imgMaxUrl string = ""
+ var picTime string = ""
for _,face := range faces {
// 涓婁紶澶у浘
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
@@ -176,9 +189,13 @@
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
- bigPhotoUrl := make(map[string]interface{})
- bigPhotoUrl, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
- logger.Debug("========澶у浘璺緞锛�", bigPhotoUrl)
+ if imgMaxUrl == "" {
+ bigPhotoUrl := make(map[string]interface{})
+ bigPhotoUrl, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
+ logger.Debug("========澶у浘璺緞锛�", bigPhotoUrl)
+ imgMaxUrl = bigPhotoUrl["fileUrl"].(string)
+ picTime = i.Timestamp
+ }
// 浜鸿劯妫�娴嬶紝娌℃湁鐩镐技鐨勫簳搴撲汉鍛�
localConfig, err := cache.GetServerInfo()
if err != nil {
@@ -211,23 +228,23 @@
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,
camera.Addr,
- i.Timestamp,
- bigPhotoUrl["fileUrl"].(string),
+ picTime,
+ imgMaxUrl,
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
"浜鸿劯",
"",
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,
@@ -356,7 +373,9 @@
} else {
logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp1)
}
- url = append(url, resp1["fileUrl"].(string))
+ if resp1["fileUrl"] != nil {
+ url = append(url, resp1["fileUrl"].(string))
+ }
}
}
}
--
Gitblit v1.8.0