From d7828d3318946159c33989cdbabcb5834586fef7 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 25 七月 2019 11:19:10 +0800
Subject: [PATCH] add defenceState
---
insertdata/insertDataToEs.go | 49 ++++++++++++++++++++++++++-----------------------
1 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 554645b..d90e6b7 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -55,7 +55,7 @@
TaskName string `json:"taskName"`
SdkName string `json:"sdkName"`
Content string `json:"content"`
- AlarmRules []AlarmRule `json:"alarmRules"`
+ AlarmRules []AlarmRule `json:"alarmRules"`
LikeDate string `json:"likeDate"`
Sex string `json:"sex"`
Age int32 `json:"age"`
@@ -144,10 +144,8 @@
panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
}
alarmRules := []AlarmRule{}
- for _, faceResult := range msg.RuleResult["face"].([]ruleserver.FaceResult) {
- alarm := ChangeToString(faceResult.AlarmLevel)
- alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText})
- }
+ alarm := ChangeToString(faceResult.DefenceState,faceResult.AlarmLevel)
+ alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText})
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
bigPhotoUrl := make(map[string]interface{})
@@ -314,7 +312,7 @@
alarmRules := []AlarmRule{}
for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
sdkNames = sdkNames + yoloResult.SdkName
- alarm := ChangeToString(yoloResult.AlarmLevel)
+ alarm := ChangeToString(yoloResult.DefenceState,yoloResult.AlarmLevel)
alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText})
}
isAlarm := 0
@@ -353,7 +351,7 @@
}
serverIp, err := GetLocalIP()
url := []string{}
- url = append(url,strings.Split(resp["fileUrl"].(string), "/")[1])
+ url = append(url, strings.Split(resp["fileUrl"].(string), "/")[1])
if msg.RuleResult["cacheData"] != nil {
InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
// 鎶婄紦瀛樼殑鏁版嵁涓婁紶鍚庡緱鍒板湴鍧�瀛樿繘鍘�
@@ -371,7 +369,7 @@
} else {
logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp1)
}
- url = append(url,strings.Split(resp1["fileUrl"].(string), "/")[1])
+ url = append(url, strings.Split(resp1["fileUrl"].(string), "/")[1])
}
peraction := Personaction{
uuid.NewV4().String(),
@@ -513,23 +511,28 @@
}
// 鎶婃姤璀︾瓑绾ц浆鍖栨垚姹夊瓧
-func ChangeToString(i int32) string {
+func ChangeToString(defenceState bool,i int32) string {
alarm := ""
- if i == 1 {
- alarm = "涓�绾�"
+ if defenceState {
+ if i == 1 {
+ alarm = "涓�绾�"
+ }
+ if i == 2 {
+ alarm = "浜岀骇"
+ }
+ if i == 3 {
+ alarm = "涓夌骇"
+ }
+ if i == 4 {
+ alarm = "鍥涚骇"
+ }
+ if i == 5 {
+ alarm = "浜旂骇"
+ }
+ } else {
+ alarm = "鎾ら槻"
}
- if i == 2 {
- alarm = "浜岀骇"
- }
- if i == 3 {
- alarm = "涓夌骇"
- }
- if i == 4 {
- alarm = "鍥涚骇"
- }
- if i == 5 {
- alarm = "浜旂骇"
- }
+
return alarm
}
--
Gitblit v1.8.0