From 27a60df1d67dd76eee1f0a47d28b28ee2d24f145 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 02 七月 2019 18:41:14 +0800
Subject: [PATCH] face相关
---
insertdata/insertDataToEs.go | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 6c6eb46..447e3af 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -90,7 +90,7 @@
type AlarmRule struct {
GroupId string `json:"groupId"`
- AlarmLevel int32 `json:"alarmLevel"`
+ AlarmLevel string `json:"alarmLevel"`
RuleText string `json:"ruleText"`
}
@@ -98,9 +98,9 @@
func InsertToEs(msg ruleserver.ResultMsg) {
// 鐩存帴浠庤鍒欑殑鏍囩鏁版嵁閲屾嬁绗﹀悎瑙勫垯鐨勪汉鑴哥粨鏋�
- if msg.RuleResult["faces"] != nil && len(msg.RuleResult["faces"].([]ruleserver.Arg)) > 0 {
+ if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.Arg)) > 0 {
log.Println("寰�ES鎻掍汉鑴告暟鎹�")
- for _, face := range msg.RuleResult["faces"].([]ruleserver.Arg) {
+ for _, face := range msg.RuleResult["face"].([]ruleserver.Arg) {
// 涓婁紶澶у浘
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
bdata, err := util.UnCompress(msg.Data)
@@ -150,7 +150,7 @@
face.ThftRes.Smile,
face.ThftRes.Beauty,
"涓嶆槸姣忎釜浜鸿劯绠楁硶閮芥湁",
- resp["fileUrl"].(string),
+ strings.Split(resp["fileUrl"].(string), "/")[1],
"鏆傛棤闆嗙兢",
localConfig.ServerId,
localConfig.ServerName,
@@ -172,6 +172,8 @@
err = EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
if err != nil {
log.Println("es can not execute right.")
+ } else {
+ log.Println("___________________________________寰�ES鎻掑叆浜鸿劯鏁版嵁鎴愬姛")
}
}else {
log.Println("璺熷簳搴撶殑鐩镐技鏁版嵁---------锛�",face.Liker)
@@ -184,7 +186,8 @@
alarmRules := []AlarmRule{}
for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
sdkNames = sdkNames + yoloResult.SdkName
- alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, yoloResult.AlarmLevel, yoloResult.RuleText})
+ alarm := ChangeToString(yoloResult.AlarmLevel)
+ alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText})
}
isAlarm := ""
resp := make(map[string]interface{})
@@ -198,7 +201,7 @@
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
- resp, err =util.DrawPolygonOnImage(i)
+ resp, err =util.DrawPolygonOnImage(msg.Cid,i)
if err != nil {
log.Println("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊",err)
}else{
@@ -225,7 +228,7 @@
uuid.NewV4().String(),
msg.Cid,
camera.Name,
- msg.Caddr,
+ camera.Addr,
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
sdkNames,
@@ -254,7 +257,7 @@
if err != nil {
log.Println("寰�ES鎻掑叆鏁版嵁澶辫触",err)
} else {
- log.Println("__________________________________________寰�ES鎻掑叆鏁版嵁鎴愬姛")
+ log.Println("__________________________________________寰�ES鎻掑叆鏁版嵁yolo鎴愬姛")
}
}
}
@@ -286,3 +289,24 @@
err = errors.New("ipv4 not found")
return
}
+
+// 鎶婃姤璀︾瓑绾ц浆鍖栨垚姹夊瓧
+func ChangeToString(i int32) string{
+ alarm := ""
+ if i == 1 {
+ alarm = "涓�绾�"
+ }
+ if i == 2 {
+ alarm = "浜岀骇"
+ }
+ if i == 3 {
+ alarm = "涓夌骇"
+ }
+ if i == 4 {
+ alarm = "鍥涚骇"
+ }
+ if i == 5 {
+ alarm = "浜旂骇"
+ }
+ return alarm
+}
\ No newline at end of file
--
Gitblit v1.8.0