From cbe73e3706a6494b506febd0e4a51ce1096aae1f Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 05 十二月 2019 17:21:46 +0800
Subject: [PATCH] 加跟踪算法,进程间通讯加sleep

---
 ruleserver/readyDataForRule.go |  110 ++++++++++++++++++++++++++----------------------------
 1 files changed, 53 insertions(+), 57 deletions(-)

diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index 46420b7..bdd79c4 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -3,12 +3,11 @@
 import (
 	"basic.com/dbapi.git"
 	"basic.com/pubsub/protomsg.git"
-	logger "github.com/alecthomas/log4go"
 	"encoding/json"
 	"errors"
 	"fmt"
+	logger "github.com/alecthomas/log4go"
 	"github.com/golang/protobuf/proto"
-	uuid "github.com/satori/go.uuid"
 	"math"
 	"nanomsg.org/go-mangos"
 	"nanomsg.org/go-mangos/protocol/req"
@@ -229,48 +228,48 @@
 }
 
 // 璁$畻鍖哄煙鍐呯殑鐩爣鏁伴噺浠ュ強灏嗙浉浼煎害銆佸崰姣斻�佸昂瀵哥瓑鎵撳寘
-func CountAreaObjs(a *structure.AreaMap,arg *structure.SdkData) {
-
-	a.TargetNum = 0
-	threshold := 80.0       // 鐩镐技搴�
-	intersectionper := 20.0 // 鍗犳瘮
-	size := 0.0            // 灏哄
-
-	areaPoints := Json2points(a.AreaJson)
-	logger.Info("鐪嬬湅鍥剧墖鐨剋idth鍜宧eight:",arg.ImageWidth,arg.ImageHeight)
-	widthScale := float64(arg.ImageWidth) / 960
-	heigthScale := float64(arg.ImageHeight) / 540
-	for _, obj := range arg.Photo {
-		//logger.Info("------------------鐪嬬湅sdkData:", arg.SdkName, "鐨凱hoto鏁版嵁----------------", obj, "----椤轰究鐪嬬湅鍗犳瘮-----锛�", PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale))
-		if  obj.Score >= threshold && float64(obj.Rects.Width*obj.Rects.Height) >= size && PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale) >= intersectionper {
-			// 杩欐瑕佸榻愯〃杈惧紡閲屾墍闇�瑕佺殑鎵�鏈夊弬鏁�
-			a.TargetNum++
-			uuid := uuid.NewV4().String()
-			arg1 := structure.Arg{obj.Id,uuid,obj.Score, PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale), float64(obj.Rects.Width * obj.Rects.Height), a.AreaJson,obj.Type, obj.Rects, obj.Car,obj.Feature, obj.ThftRes, []*structure.BaseInfo{},"",structure.ResultMsg{}}
-			//logger.Println("鏀捐繘鍘荤殑arg锛�-------", arg1)
-			a.Args = append(a.Args, &arg1)
-			a.FilterData = append(a.FilterData, &arg1)
-		}
-	}
-	//logger.Info("鍖哄煙鏄細",areaPoints,"鍖哄煙鍐呯洰鏍囨暟閲忎负锛�",a.TargetNum,"---",len(a.FilterData))
-	a.Time = time.Unix(time.Now().Unix(), 0).String()[11:16]
-	//logger.Println("--------------------鐪嬬湅鍖哄煙鏁版嵁锛�",*a)
-}
-
-// 鎶妔dk浠庢暟鎹抚涓婃彁鍙栫殑鎸夌収鍖哄煙鍒嗙被褰掔疆
-func SdkDataFormat(cameraId string, arg *structure.SdkData, cameraPolygons []protomsg.CameraPolygon) {
-	logger.Info("==================================鏈瑂dkData涓В鍑烘潵鐨勭洰鏍囨暟鎹�=======================================")
-	for _, photo := range arg.Photo {
-		logger.Info("--------瑙f瀽鍑烘潵鐨勬暟鎹�---", cameraId, arg.IpcId, photo.Rects, photo.Score)
-	}
-	for _, polygon := range cameraPolygons {
-		//logger.Println("++++++鍦ㄨ繖鍎跨湅涓�涓嬪尯鍩熷晩:", polygon.Polygon)
-		areaMap := structure.AreaMap{CameraId: cameraId, AreaId: polygon.Id, AreaJson: polygon.Polygon, TriggerLine: polygon.TriggerLine, DirectionLine: polygon.DirectionLine}
-		// 涓烘瘡涓憚鍍忔満鍖哄煙濉厖鏁版嵁
-		CountAreaObjs(&areaMap,arg)
-		arg.AreaMapList = append(arg.AreaMapList, &areaMap)
-	}
-}
+//func CountAreaObjs(a *structure.AreaMap,arg *structure.SdkData) {
+//
+//	a.TargetNum = 0
+//	threshold := 80.0       // 鐩镐技搴�
+//	intersectionper := 20.0 // 鍗犳瘮
+//	size := 0.0            // 灏哄
+//
+//	areaPoints := Json2points(a.AreaJson)
+//	logger.Info("鐪嬬湅鍥剧墖鐨剋idth鍜宧eight:",arg.ImageWidth,arg.ImageHeight)
+//	widthScale := float64(arg.ImageWidth) / 960
+//	heigthScale := float64(arg.ImageHeight) / 540
+//	for _, obj := range arg.Photo {
+//		//logger.Info("------------------鐪嬬湅sdkData:", arg.SdkName, "鐨凱hoto鏁版嵁----------------", obj, "----椤轰究鐪嬬湅鍗犳瘮-----锛�", PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale))
+//		if  obj.Score >= threshold && float64(obj.Rects.Width*obj.Rects.Height) >= size && PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale) >= intersectionper {
+//			// 杩欐瑕佸榻愯〃杈惧紡閲屾墍闇�瑕佺殑鎵�鏈夊弬鏁�
+//			a.TargetNum++
+//			uuid := uuid.NewV4().String()
+//			arg1 := structure.Arg{obj.Id,uuid,obj.Score, PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale), float64(obj.Rects.Width * obj.Rects.Height), a.AreaJson,obj.Type, obj.Rects, obj.Car,obj.Feature, obj.ThftRes, []*structure.BaseInfo{},"",structure.ResultMsg{}}
+//			//logger.Println("鏀捐繘鍘荤殑arg锛�-------", arg1)
+//			a.Args = append(a.Args, &arg1)
+//			a.FilterData = append(a.FilterData, &arg1)
+//		}
+//	}
+//	//logger.Info("鍖哄煙鏄細",areaPoints,"鍖哄煙鍐呯洰鏍囨暟閲忎负锛�",a.TargetNum,"---",len(a.FilterData))
+//	a.Time = time.Unix(time.Now().Unix(), 0).String()[11:16]
+//	//logger.Println("--------------------鐪嬬湅鍖哄煙鏁版嵁锛�",*a)
+//}
+//
+//// 鎶妔dk浠庢暟鎹抚涓婃彁鍙栫殑鎸夌収鍖哄煙鍒嗙被褰掔疆
+//func SdkDataFormat(cameraId string, arg *structure.SdkData, cameraPolygons []protomsg.CameraPolygon) {
+//	logger.Info("==================================鏈瑂dkData涓В鍑烘潵鐨勭洰鏍囨暟鎹�=======================================")
+//	for _, photo := range arg.Photo {
+//		logger.Info("--------瑙f瀽鍑烘潵鐨勬暟鎹�---", cameraId, arg.IpcId, photo.Rects, photo.Score)
+//	}
+//	for _, polygon := range cameraPolygons {
+//		//logger.Println("++++++鍦ㄨ繖鍎跨湅涓�涓嬪尯鍩熷晩:", polygon.Polygon)
+//		areaMap := structure.AreaMap{CameraId: cameraId, AreaId: polygon.Id, AreaJson: polygon.Polygon, TriggerLine: polygon.TriggerLine, DirectionLine: polygon.DirectionLine}
+//		// 涓烘瘡涓憚鍍忔満鍖哄煙濉厖鏁版嵁
+//		CountAreaObjs(&areaMap,arg)
+//		arg.AreaMapList = append(arg.AreaMapList, &areaMap)
+//	}
+//}
 
 func Push(data *protomsg.CompareArgs,sock mangos.Socket) []byte{
 	//var sock mangos.Socket
@@ -282,12 +281,12 @@
 	//}
 	errSize := sock.SetOption(mangos.OptionMaxRecvSize,5*1024*1024)
 	if errSize != nil {
-		logger.Error("Failed set MaxRecvSize: %v", err)
+		_ = logger.Error("Failed set MaxRecvSize: %v", err)
 		return nil
 	}
 	serverIP, _ := GetLocalIP()
 	if err = sock.Dial("tcp://"+serverIP+":4010"); err != nil {
-		logger.Error("璇锋眰socket鎷ㄥ彿澶辫触: %s", err.Error())
+		_ = logger.Error("璇锋眰socket鎷ㄥ彿澶辫触: %s", err.Error())
 	}
 	//sock.AddTransport(ipc.NewTransport())
 	sock.AddTransport(tcp.NewTransport())
@@ -301,11 +300,11 @@
 	logger.Debug("鎺ㄩ�佹暟鎹�")
 	//bytes := []byte("ndfasojdfaidsos")
 	if err = sock.Send(bytes); err != nil {
-		logger.Error("鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: %s", err.Error())
+		_ = logger.Error("鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: %s", err.Error())
 		//os.Exit(1)
 	}
 	if msg, err = sock.Recv(); err != nil {
-		logger.Error("鎺ユ敹鍝嶅簲澶辫触: %s", err.Error())
+		_ = logger.Error("鎺ユ敹鍝嶅簲澶辫触: %s", err.Error())
 		//os.Exit(1)
 	}
 	logger.Debug("鏁版嵁鎺ㄩ�佹垚鍔燂紒鏀跺埌鍝嶅簲,鏁版嵁闀垮害涓猴細",len(msg))
@@ -318,17 +317,17 @@
 	var msg []byte
 
 	if sock, err = req.NewSocket(); err != nil {
-		logger.Error("鍒涘缓璇锋眰socket澶辫触: %s", err.Error())
+		_ = logger.Error("鍒涘缓璇锋眰socket澶辫触: %s", err.Error())
 	}
 	errSize := sock.SetOption(mangos.OptionMaxRecvSize,5*1024*1024)
 	if errSize != nil {
-		logger.Error("Failed set MaxRecvSize: %v", err)
+		_ = logger.Error("Failed set MaxRecvSize: %v", err)
 	}
 	//sock.AddTransport(ipc.NewTransport())
 	sock.AddTransport(tcp.NewTransport())
 	serverIP, _ := GetLocalIP()
 	if err = sock.Dial("tcp://"+serverIP+":4010"); err != nil {
-		logger.Error("璇锋眰socket鎷ㄥ彿澶辫触: %s", err.Error())
+		_ = logger.Error("璇锋眰socket鎷ㄥ彿澶辫触: %s", err.Error())
 	}
 	logger.Info("搴忓垪鍖栨暟鎹�")
 
@@ -344,19 +343,16 @@
 				logger.Info("搴忓垪鍖栧け璐ワ細",err1)
 			}
 			logger.Debug("鎺ㄩ�佹暟鎹�")
-			//bytes := []byte("ndfasojdfaidsos")
 			if err = sock.Send(bytes); err != nil {
-				logger.Error("鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: %s", err.Error())
-				//os.Exit(1)
+				_ = logger.Error("鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: %s", err.Error())
 			}
 			if msg, err = sock.Recv(); err != nil {
-				logger.Error("鎺ユ敹鍝嶅簲澶辫触: %s", err.Error())
-				//os.Exit(1)
+				_ = logger.Error("鎺ユ敹鍝嶅簲澶辫触: %s", err.Error())
 			}
 			logger.Debug("鏁版嵁鎺ㄩ�佹垚鍔燂紒鏀跺埌鍝嶅簲,鏁版嵁闀垮害涓猴細",len(msg))
 			receiver <- msg
 		default:
-
+			time.Sleep(time.Second)
 		}
 	}
 }

--
Gitblit v1.8.0