From b3ef9bcba40630d018ee07cbb74d601226e28941 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 28 十月 2019 14:13:24 +0800
Subject: [PATCH] ---

---
 util/simpleCV.go |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/util/simpleCV.go b/util/simpleCV.go
index 9e48691..e17796d 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,8 +200,9 @@
 	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)
+			logger.Info("----鏌ュ埌鐨勬姤璀︽锛�",polygon)
 			if polygon.Polygon != "[]" && polygon.Polygon != ""{
 				logger.Debug("鎵�鐢诲尯鍩燂細",polygon.Polygon)
 				DrawAPolygon(&rook,polygon.Polygon,yellow)
@@ -240,8 +241,11 @@
 	// 鏌ュ埌鎽勫儚鏈烘墍鏈夌殑鍖哄煙骞剁敾妗�
 	var cameraPolygons []protomsg.CameraPolygon
 	cameraPolygons = cache.GetPolygonsByCameraId(cameraId)
+	logger.Info("鏍规嵁id鏌ュ埌鐨勬姤璀︽锛�",cameraPolygons)
 	for _, polygon := range cameraPolygons {
-		if polygon.Id == polygonId {
+		logger.Info("鏌ュ埌鐨勫尯鍩焛d锛�",polygon.Id,"--瑕佸尮閰嶇殑鏁版嵁id锛�",polygonId,"---鏄惁鐩哥瓑锛�",strings.Contains(polygonId,polygon.Id))
+		if strings.Contains(polygonId,polygon.Id) {
+			logger.Info("杩涙潵鍗崇浉绛�")
 			return polygon
 		}
 	}

--
Gitblit v1.8.0