From 10d76b18b246b8bc0344c704ff6bc5ae8e310be9 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 01 八月 2019 15:43:55 +0800
Subject: [PATCH] 换个比分转化
---
insertdata/insertDataToEs.go | 97 +++++++++++++++++++++++++++++++-----------------
1 files changed, 62 insertions(+), 35 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 7a10bf3..60c55ba 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -71,6 +71,7 @@
AnalyServerName string `json:"analyServerName"`
AnalyServerIp string `json:"analyServerIp"`
ClusterId string `json:"clusterId"`
+ LinkId string `json:"linkId"`
DetectScore float64 `json:"detectScore"`
IsAlarm int `json:"isAlarm"`
IsAckAlarm int `json:"isAckAlarm"`
@@ -96,6 +97,7 @@
ClusterId string `json:"clusterId"`
PicSmUrl []string `json:"picSmUrl"`
PicDate string `json:"picDate"`
+ LinkId string `json:"linkId"`
VideoUrl string `json:"videoUrl"`
IsAlarm int `json:"isAlarm"`
IsAckAlarm int `json:"isAckAlarm"`
@@ -111,32 +113,39 @@
}
// 寰�ES鎻掓暟鎹�
+//func InsertToEs(msg ruleserver.ResultMsg) {
+// var timeLabel string
+// // 鐩存帴浠庤鍒欑殑鏍囩鏁版嵁閲屾嬁绗﹀悎瑙勫垯鐨勪汉鑴哥粨鏋�
+// if msg.RuleResult["timeLabel"] != nil {
+// timeLabel = msg.RuleResult["timeLabel"].(string)
+// }
+// logger.Debug("鎻掑叆鏁版嵁鍓嶇湅鐪嬫姤璀︽爣蹇椾綅锛�", timeLabel)
+// if timeLabel == "01" { // 鏃犲畾鏃跺櫒鐘舵�佽鎻掑叆鐨勬姤璀︽暟鎹�
+// InsertFace(msg)
+// flag := ruleserver.BodyIsSame(msg.SdkMessage)
+// if !flag {
+// InsertYolo(msg)
+// }
+// }
+// if timeLabel == "10" { // 瀹氭椂鍣ㄧ姸鎬佽鎻掑叆鐨勯甯ф姤璀︽暟鎹�傝繛甯︾潃瀹氭椂鍣ㄥ紑鍚椂鐨勯偅甯�
+// InsertFace(msg)
+// InsertYolo(msg)
+// }
+// //if timeLabel == "12" { // 骞堕潪鎶ヨ鏁版嵁锛屽彧鏄姸鎬佹敼鍙樼殑鏁版嵁
+// // //ChangeStatusFace(msg)
+// // ChangeStatusYolo(msg)
+// //}
+//}
func InsertToEs(msg ruleserver.ResultMsg) {
- var timeLabel string
- // 鐩存帴浠庤鍒欑殑鏍囩鏁版嵁閲屾嬁绗﹀悎瑙勫垯鐨勪汉鑴哥粨鏋�
- if msg.RuleResult["timeLabel"] != nil {
- timeLabel = msg.RuleResult["timeLabel"].(string)
+ InsertFace(msg,"")
+ flag := ruleserver.BodyIsSame(msg.SdkMessage)
+ if !flag {
+ InsertYolo(msg,"")
}
- logger.Debug("鎻掑叆鏁版嵁鍓嶇湅鐪嬫姤璀︽爣蹇椾綅锛�", timeLabel)
- if timeLabel == "01" { // 鏃犲畾鏃跺櫒鐘舵�佽鎻掑叆鐨勬姤璀︽暟鎹�
- InsertFace(msg)
- flag := ruleserver.BodyIsSame(msg.SdkMessage)
- if !flag {
- InsertYolo(msg)
- }
- }
- if timeLabel == "10" { // 瀹氭椂鍣ㄧ姸鎬佽鎻掑叆鐨勯甯ф姤璀︽暟鎹�傝繛甯︾潃瀹氭椂鍣ㄥ紑鍚椂鐨勯偅甯�
- InsertFace(msg)
- InsertYolo(msg)
- }
- //if timeLabel == "12" { // 骞堕潪鎶ヨ鏁版嵁锛屽彧鏄姸鎬佹敼鍙樼殑鏁版嵁
- // //ChangeStatusFace(msg)
- // ChangeStatusYolo(msg)
- //}
}
// 寰�es涓彃鍏ヤ汉鑴告暟鎹�
-func InsertFace(msg ruleserver.ResultMsg) {
+func InsertFace(msg ruleserver.ResultMsg,linkId string) {
if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.FaceResult)) > 0 {
logger.Info("寰�ES鎻掍汉鑴告暟鎹�")
for _, faceResult := range msg.RuleResult["face"].([]ruleserver.FaceResult) {
@@ -149,7 +158,7 @@
}
alarmRules := []AlarmRule{}
alarm := ChangeToString(faceResult.DefenceState, faceResult.AlarmLevel)
- alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText,faceResult.DefenceState})
+ alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText, faceResult.DefenceState})
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
bigPhotoUrl := make(map[string]interface{})
@@ -181,6 +190,10 @@
race := getRaceString(face.ThftRes.Race)
ageDescription := getDescription(face.ThftRes.Age)
esDataId := uuid.NewV4().String()
+ linksId := ""
+ if linkId != "" {
+ linksId = linkId
+ }
pervideo := PerVideoPicture{
esDataId,
msg.Cid,
@@ -206,6 +219,7 @@
localConfig.ServerName,
serverIp,
"",
+ linksId,
face.Score,
1,
0,
@@ -282,6 +296,7 @@
localConfig.ServerName,
serverIp,
"",
+ "",
0,
1,
0,
@@ -310,12 +325,13 @@
}
// 寰�es涓彃鍏olo鏁版嵁
-func InsertYolo(msg ruleserver.ResultMsg) {
+func InsertYolo(msg ruleserver.ResultMsg,linkId string) {
if msg.RuleResult["yolo"] != nil && len(msg.RuleResult["yolo"].([]ruleserver.Result)) > 0 {
// 鍏堝垽鏂竴涓嬫暟鎹甫鐨勮鍒欐爣绛炬槸鍚︽湁鍙互鎻掑叆鐨�
flag := false
- for _,res := range msg.RuleResult["yolo"].([]ruleserver.Result) {
- if res.Others["timeLabel"].(string) == "01" || res.Others["timeLabel"].(string) == "10" {
+ for _, res := range msg.RuleResult["yolo"].([]ruleserver.Result) {
+ //logger.Info("瀹氭椂鍣ㄦ墦鐨勬暟瀛楁爣绛撅細",res.Others.TimeLabel)
+ if res.Others.TimeLabel == "01" || res.Others.TimeLabel == "10" {
flag = true
}
}
@@ -325,18 +341,19 @@
alarmRules := []AlarmRule{}
url := []string{}
for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
- if yoloResult.Others["timeLabel"].(string) == "01" || yoloResult.Others["timeLabel"].(string) == "10" {
+ if yoloResult.Others.TimeLabel == "01" || yoloResult.Others.TimeLabel == "10" {
// 鎷煎嚭sdkname
+ //logger.Info("搴旇杩涙潵鎵嶅鐨�")
sdkNames = sdkNames + yoloResult.SdkName
alarm := ChangeToString(yoloResult.DefenceState, yoloResult.AlarmLevel)
- alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText,yoloResult.DefenceState})
+ alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText, yoloResult.DefenceState})
// 涓婁紶缂撳瓨鏁版嵁鐨勫浘鐗囨嬁鍒皍rl
- if yoloResult.Others["cacheData"] != nil {
+ if yoloResult.Others.CacheData != nil {
//InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
// 鎶婄紦瀛樼殑鏁版嵁涓婁紶鍚庡緱鍒板湴鍧�瀛樿繘鍘�
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
- msgs :=yoloResult.Others["cacheData"].([]ruleserver.ResultMsg)
- for _,msg1 := range msgs {
+ msgs := yoloResult.Others.CacheData
+ for _, msg1 := range msgs {
bdata, err := util.UnCompress(msg1.Data)
if err != nil {
panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
@@ -356,18 +373,22 @@
}
linkFlag := false
for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
- if yoloResult.Others["timeLabel"].(string) == "01" || yoloResult.Others["timeLabel"].(string) == "10" && yoloResult.Others["linkCache"] != nil{
- for _,msg2 := range yoloResult.Others["linkCache"].([]*ruleserver.ResultMsg) {
- logger.Warn("鎻掑叆鑱斿姩鏁版嵁")
- InsertYolo(*msg2)
+ 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 {
+ logger.Warn("鎻掑叆鑱斿姩鏁版嵁","姝ゅ抚鏁版嵁鐨刬d涓�",msg2.Cid)
+ InsertYolo(msg2,linkId)
linkFlag = true
}
}
}
if linkFlag {
// 鑱斿姩鏁版嵁涓寘鍚湰甯ф暟鎹紝鎻掑叆鑱斿姩鏁版嵁鍚庡氨涓嶉渶瑕佹彃鍏ユ湰甯ф暟鎹簡
+ logger.Warn("鎴愬姛鎻掑叆涓や釜鑱斿姩鍥剧墖")
+ //os.Exit(1)
return
}
+ //logger.Info("--------璧板埌杩欏効灏变笉涓�鏍�")
isAlarm := 0
resp := make(map[string]interface{})
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
@@ -406,6 +427,10 @@
url = append(url, strings.Split(resp["fileUrl"].(string), "/")[1])
esDataId := uuid.NewV4().String()
+ linksId := ""
+ if linkId != "" {
+ linksId = linkId
+ }
peraction := Personaction{
esDataId,
msg.Cid,
@@ -422,6 +447,7 @@
"",
url,
i.Timestamp,
+ linksId,
"",
isAlarm,
0,
@@ -446,7 +472,7 @@
//os.Exit(1)
}
} else {
- logger.Debug("timeLabel鏉′欢閮戒笉绗﹀悎锛�" )
+ logger.Debug("timeLabel鏉′欢閮戒笉绗﹀悎锛�")
}
}
}
@@ -497,6 +523,7 @@
[]string{strings.Split(resp["fileUrl"].(string), "/")[1]},
i.Timestamp,
"",
+ "",
0,
0,
0,
--
Gitblit v1.8.0