From 10503ddbe9f65f03dca53d1dd4d4b3a72fc7e6af Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 13 十一月 2019 14:38:26 +0800
Subject: [PATCH] 删除islink
---
insertdata/insertDataToEs.go | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 1753cf8..b363f36 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -40,6 +40,7 @@
Id string `json:"id"`
CameraId string `json:"cameraId"`
CameraAddr string `json:"cameraAddr"`
+ CameraName string `json:"cameraName"`
PicDate string `json:"picDate"`
PicMaxUrl string `json:"picMaxUrl"`
TaskId string `json:"taskId"`
@@ -120,7 +121,6 @@
AlarmLevel string `json:"alarmLevel"`
RuleText string `json:"ruleText"`
DefenceState bool `json:"defenceState"`
- IsLink bool `json:"isLink"`
LinkInfo string `json:"linkInfo"`
}
@@ -168,7 +168,7 @@
//os.Exit(1)
for _, faceResult := range face.rules {
alarm := ChangeToString(faceResult.DefenceState, faceResult.AlarmLevel)
- alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText, faceResult.DefenceState, faceResult.IsLink, ""})
+ alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText, faceResult.DefenceState, ""})
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
@@ -207,6 +207,7 @@
face.Uuid,
msg.Cid,
msg.Push.Cam.Addr,
+ msg.Push.Cam.Name,
picTime,
imgMaxUrl,
msg.Tasklab.Taskid,
@@ -329,7 +330,7 @@
if yoloResult.IsLink {
linkInfo = "鑱斿姩浠诲姟"
}
- alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText, yoloResult.DefenceState, yoloResult.IsLink, linkInfo})
+ alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText, yoloResult.DefenceState, linkInfo})
// 涓婁紶缂撳瓨鏁版嵁鐨勫浘鐗囨嬁鍒皍rl
if yoloResult.Others.CacheData != nil {
//InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
@@ -384,6 +385,10 @@
}
}
}
+ linkTag := ""
+ if len(linkTagInfos) > 0 {
+ linkTag = "鑱斿姩浠诲姟"
+ }
isAlarm := 0
resp := make(map[string]interface{})
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
@@ -433,7 +438,7 @@
0,
0,
targetInfos,
- "",
+ linkTag,
linkTagInfos,
}
requstbody, err := json.Marshal(peraction)
@@ -644,6 +649,7 @@
msg.Push.PushId + "-" + uuid.NewV4().String(),
msg.Cid,
msg.Push.Cam.Addr,
+ msg.Push.Cam.Name,
i.Timestamp,
"",
msg.Tasklab.Taskid,
--
Gitblit v1.8.0