From 8be4f2aac9f180061e30600b1c55661571b10249 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 02 七月 2019 17:30:45 +0800
Subject: [PATCH] 加个过人脸规则就退出的测试
---
insertdata/insertDataToEs.go | 30 +++++++++++++++++++++++++++---
ruleserver/ruleToformula.go | 2 ++
2 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index ff4294b..ea3816a 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -90,7 +90,7 @@
type AlarmRule struct {
GroupId string `json:"groupId"`
- AlarmLevel int32 `json:"alarmLevel"`
+ AlarmLevel `json:"alarmLevel"`
RuleText string `json:"ruleText"`
}
@@ -172,6 +172,8 @@
err = EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
if err != nil {
log.Println("es can not execute right.")
+ } else {
+ log.Println("___________________________________寰�ES鎻掑叆浜鸿劯鏁版嵁鎴愬姛")
}
}else {
log.Println("璺熷簳搴撶殑鐩镐技鏁版嵁---------锛�",face.Liker)
@@ -184,7 +186,8 @@
alarmRules := []AlarmRule{}
for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
sdkNames = sdkNames + yoloResult.SdkName
- alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, yoloResult.AlarmLevel, yoloResult.RuleText})
+ alarm := ChangeToString(yoloResult.AlarmLevel)
+ alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText})
}
isAlarm := ""
resp := make(map[string]interface{})
@@ -254,7 +257,7 @@
if err != nil {
log.Println("寰�ES鎻掑叆鏁版嵁澶辫触",err)
} else {
- log.Println("__________________________________________寰�ES鎻掑叆鏁版嵁鎴愬姛")
+ log.Println("__________________________________________寰�ES鎻掑叆鏁版嵁yolo鎴愬姛")
}
}
}
@@ -286,3 +289,24 @@
err = errors.New("ipv4 not found")
return
}
+
+// 鎶婃姤璀︾瓑绾ц浆鍖栨垚姹夊瓧
+func ChangeToString(i int32) string{
+ alarm := ""
+ if i == 1 {
+ alarm = "涓�绾�"
+ }
+ if i == 2 {
+ alarm = "浜岀骇"
+ }
+ if i == 3 {
+ alarm = "涓夌骇"
+ }
+ if i == 4 {
+ alarm = "鍥涚骇"
+ }
+ if i == 5 {
+ alarm = "浜旂骇"
+ }
+ return alarm
+}
\ No newline at end of file
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index d6a7f49..47dc72e 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -4,6 +4,7 @@
"encoding/json"
"fmt"
"log"
+ "os"
"ruleprocess/cache"
"sort"
"strconv"
@@ -338,6 +339,7 @@
log.Println("-------------------yolo缁撴灉鏍囩",args.RuleResult["yolo"].([]Result))
if args.RuleResult["faces"] != nil {
log.Println("-------------------face缁撴灉鏍囩",args.RuleResult["faces"].([]Arg))
+ os.Exit(1)
}
return true
} else {
--
Gitblit v1.8.0