From 46bc6d6fd8024f3d9401936308915ad9e8cc2d18 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 11 九月 2019 10:18:33 +0800
Subject: [PATCH] fix bug
---
insertdata/insertDataToEs.go | 1 +
ruleserver/ruleToformula.go | 14 +++++++-------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index ffdb4d4..843a54c 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -17,6 +17,7 @@
"github.com/satori/go.uuid"
"ruleprocess/ruleserver"
"ruleprocess/util"
+ "ruleprocess/structure"
)
var weedfsUrl, videoPersonUrl, personAction string
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index bf5c84f..0b6b606 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -203,7 +203,7 @@
}
var labelTypes []int // 0涓簓olo鏍囩锛�1涓篺ace鏍囩 2涓轰袱鑰呮爣绛�
if sdkNames != "" {
- args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkNames, groupRule.GroupId, groupRule.DefenceState, groupRule.AlarmLevel, groupRule.GroupText, locations, polygonId, islink,label,})
+ args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]structure.Result), structure.Result{taskId, sdkNames, groupRule.GroupId, groupRule.DefenceState, groupRule.AlarmLevel, groupRule.GroupText, locations, polygonId, islink,label,})
labelTypes = append(labelTypes,0)
//logger.Info("-------------------yolo缁撴灉鏍囩闀垮害", len(args.RuleResult["yolo"].([]Result)))
}
@@ -364,15 +364,15 @@
// 鍊掓槸鎶婃墦鐨勭粍瑙勫垯鏍囩缁欏幓鎺変簡鍟�
for _,val := range labelTypes {
if val == 0 {
- if len(args.RuleResult["yolo"].([]Result)) >= 1 {
- lens := len(args.RuleResult["yolo"].([]Result))-1
- args.RuleResult["yolo"] = args.RuleResult["yolo"].([]Result)[0:lens]
+ if len(args.RuleResult["yolo"].([]structure.Result)) >= 1 {
+ lens := len(args.RuleResult["yolo"].([]structure.Result))-1
+ args.RuleResult["yolo"] = args.RuleResult["yolo"].([]structure.Result)[0:lens]
}
}
if val == 1 {
- if len(args.RuleResult["face"].([]FaceResult)) >= 1 {
- lens := len(args.RuleResult["face"].([]FaceResult))-1
- args.RuleResult["face"] = args.RuleResult["face"].([]FaceResult)[0:lens]
+ if len(args.RuleResult["face"].([]structure.FaceResult)) >= 1 {
+ lens := len(args.RuleResult["face"].([]structure.FaceResult))-1
+ args.RuleResult["face"] = args.RuleResult["face"].([]structure.FaceResult)[0:lens]
}
}
}
--
Gitblit v1.8.0