From 89c72c2e4865dbb1825345b619da12044180bf82 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 02 八月 2019 16:38:49 +0800
Subject: [PATCH] 数值精度保留
---
insertdata/insertDataToEs.go | 57 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index d3a868d..60c55ba 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -7,7 +7,6 @@
"fmt"
"io/ioutil"
"net"
- "os"
"ruleprocess/cache"
"ruleprocess/logger"
"strings"
@@ -72,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"`
@@ -97,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"`
@@ -136,15 +137,15 @@
// //}
//}
func InsertToEs(msg ruleserver.ResultMsg) {
- InsertFace(msg)
- //flag := ruleserver.BodyIsSame(msg.SdkMessage)
- //if !flag {
- InsertYolo(msg)
- //}
+ InsertFace(msg,"")
+ flag := ruleserver.BodyIsSame(msg.SdkMessage)
+ if !flag {
+ InsertYolo(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) {
@@ -189,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,
@@ -214,6 +219,7 @@
localConfig.ServerName,
serverIp,
"",
+ linksId,
face.Score,
1,
0,
@@ -290,6 +296,7 @@
localConfig.ServerName,
serverIp,
"",
+ "",
0,
1,
0,
@@ -318,13 +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) {
- logger.Info("瀹氭椂鍣ㄦ墦鐨勬暟瀛楁爣绛撅細",res.Others["timeLabel"].(string))
- if res.Others["timeLabel"].(string) == "01" || res.Others["timeLabel"].(string) == "10" {
+ //logger.Info("瀹氭椂鍣ㄦ墦鐨勬暟瀛楁爣绛撅細",res.Others.TimeLabel)
+ if res.Others.TimeLabel == "01" || res.Others.TimeLabel == "10" {
flag = true
}
}
@@ -334,18 +341,18 @@
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("搴旇杩涙潵鎵嶅鐨�")
+ //logger.Info("搴旇杩涙潵鎵嶅鐨�")
sdkNames = sdkNames + yoloResult.SdkName
alarm := ChangeToString(yoloResult.DefenceState, yoloResult.AlarmLevel)
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)
+ msgs := yoloResult.Others.CacheData
for _, msg1 := range msgs {
bdata, err := util.UnCompress(msg1.Data)
if err != nil {
@@ -366,22 +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 && len(yoloResult.Others["linkCache"].([]ruleserver.ResultMsg)) > 0{
- for _, msg2 := range yoloResult.Others["linkCache"].([]ruleserver.ResultMsg) {
- logger.Warn("鎻掑叆鑱斿姩鏁版嵁")
- logger.Warn("鍝堝搱鍝堝搱鍝�",len(msg2.RuleResult["yolo"].([]ruleserver.Result)[0].Others["linkCache"].([]ruleserver.ResultMsg)))
- InsertYolo(msg2)
- logger.Warn("鍏勫紵闅鹃亾浣犻櫡鍏ヤ簡姝诲惊鐜悧")
+ 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 {
// 鑱斿姩鏁版嵁涓寘鍚湰甯ф暟鎹紝鎻掑叆鑱斿姩鏁版嵁鍚庡氨涓嶉渶瑕佹彃鍏ユ湰甯ф暟鎹簡
- os.Exit(1)
+ logger.Warn("鎴愬姛鎻掑叆涓や釜鑱斿姩鍥剧墖")
+ //os.Exit(1)
return
}
- logger.Info("--------璧板埌杩欏効灏变笉涓�鏍�")
+ //logger.Info("--------璧板埌杩欏効灏变笉涓�鏍�")
isAlarm := 0
resp := make(map[string]interface{})
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
@@ -420,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,
@@ -436,6 +447,7 @@
"",
url,
i.Timestamp,
+ linksId,
"",
isAlarm,
0,
@@ -511,6 +523,7 @@
[]string{strings.Split(resp["fileUrl"].(string), "/")[1]},
i.Timestamp,
"",
+ "",
0,
0,
0,
--
Gitblit v1.8.0