From ae5ae33cf858da04c638beffe2bcfb9066923b8e Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 16 十一月 2019 14:46:21 +0800
Subject: [PATCH] ---
---
insertdata/insertDataToEs.go | 59 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 36 insertions(+), 23 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 390869b..41f90c8 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -166,11 +166,11 @@
}
func InsertToEs(msg structure.ResultMsg) {
- defer func() {
- if err := recover(); err != nil {
- logger.Error("es妯″潡鍎跨殑寮傚父鎹曡幏锛�", err)
- }
- }()
+ //defer func() {
+ // if err := recover(); err != nil {
+ // logger.Error("es妯″潡鍎跨殑寮傚父鎹曡幏锛�", err)
+ // }
+ //}()
localConfig1, err := cache.GetServerInfo()
if err != nil {
panic("閰嶇疆鏂囦欢涓嶅悎娉�")
@@ -249,7 +249,7 @@
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
"浜鸿劯",
- "",
+ time.Now().Format("2006-01-02 15:04:05"),
alarmRules,
time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
sex, //鏆傛敼涓轰汉鑴竔d strconv.FormatUint(face.Id, 10)
@@ -367,6 +367,7 @@
linkInfo = "鑱斿姩浠诲姟"
}
alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText, yoloResult.DefenceState, linkInfo})
+ logger.Info("鎵撳嵃浠诲姟鍚嶇О锛�",)
// 涓婁紶缂撳瓨鏁版嵁鐨勫浘鐗囨嬁鍒皍rl
if yoloResult.Others.CacheData != nil {
//InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
@@ -462,7 +463,7 @@
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
sdkNames,
- "",
+ time.Now().Format("2006-01-02 15:04:05"),
alarmRules,
msg.Push.ServerId,
msg.Push.ServerName,
@@ -516,22 +517,31 @@
// 鍏堝垽鏂竴涓嬫暟鎹甫鐨勮鍒欐爣绛炬槸鍚︽湁鍙互鎻掑叆鐨�
logger.Info("鎻掑叆瀹氭椂鐩爣淇℃伅锛�",len(msg.RuleResult["target"].([]structure.Result)))
for _, yoloResult := range msg.RuleResult["target"].([]structure.Result) {
- for _, tar := range yoloResult.AlarmObj {
- // 瑁呰浇鐩爣淇℃伅
- logger.Info("鎶ヨ鐩爣涓暟锛�",len(yoloResult.AlarmObj))
- var target = new(Target)
- target.TargetId = strconv.FormatUint(tar.Id, 10)
- target.TargetScore = tar.Score
- target.TargetLocation = Points{TopLeft: Point{tar.Location.X, tar.Location.Y}, BottomRight: Point{tar.Location.X + tar.Location.Width, tar.Location.Y + tar.Location.Height}}
+ // 瑁呰浇鐩爣淇℃伅`
+ // 濡傛灉鏈夐娆℃姤璀︾殑鍒欐湰甯ф暟鎹彲浠ユ彃鍏�
+ insertFlag := false
+ alarmNum := 0
+ for _,obj := range yoloResult.AlarmObj {
+ if obj.TimeLable == "10" {
+ insertFlag = true
+ alarmNum++
+ }
+ }
+ if insertFlag {
+ logger.Info("鎶ヨ鐩爣涓暟锛�",alarmNum)
+ //var target = new(Target)
+ //target.TargetId = strconv.FormatUint(tar.Id, 10)
+ //target.TargetScore = tar.Score
+ //target.TargetLocation = Points{TopLeft: Point{tar.Location.X, tar.Location.Y}, BottomRight: Point{tar.Location.X + tar.Location.Width, tar.Location.Y + tar.Location.Height}}
//logger.Info("浜鸿劯鐨刬d:",strconv.FormatUint(face.Id, 10))
- var targetInfos []Target
- targetInfos = append(targetInfos, *target)
+ //var targetInfos []Target
+ //targetInfos = append(targetInfos, *target)
// 鑾峰彇鐩爣缂撳瓨鍥剧墖
url := []string{}
//InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
// 鎶婄紦瀛樼殑鏁版嵁涓婁紶鍚庡緱鍒板湴鍧�瀛樿繘鍘�
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
- url1 := uploadImg(tar.CacheData)
+ url1 := uploadImg(yoloResult.AlarmObj[0].CacheData)
url = append(url,url1)
// 娣诲姞鎶ヨ瑙勫垯缁�
sdkNames := ""
@@ -585,16 +595,19 @@
}
if resp["fileUrl"] != nil {
url = append(url, resp["fileUrl"].(string))
+ if len(url) == 1 {
+ return
+ }
//esDataId := uuid.NewV4().String()
peraction := Personaction{
- tar.Uuid,
+ msg.Push.PushId,
msg.Cid,
msg.Push.Cam.Name,
msg.Push.Cam.Addr,
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
sdkNames,
- "",
+ time.Now().Format("2006-01-02 15:04:05"),
alarmRules,
msg.Push.ServerId,
msg.Push.ServerName,
@@ -607,7 +620,7 @@
0,
0,
0,
- targetInfos,
+ nil,
linkTag,
linkTagInfos,
}
@@ -635,8 +648,8 @@
//os.Exit(1)
}
}
-
-
+ } else {
+ logger.Info("娌℃湁棣栨鎶ヨ鐨勭洰鏍囷紝涓嶆彃鍏�")
}
}
}
@@ -702,7 +715,7 @@
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
- resp1, err1 := util.DrawPolygonOnImageForYolo(msg.Cid, i, msg.RuleResult["target"].([]structure.Result), weedfsUrl)
+ resp1, err1 := util.DrawPolygonOnImageForTarget(msg.Cid, i, msg.RuleResult["target"].([]structure.Result), weedfsUrl)
if err1 != nil {
logger.Error("缂撳瓨鏁版嵁鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
} else {
--
Gitblit v1.8.0