From 0307004b3bb3f684f489e6eee7e6213b35f1cac1 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 23 十月 2019 15:52:23 +0800
Subject: [PATCH] fix不画区域的bug
---
util/simpleCV.go | 4 ++--
insertdata/insertDataToEs.go | 2 --
ruleserver/readyDataForRule.go | 6 +++---
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 9704795..99dc7f9 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -251,7 +251,6 @@
target.TargetScore = face.Score
target.TargetLocation = Points{TopLeft:Point{face.Location.X,face.Location.Y},BottomRight:Point{face.Location.X+face.Location.Width,face.Location.Y+face.Location.Height}}
//logger.Info("浜鸿劯鐨刬d:",strconv.FormatUint(face.Id, 10))
- logger.Info("%%%%%%%%%%%%%%%%%%%%%鐩爣淇℃伅锛�",*target)
pervideo := PerVideoPicture{
esDataId,
msg.Cid,
@@ -478,7 +477,6 @@
}
serverIp, err := GetLocalIP()
- logger.Info("%%%%%%%%%%%%%%%%%yolo鐨則arget淇℃伅锛�",targetInfos)
if resp["fileUrl"] != nil {
url = append(url, resp["fileUrl"].(string))
esDataId := uuid.NewV4().String()
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index 15f781f..b547b9c 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -299,9 +299,9 @@
}
}
logger.Info("鍖哄煙鏄細",areaPoints,"鍖哄煙鍐呯洰鏍囨暟閲忎负锛�",a.TargetNum,"---",len(a.FilterData))
- for _,tar := range a.FilterData {
- logger.Info("鍏蜂綋鐩爣鐨勫潗鏍囦负",tar.Id,tar.Location)
- }
+ //for _,tar := range a.FilterData {
+ // logger.Info("鍏蜂綋鐩爣鐨勫潗鏍囦负",tar.Id,tar.Location)
+ //}
a.Time = time.Unix(time.Now().Unix(), 0).String()[11:16]
a.KeepRight = arg.KeepRight
a.IsStatic = arg.IsStatic
diff --git a/util/simpleCV.go b/util/simpleCV.go
index 9e48691..a2af52b 100644
--- a/util/simpleCV.go
+++ b/util/simpleCV.go
@@ -169,7 +169,7 @@
for _,result := range results {
polygonIds := strings.Split(result.AlarmPolygon,",")
logger.Info("-----------------------鐪嬬湅鎶ヨ鍖哄煙id锛�",polygonIds)
- for i := 0; i < len(polygonIds)-1; i++ {
+ for i := 0; i < len(polygonIds); i++ {
polygon := getPolygonById(polygonIds[i],cameraId)
if polygon.Polygon != "[]" && polygon.Polygon != ""{
logger.Debug("鎵�鐢诲尯鍩燂細",polygon.Polygon)
@@ -200,7 +200,7 @@
for _,result := range results {
polygonIds := strings.Split(result.AlarmPolygon,",")
logger.Info("-----------------------鐪嬬湅鎶ヨ鍖哄煙id锛�",polygonIds)
- for i := 0; i < len(polygonIds)-1; i++ {
+ for i := 0; i < len(polygonIds); i++ {
polygon := getPolygonById(polygonIds[i],cameraId)
if polygon.Polygon != "[]" && polygon.Polygon != ""{
logger.Debug("鎵�鐢诲尯鍩燂細",polygon.Polygon)
--
Gitblit v1.8.0