From 6f1ae979d13028006ccdca01e310d2b5d2d53c5c Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 15 八月 2019 16:27:44 +0800
Subject: [PATCH] 把数据定义模块儿提取出来

---
 algorithm/intrusion/intrusion.go |   22 +-
 ruleserver/ruleToformula.go      |  214 +++++--------------
 ruleserver/personTrack.go        |    5 
 ruleserver/readyDataForRule.go   |   64 ++---
 structure/gragh.go               |   21 +
 insertdata/insertDataToEs.go     |   45 ++--
 algorithm/timeSlot/timeSlot.go   |   14 
 algorithm/face/face.go           |   20 
 labelFilter/readyDataForLabel.go |   20 
 labelFilter/ruleForLabel.go      |    6 
 structure/rule.go                |  126 +++++++++++
 ruleserver/timeTicker.go         |   11 
 ruleserver/geoPolygon.go         |   33 --
 13 files changed, 307 insertions(+), 294 deletions(-)

diff --git a/algorithm/face/face.go b/algorithm/face/face.go
index 28c3a7a..f1059aa 100644
--- a/algorithm/face/face.go
+++ b/algorithm/face/face.go
@@ -4,7 +4,7 @@
 	"basic.com/pubsub/protomsg.git"
 	"github.com/knetic/govaluate"
 	"ruleprocess/logger"
-	"ruleprocess/ruleserver"
+	"ruleprocess/structure"
 	"strconv"
 )
 
@@ -13,7 +13,7 @@
 }
 
 // 杩囨护瑙勫垯鍏堢瓫閫夊嚭绗﹀悎鏉′欢鐨勭洰鏍囨暟閲�
-func filterRule(rule *protomsg.Rule, am *ruleserver.AreaMap) ruleserver.LittleRuleResult {
+func filterRule(rule *protomsg.Rule, am *structure.AreaMap) structure.LittleRuleResult {
 		// 澶勭悊鐨勬槸浜鸿劯绠楁硶 濡傛灉杩欐潯瑙勫垯閰嶇疆鐨勬槸浜鸿劯绠楁硶锛岃繃婊ゅ畬鏉′欢涔嬪悗鐩存帴寰楀嚭缁撴灉锛屽洜涓鸿偗瀹氭病鏈夋暟閲忔潯浠讹紝鑷繁鎷兼帴
 		//logger.Info("瑙勫垯鐨勭畻娉昳d鍜屽尯鍩熺殑绠楁硶id锛�", rule.SdkId, "===", am.sdkId)
 		if rule.PolygonId == am.AreaId { // 绠楁硶鍜屽尯鍩熼兘寰楀鐨勪笂
@@ -36,7 +36,7 @@
 					flag = "true"
 				}
 				logger.Info("---------浜鸿劯姣斿绗﹀悎鏉′欢鐨勬暟閲忎负锛�",len(am.FilterData))
-				return ruleserver.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + flag, rule.Sort}
+				return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + flag, rule.Sort}
 			}
 			if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a97e" { // 浜鸿劯妫�娴�
 				//logger.Debug("褰撳墠灏忚鍒欐槸锛�",rule)
@@ -44,7 +44,7 @@
 					// 濡傛灉鏄笉瑙勭煩鐨勮繛鎺ョ缁熺粺杩斿洖false 瑙勫垯涔熷彧鑳藉垽鏂汉鑴哥殑鐩镐技搴︼紝鎵�浠ヤ笉瀛樺湪鍒殑杩炴帴绗�
 					if rule.SdkArgAlias == "score" || rule.SdkArgAlias == "proportion" || rule.SdkArgAlias == "size" { // 鍒ゆ柇鐨勬槸鐩镐技鍊硷紝鍗犳瘮锛屽昂瀵哥瓑杩囨护鏉′欢锛屽鏋滃啀鏈夛紝杩樺彲浠ュ啀鍔�
 						logger.Info("-----------------------杩囪鍒欎箣鍓嶅尯鍩熷唴鐨勪汉鑴告暟閲忎负锛�",am.TargetNum)
-						var args []*ruleserver.Arg
+						var args []*structure.Arg
 						if rule.RuleWithPre == "&&" {
 							args = am.FilterData
 							//logger.Info("杩囨护鍚庣殑args鐨勯暱搴︿负锛�",len(args))
@@ -77,20 +77,20 @@
 						logger.Info("杩囧畬鏉′欢鍚庣殑鐩爣鏁伴噺涓猴細",am.TargetNum)
 						if am.TargetNum > 0 {
 							logger.Info("锛侊紒锛侊紒锛侊紒锛侊紒锛佷汉鑴告娴嬫垚鍔�")
-							return ruleserver.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort}
+							return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort}
 						} else {
-							return ruleserver.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+							return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort}
 						}
 					} else {
-						return ruleserver.LittleRuleResult{}
+						return structure.LittleRuleResult{}
 					}
 				} else {
-					return ruleserver.LittleRuleResult{}
+					return structure.LittleRuleResult{}
 				}
 			} else {
-				return ruleserver.LittleRuleResult{}
+				return structure.LittleRuleResult{}
 			}
 		} else {
-			return ruleserver.LittleRuleResult{}
+			return structure.LittleRuleResult{}
 		}
 }
\ No newline at end of file
diff --git a/algorithm/intrusion/intrusion.go b/algorithm/intrusion/intrusion.go
index cf590e0..48aa741 100644
--- a/algorithm/intrusion/intrusion.go
+++ b/algorithm/intrusion/intrusion.go
@@ -4,7 +4,7 @@
 	"basic.com/pubsub/protomsg.git"
 	"github.com/knetic/govaluate"
 	"ruleprocess/logger"
-	"ruleprocess/ruleserver"
+	"ruleprocess/structure"
 	"strconv"
 )
 
@@ -13,11 +13,11 @@
 }
 
 // 杩囨护瑙勫垯鍏堢瓫閫夊嚭绗﹀悎鏉′欢鐨勭洰鏍囨暟閲�
-func filterRule(rule *protomsg.Rule, am *ruleserver.AreaMap) ruleserver.LittleRuleResult {
+func filterRule(rule *protomsg.Rule, am *structure.AreaMap) structure.LittleRuleResult {
 	// 澶勭悊鐨勯兘鏄痽olo鏁版嵁
 	if rule.PolygonId == am.AreaId { // 棣栧厛杩欐潯瑙勫垯寰楁槸杩欎釜绠楁硶鐨勮鍒欙紝鍏舵瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
 		if rule.SdkArgAlias == "score" || rule.SdkArgAlias == "proportion" || rule.SdkArgAlias == "size" { // 鍒ゆ柇鐨勬槸鐩镐技鍊硷紝鍗犳瘮锛屽昂瀵哥瓑杩囨护鏉′欢锛屽鏋滃啀鏈夛紝杩樺彲浠ュ啀鍔�
-			var args []*ruleserver.Arg
+			var args []*structure.Arg
 			if rule.RuleWithPre == "&&" {
 				args = am.FilterData
 			} else {
@@ -46,28 +46,28 @@
 			}
 			am.TargetNum = len(am.FilterData) // 鎶婄鍚堟潯浠剁殑鐩爣鏁伴噺鏇存柊鍒皌argetNum瀛楁
 			if am.TargetNum > 0 {
-				return ruleserver.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort}
+				return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort}
 			} else {
-				return ruleserver.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+				return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort}
 			}
 
 		} else {
-			return ruleserver.LittleRuleResult{}
+			return structure.LittleRuleResult{}
 		}
 
 	} else {
-		return ruleserver.LittleRuleResult{}
+		return structure.LittleRuleResult{}
 	}
 }
 
 // 缁欐暟鎹簱鐨勮鍒欒〃杈惧紡浠ｅ弬 args: 涓�鏉″瓙瑙勫垯锛屽尯鍩熸暟鎹�
-func transferParameters(rule *protomsg.Rule, am *ruleserver.AreaMap) ruleserver.LittleRuleResult {
+func transferParameters(rule *protomsg.Rule, am *structure.AreaMap) structure.LittleRuleResult {
 	if rule.PolygonId == am.AreaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
 		if rule.SdkArgAlias == "objCount" { // 濡傛灉鍙傛暟鏄鍖哄煙鍐呯洰鏍囨暟閲� 鍗硑olo 浜鸿劯涓嶄細鏈夋暟閲�
 			//logger.Info("褰撳墠灏忚鍒欐槸锛�---------", rule)
 			//logger.Info("寰楀嚭缁撴灉闃舵", "姣旇緝鐨勮鍒欐槸锛�", rule)
 			if rule.Operator == "" {
-				return ruleserver.LittleRuleResult{am.SdkName, strconv.Itoa(am.TargetNum) + "" + rule.RuleWithPre, rule.Sort} // 濡傛灉鍚庨潰涓嶈窡鎿嶄綔绗﹀氨鐩存帴杩斿洖鏁伴噺  姣斿瑕佽窡涓嬩竴涓尯鍩熸瘮杈冩暟閲忕殑灏辩洿鎺ヨ繑鍥炴湰鍖哄煙鐨勬暟閲�
+				return structure.LittleRuleResult{am.SdkName, strconv.Itoa(am.TargetNum) + "" + rule.RuleWithPre, rule.Sort} // 濡傛灉鍚庨潰涓嶈窡鎿嶄綔绗﹀氨鐩存帴杩斿洖鏁伴噺  姣斿瑕佽窡涓嬩竴涓尯鍩熸瘮杈冩暟閲忕殑灏辩洿鎺ヨ繑鍥炴湰鍖哄煙鐨勬暟閲�
 			}
 			//args := am.targetNum     targetNum 宸叉垚鎵�鏈夌洰鏍囩殑鎬绘暟閲忥紝杩欓噷鍙畻yolo鐨�
 			var num int = 0
@@ -79,9 +79,9 @@
 			formula := strconv.Itoa(num) + " " + rule.Operator + " " + rule.SdkArgValue
 			expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
 			result, _ := expression.Evaluate(nil)          // 寰楀埌鏁板鍏紡鐨勭粨鏋�
-			return ruleserver.LittleRuleResult{am.SdkName, rule.RuleWithPre + " " + strconv.FormatBool(result.(bool)), rule.Sort}
+			return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + " " + strconv.FormatBool(result.(bool)), rule.Sort}
 			// 鍔犱笂鍏充簬绠楁硶鐨勫垽鏂潯浠讹紝涓嶈兘鍙湁鍏充簬瑙勫垯鐨勶紝鏈夌殑绠楁硶鏈韩灏辨槸涓�涓鍒欙紝濡備釜浣撻潤姝紝闈犲彸琛�,鎵�浠ワ紝鎷垮埌褰撳墠瀛愯鍒欑殑sdkid鏉ュ垽鏂槸鍚︽槸閭ｄ簺鐗规畩鐨勮鍒�
 		}
 	}
-	return ruleserver.LittleRuleResult{}
+	return structure.LittleRuleResult{}
 }
\ No newline at end of file
diff --git a/algorithm/timeSlot/timeSlot.go b/algorithm/timeSlot/timeSlot.go
index b3de4a1..4c3150d 100644
--- a/algorithm/timeSlot/timeSlot.go
+++ b/algorithm/timeSlot/timeSlot.go
@@ -6,11 +6,11 @@
 	"github.com/knetic/govaluate"
 	"ruleprocess/cache"
 	"ruleprocess/logger"
-	"ruleprocess/ruleserver"
+	"ruleprocess/structure"
 	"time"
 )
 
-func TimeRuleResult(rule *protomsg.Rule, am *ruleserver.AreaMap) ruleserver.LittleRuleResult {
+func TimeRuleResult(rule *protomsg.Rule, am *structure.AreaMap) structure.LittleRuleResult {
 	if rule.PolygonId == am.AreaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
 		if rule.SdkArgAlias == "time_rule" { // 鍒ゆ柇鏄惁绗﹀悎鏃堕棿瑙�
 			//logger.Info("----------褰撳墠鏃堕棿瑙勫垯锛�---------", rule)
@@ -39,7 +39,7 @@
 						break
 					}
 				}
-				return ruleserver.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + flag, rule.Sort}
+				return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + flag, rule.Sort}
 			}
 
 			if rule.Operator == "unsatisfy" || rule.Operator == "!=" { // 涓嶆弧瓒虫墍閫夌殑鏃堕棿瑙勫垯
@@ -59,18 +59,18 @@
 						break
 					}
 				}
-				return ruleserver.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + flag, rule.Sort}
+				return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + flag, rule.Sort}
 			}
 
 		}
 	}
-	return ruleserver.LittleRuleResult{}
+	return structure.LittleRuleResult{}
 }
 
 // 鍙栧嚭鏌愪釜鏃堕棿瑙勫垯鐨勭鍑犲ぉ鐨勮鍒欐闆嗗悎
-func GetTimeById(id string, index int) []ruleserver.TimeRange {
+func GetTimeById(id string, index int) []structure.TimeRange {
 	_, cameraTimeRule := cache.GetTimeRuleById(id)
-	var timeRangeList []ruleserver.Day
+	var timeRangeList []structure.Day
 	err := json.Unmarshal([]byte(cameraTimeRule.TimeRule), &timeRangeList)
 	if err != nil {
 		logger.Error("鍙栨椂闂磋鍒欐椂鍙嶅簭鍒楀寲閿欒锛�")
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 1c2f8e2..56b6c8a 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -9,6 +9,7 @@
 	"net"
 	"ruleprocess/cache"
 	"ruleprocess/logger"
+	"ruleprocess/structure"
 	"strings"
 	"time"
 
@@ -77,7 +78,7 @@
 	IsAckAlarm      int                    `json:"isAckAlarm"`
 	IsCollect       int                    `json:"isCollect"`
 	IsDelete        int                    `json:"isDelete"`
-	BaseInfo        []*ruleserver.BaseInfo `json:"baseInfo"`
+	BaseInfo        []*structure.BaseInfo `json:"baseInfo"`
 }
 
 //  yolo琛屼负鐨勬暟鎹粨鏋�
@@ -115,8 +116,8 @@
 
 // 涓�涓猣ace瀵瑰涓鍒欑粍鐨勫綊缃汉鑴哥殑缁撴瀯浣�
 type FaceAndRules struct {
-	ruleserver.Arg
-	rules []ruleserver.Result
+	structure.Arg
+	rules []structure.Result
 }
 
 // 寰�ES鎻掓暟鎹�
@@ -143,7 +144,7 @@
 //	//	ChangeStatusYolo(msg)
 //	//}
 //}
-func InsertToEs(msg ruleserver.ResultMsg) {
+func InsertToEs(msg structure.ResultMsg) {
 	InsertFace(msg, "")
 	// 濡傛灉鏍囩涓惈鏈夋寔缁椂闂撮娆℃姤璀︾殑timeLabel鐨勮瘽鍒欎笉闇�瑕佽繃浜轰綋杩借釜锛屼笉鐒跺氨娌＄殑鎻掑叆浜�
 	fk := ruleserver.TrackOrNot(msg.RuleResult)
@@ -162,8 +163,8 @@
 }
 
 // 寰�es涓彃鍏ヤ汉鑴告暟鎹�
-func InsertFace(msg ruleserver.ResultMsg, linkId string) {
-	if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.FaceResult)) > 0 {
+func InsertFace(msg structure.ResultMsg, linkId string) {
+	if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]structure.FaceResult)) > 0 {
 		logger.Info("寰�ES鎻掍汉鑴告暟鎹�")
 		faces := []*FaceAndRules{}
 		faces = PutFace(faces,msg)
@@ -271,9 +272,9 @@
 }
 
 // 褰掔疆浜鸿劯
-func PutFace(faces []*FaceAndRules,msg ruleserver.ResultMsg)[]*FaceAndRules{
-	if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.FaceResult)) > 0 {
-		for _, faceResult := range msg.RuleResult["face"].([]ruleserver.FaceResult) {
+func PutFace(faces []*FaceAndRules,msg structure.ResultMsg)[]*FaceAndRules{
+	if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]structure.FaceResult)) > 0 {
+		for _, faceResult := range msg.RuleResult["face"].([]structure.FaceResult) {
 			faces = hebingFace(faces, faceResult)
 		}
 		return faces
@@ -281,7 +282,7 @@
 		return nil
 	}
 }
-func hebingFace(faces []*FaceAndRules, faceResult ruleserver.FaceResult) []*FaceAndRules{
+func hebingFace(faces []*FaceAndRules, faceResult structure.FaceResult) []*FaceAndRules{
 	for _, arg := range faceResult.Args {
 		// 鎷垮埌姣忎竴寮犱汉鑴�
 		logger.Info("褰掔疆浜鸿劯鏃剁浉浼艰�呯殑鏁伴噺锛�",len(arg.Liker))
@@ -309,18 +310,18 @@
 			}
 		}
 		if !flag {
-			faces = append(faces, &FaceAndRules{arg, []ruleserver.Result{faceResult.Result}})
+			faces = append(faces, &FaceAndRules{arg, []structure.Result{faceResult.Result}})
 		}
 	}
 	return faces
 }
 
 // 寰�es涓彃鍏olo鏁版嵁
-func InsertYolo(msg ruleserver.ResultMsg, linkId string) {
-	if msg.RuleResult["yolo"] != nil && len(msg.RuleResult["yolo"].([]ruleserver.Result)) > 0 {
+func InsertYolo(msg structure.ResultMsg, linkId string) {
+	if msg.RuleResult["yolo"] != nil && len(msg.RuleResult["yolo"].([]structure.Result)) > 0 {
 		// 鍏堝垽鏂竴涓嬫暟鎹甫鐨勮鍒欐爣绛炬槸鍚︽湁鍙互鎻掑叆鐨�
 		flag := false
-		for _, res := range msg.RuleResult["yolo"].([]ruleserver.Result) {
+		for _, res := range msg.RuleResult["yolo"].([]structure.Result) {
 			//logger.Info("瀹氭椂鍣ㄦ墦鐨勬暟瀛楁爣绛撅細",res.Others.TimeLabel)
 			if res.Others.TimeLabel == "01" || res.Others.TimeLabel == "10" {
 				flag = true
@@ -331,7 +332,7 @@
 			var sdkNames string = ""
 			alarmRules := []AlarmRule{}
 			url := []string{}
-			for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
+			for _, yoloResult := range msg.RuleResult["yolo"].([]structure.Result) {
 				if yoloResult.Others.TimeLabel == "01" || yoloResult.Others.TimeLabel == "10" {
 					// 鎷煎嚭sdkname
 					//logger.Info("搴旇杩涙潵鎵嶅鐨�")
@@ -351,7 +352,7 @@
 							}
 							i := protomsg.Image{}
 							err = proto.Unmarshal(bdata, &i)
-							resp1, err1 := util.DrawPolygonOnImage(msg1.Cid, i, msg1.RuleResult["yolo"].([]ruleserver.Result), weedfsUrl)
+							resp1, err1 := util.DrawPolygonOnImage(msg1.Cid, i, msg1.RuleResult["yolo"].([]structure.Result), weedfsUrl)
 							if err1 != nil {
 								logger.Error("缂撳瓨鏁版嵁鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
 							} else {
@@ -363,7 +364,7 @@
 				}
 			}
 			linkFlag := false
-			for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
+			for _, yoloResult := range msg.RuleResult["yolo"].([]structure.Result) {
 				if (yoloResult.Others.TimeLabel == "01" || yoloResult.Others.TimeLabel == "10") && yoloResult.Others.LinkCache != nil && len(yoloResult.Others.LinkCache) > 1 {
 					linkId := uuid.NewV4().String()
 					for _, msg2 := range yoloResult.Others.LinkCache {
@@ -392,7 +393,7 @@
 			if len(alarmRules) > 0 {
 				isAlarm = 1
 				//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
-				resp, err = util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result), weedfsUrl)
+				resp, err = util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]structure.Result), weedfsUrl)
 				if err != nil {
 					logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
 				} else {
@@ -467,7 +468,7 @@
 		}
 	}
 }
-func ChangeStatusYolo(msg ruleserver.ResultMsg) {
+func ChangeStatusYolo(msg structure.ResultMsg) {
 	logger.Info("寰�ES鎻抷olo闈炴姤璀︾姸鎬佹敼鍙樻暟鎹�")
 	var sdkNames string = ""
 	alarmRules := []AlarmRule{}
@@ -478,7 +479,7 @@
 	i := protomsg.Image{}
 	err = proto.Unmarshal(bdata, &i)
 	//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
-	resp, err := util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result), weedfsUrl)
+	resp, err := util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]structure.Result), weedfsUrl)
 	if err != nil {
 		logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
 	} else {
@@ -538,7 +539,7 @@
 		//os.Exit(1)
 	}
 }
-func ChangeStatusFace(msg ruleserver.ResultMsg) {
+func ChangeStatusFace(msg structure.ResultMsg) {
 	logger.Info("寰�ES鎻掑叆浜鸿劯闈炴姤璀︿絾鏄姸鎬佽浆鎹㈡暟鎹�")
 	// 涓婁紶澶у浘
 	// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
@@ -595,7 +596,7 @@
 		0,
 		0,
 		0,
-		[]*ruleserver.BaseInfo{},
+		[]*structure.BaseInfo{},
 	}
 	requstbody, err := json.Marshal(pervideo)
 
diff --git a/labelFilter/readyDataForLabel.go b/labelFilter/readyDataForLabel.go
index 2650c4e..ff4fef3 100644
--- a/labelFilter/readyDataForLabel.go
+++ b/labelFilter/readyDataForLabel.go
@@ -3,7 +3,7 @@
 import (
 	"ruleprocess/cache"
 	"ruleprocess/logger"
-	"ruleprocess/ruleserver"
+	"ruleprocess/structure"
 	"time"
 )
 
@@ -13,14 +13,14 @@
 	CameraAddr    string
 	TaskId        string
 	Time		  string
-	Persons       []ruleserver.FaceResult
+	Persons       []structure.FaceResult
 	DefenceLevel  []int32
 }
 // 鎶婃暟鎹閰嶅埌label
-func (label *Label)DataFormatToLabel(result ruleserver.ResultMsg) {
-	logger.Debug("face缁撴灉锛�",result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]ruleserver.FaceResult)) > 0)
-	logger.Debug("yolo缁撴灉锛�",result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]ruleserver.Result)) > 0)
-	if (result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]ruleserver.FaceResult)) > 0) || (result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]ruleserver.Result)) > 0) {
+func (label *Label)DataFormatToLabel(result structure.ResultMsg) {
+	logger.Debug("face缁撴灉锛�",result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.FaceResult)) > 0)
+	logger.Debug("yolo缁撴灉锛�",result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]structure.Result)) > 0)
+	if (result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.FaceResult)) > 0) || (result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]structure.Result)) > 0) {
 		logger.Info("---------------鏍囩杩囨护鍣ㄨ祴鍊�")
 		label.CameraId = result.Cid
 		camera, err := cache.GetCameraById(result.Cid)
@@ -31,14 +31,14 @@
 		label.CameraAddr = camera.Addr
 		label.TaskId = result.Tasklab.Taskid
 		label.Time = time.Now().Format("2006-01-02 15:04:05")
-		if result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]ruleserver.FaceResult)) > 0 {
-			for _,faceGroup := range result.RuleResult["face"].([]ruleserver.FaceResult) {
+		if result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.FaceResult)) > 0 {
+			for _,faceGroup := range result.RuleResult["face"].([]structure.FaceResult) {
 				label.Persons = append(label.Persons,faceGroup)
 				label.DefenceLevel = append(label.DefenceLevel,faceGroup.AlarmLevel)
 			}
 		}
-		if result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]ruleserver.Result)) > 0 {
-			for _,yoloGroup := range result.RuleResult["yolo"].([]ruleserver.Result) {
+		if result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]structure.Result)) > 0 {
+			for _,yoloGroup := range result.RuleResult["yolo"].([]structure.Result) {
 				label.DefenceLevel = append(label.DefenceLevel,yoloGroup.AlarmLevel)
 			}
 		}
diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go
index df28b40..e2ad4ec 100644
--- a/labelFilter/ruleForLabel.go
+++ b/labelFilter/ruleForLabel.go
@@ -5,12 +5,12 @@
 	"basic.com/pubsub/protomsg.git"
 	"github.com/knetic/govaluate"
 	"ruleprocess/logger"
-	"ruleprocess/ruleserver"
+	"ruleprocess/structure"
 	"strconv"
 	"time"
 )
 
-func Judge(msg ruleserver.ResultMsg) {
+func Judge(msg structure.ResultMsg) {
 	// 瑁呴厤鎴愯嚜宸卞彲浠ヨ瘑鍒殑鏁版嵁
 	label := new(Label)
 	label.DataFormatToLabel(msg)
@@ -311,7 +311,7 @@
 }
 
 // 璋冪敤鐩爣鏈嶅姟鍣ㄧ殑鎻掑叆鎺ュ彛
-func pushData(urls []*protomsg.PushUrl, data ruleserver.ResultMsg) {
+func pushData(urls []*protomsg.PushUrl, data structure.ResultMsg) {
 	for _, url := range urls {
 		logger.Debug("鐪嬬湅鎺ㄩ�佸湴鍧�锛�",url.Url)
 		Push("tcp://192.168.1.123:40012", data)
diff --git a/ruleserver/geoPolygon.go b/ruleserver/geoPolygon.go
index f55719c..bfe8efe 100644
--- a/ruleserver/geoPolygon.go
+++ b/ruleserver/geoPolygon.go
@@ -2,6 +2,7 @@
 
 import (
 	"math"
+	"ruleprocess/structure"
 )
 
 func min(num1 float64, num2 float64) float64 {
@@ -19,30 +20,10 @@
 	return num1
 }
 
-//Point 鍧愭爣鐐�
-type Point struct {
-	X float64 `json:"x"`
-	Y float64 `json:"y"`
-}
-
-//Rect 妫�娴嬬洰鏍�
-type Rect struct {
-	X      float64
-	Y      float64
-	Width  float64
-	Height float64
-}
-
-//Pointfloat 鍧愭爣鐐�
-type Pointfloat struct {
-	X float64 `json:"x"`
-	Y float64 `json:"y"`
-}
-
 //PintIsInPolygon 鍒ゆ柇鐐规槸鍚﹀湪澶氳竟褰㈠唴閮�
 //point涓鸿鍒ゆ柇鐨勫潗鏍囩偣
 //polygon鏄杈瑰舰鍚勭偣鏁扮粍
-func pintIsInPolygon(point Pointfloat, polygon []Point, widthScale float64, heightScale float64) bool {
+func pintIsInPolygon(point structure.Pointfloat, polygon []structure.Point, widthScale float64, heightScale float64) bool {
 	var nCross int = 0
 	for i := 0; i < len(polygon); i++ {
 
@@ -72,17 +53,17 @@
 }
 
 //GetLocation 灏嗕竴涓粰瀹氳捣濮嬪潗鏍囷紝瀹藉害闀垮害鐨勭煩褰㈠尯鍩熷潎鍒嗕负n鏂逛唤骞惰繑鍥炰腑蹇冨潗鏍囷紙n涓哄崟杈瑰钩鍒嗘暟鍊硷級鍜岄潰绉�
-func getLocation(rect Rect, n int) ([]Pointfloat, float64) {
+func getLocation(rect structure.Rect, n int) ([]structure.Pointfloat, float64) {
 	xArr := make([]float64, n) // 鐢ㄥ垏鐗囦笉鐢ㄦ暟缁勶紝鏁扮粍涓嶈兘鐢ㄥ彉閲忓畾涔夐暱搴�
 	yArr := make([]float64, n)
-	pointArr := make([]Pointfloat, 0, n*n)
+	pointArr := make([]structure.Pointfloat, 0, n*n)
 	for i := 0; i < n; i++ {
 		xArr[i] = rect.X + (rect.Width/float64(2*n))*float64(2*i+1)
 		yArr[i] = rect.Y + (rect.Height/float64(2*n))*float64(2*i+1)
 	}
 	for i := 0; i < n; i++ {
 		for j := 0; j < n; j++ {
-			point := Pointfloat{X: xArr[i], Y: yArr[j]}
+			point := structure.Pointfloat{X: xArr[i], Y: yArr[j]}
 			pointArr = append(pointArr, point)
 		}
 	}
@@ -91,7 +72,7 @@
 }
 
 //ComputePolygonArea 璁＄畻浠绘剰澶氳竟褰㈤潰绉�
-func computePolygonArea(polygon []Point) float64 {
+func computePolygonArea(polygon []structure.Point) float64 {
 	pointNum := len(polygon)
 	var s float64 = 0
 	if pointNum < 3 {
@@ -105,7 +86,7 @@
 }
 
 //PgsInterPercent calculate percent of two polygon intersection  璁＄畻涓や釜澶氳竟褰㈢殑閲嶅彔鍗犳瘮
-func PgsInterPercent(pgpts []Point, box Rect, widthScale float64, heightScale float64) (percent float64) {
+func PgsInterPercent(pgpts []structure.Point, box structure.Rect, widthScale float64, heightScale float64) (percent float64) {
 
 	areapts, areaBox := getLocation(box, 10)
 	var count = 0
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index 0cb12da..476271a 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -4,6 +4,7 @@
 	"basic.com/pubsub/protomsg.git"
 	"github.com/golang/protobuf/proto"
 	"ruleprocess/logger"
+	"ruleprocess/structure"
 )
 
 var TrackPond = make(map[string]*PersonTrack)
@@ -104,8 +105,8 @@
 	return false
 }
 func TrackOrNot(label map[string]interface{}) bool{
-	if label["yolo"] != nil && len(label["yolo"].([]Result)) > 0 {
-		for _,res := range label["yolo"].([]Result) {
+	if label["yolo"] != nil && len(label["yolo"].([]structure.Result)) > 0 {
+		for _,res := range label["yolo"].([]structure.Result) {
 			if res.TimeLabel == "10" {
 				return true
 			}
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index ba290b0..3e4b712 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -16,6 +16,7 @@
 	"ruleprocess/cache"
 	"ruleprocess/logger"
 	"github.com/golang/protobuf/proto"
+	"ruleprocess/structure"
 	"strconv"
 	"time"
 )
@@ -56,20 +57,6 @@
 	}
 }
 
-type BaseInfo struct {
-	TableId      string  `json:"tableId"`
-	TableName    string  `json:"tableName"`
-	BwType       string  `json:"bwType"`
-	CompareScore float64 `json:"compareScore"`
-	PersonId     string  `json:"personId"`
-	PersonName   string  `json:"personName"`
-	PersonPicUrl string  `json:"personPicUrl"`
-	PhoneNum     string  `json:"phoneNum"`
-	Sex          string  `json:"sex"`
-	IdCard       string  `json:"idCard"`
-	MonitorLevel string  `json:"monitorLevel"`
-	Content      string  `json:"content"`
-}
 
 // 浠ユ憚鍍忔満id鏌ュ嚭璺熷叾鐩稿叧鐨勬墍鏈変换鍔′笅鐨勬墍鏈夎鍒欑粍
 func GetRuleGroup(cameraId string, taskId string) *protomsg.TaskGroupArgs {
@@ -110,9 +97,9 @@
 	return value2
 }
 // 鍙栧嚭鏌愪釜鏃堕棿瑙勫垯鐨勭鍑犲ぉ鐨勮鍒欐闆嗗悎
-func GetTimeById(id string, index int) []TimeRange {
+func GetTimeById(id string, index int) []structure.TimeRange {
 	_, cameraTimeRule := cache.GetTimeRuleById(id)
-	var timeRangeList []Day
+	var timeRangeList []structure.Day
 	err := json.Unmarshal([]byte(cameraTimeRule.TimeRule), &timeRangeList)
 	if err != nil {
 		logger.Error("鍙栨椂闂磋鍒欐椂鍙嶅簭鍒楀寲閿欒锛�")
@@ -137,24 +124,17 @@
 	return 0
 }
 
-type TimeRange struct {
-	Start string `json:"start"`
-	End   string `json:"end"`
-}
-type Day struct {
-	Day       int         `json:"day"`        // 鏍囩ず褰撳墠鏄熸湡鍑�
-	TimeRange []TimeRange `json:"time_range"` // 褰撳ぉ鐨勫嚑涓椂闂存
-}
+
 
 // 灏嗗瓧绗︿覆鏍煎紡鐨勫潗鏍囧簭鍒楀寲涓篜oint鏍煎紡
-func Json2points(areaPoints string) []Point {
-	var pts []Point
+func Json2points(areaPoints string) []structure.Point {
+	var pts []structure.Point
 	if areaPoints == "[]" || areaPoints == "" {
 		logger.Error("=====================姝ゅ尯鍩熶负鍏ㄩ儴鍖哄煙")
-		pts = append(pts, Point{0, 0})
-		pts = append(pts, Point{0, 540})
-		pts = append(pts, Point{960, 540})
-		pts = append(pts, Point{960, 0})
+		pts = append(pts, structure.Point{0, 0})
+		pts = append(pts, structure.Point{0, 540})
+		pts = append(pts, structure.Point{960, 540})
+		pts = append(pts, structure.Point{960, 0})
 	} else {
 		err := json.Unmarshal([]byte(areaPoints), &pts)
 		if err != nil {
@@ -166,7 +146,7 @@
 }
 
 // 缁欑洰鏍囧～鍏卨iker
-func (arg *Arg) FillLiker(tableId []string, compareThreshold float32) {
+func FillLiker(arg *structure.Arg,tableId []string, compareThreshold float32) {
 	//bytes := bigCache.GetComparePersonBaseInfo(tableId, arg.Feature, compareThreshold)
 	comArg := &protomsg.CompareArgs{
 		TableIds:tableId,
@@ -204,7 +184,7 @@
 				logger.Error("鏍规嵁id鏌ヨ搴曞簱淇℃伅鍑洪敊锛�", err, "--杩斿洖鍊奸暱搴︿负锛�", len(table))
 			}
 			logger.Debug("鐪嬬湅杩欎釜base鐨勫姣斿�兼槸澶氬皯锛�", Decimal(m[baseinfo.Id].CompareScore))
-			base := BaseInfo{TableId: baseinfo.TableId, TableName: table[0].TableName, BwType: table[0].BwType, CompareScore: Decimal(m[baseinfo.Id].CompareScore), PersonId: baseinfo.Id, PersonName: baseinfo.PersonName, PersonPicUrl: baseinfo.PersonPicUrl, PhoneNum: baseinfo.PhoneNum, Sex: baseinfo.Sex, IdCard: baseinfo.IdCard, MonitorLevel: baseinfo.MonitorLevel, Content: baseinfo.Reserved}
+			base := structure.BaseInfo{TableId: baseinfo.TableId, TableName: table[0].TableName, BwType: table[0].BwType, CompareScore: Decimal(m[baseinfo.Id].CompareScore), PersonId: baseinfo.Id, PersonName: baseinfo.PersonName, PersonPicUrl: baseinfo.PersonPicUrl, PhoneNum: baseinfo.PhoneNum, Sex: baseinfo.Sex, IdCard: baseinfo.IdCard, MonitorLevel: baseinfo.MonitorLevel, Content: baseinfo.Reserved}
 			//os.Exit(1)
 			arg.Liker = append(arg.Liker, &base)
 		}
@@ -213,7 +193,7 @@
 }
 
 // 浜鸿劯姣斿
-func Compare(args *SdkDatas, groupRule *protomsg.GroupRule) {
+func Compare(args *structure.SdkDatas, groupRule *protomsg.GroupRule) {
 	compareFlag := 0
 	var tableIds []string
 	var threshold float32 = 50 // 榛樿闃堝�间负50
@@ -255,18 +235,18 @@
 							for _, arg := range areaMap.Args {
 								arg.Liker = arg.Liker[0:0]
 								logger.Info("娓呯┖涔嬪悗鐪嬬湅涔嬪墠鎵撶殑浜鸿劯鏍囩鍙樹簡娌★細")
-								if args.RuleResult["face"] != nil && len(args.RuleResult["face"].([]FaceResult)) > 0 {
-									for _, faceResult := range args.RuleResult["face"].([]FaceResult) {
+								if args.RuleResult["face"] != nil && len(args.RuleResult["face"].([]structure.FaceResult)) > 0 {
+									for _, faceResult := range args.RuleResult["face"].([]structure.FaceResult) {
 										for _,arg := range faceResult.Args {
 											logger.Info("浜哄憳鍒嗗�兼槸锛�",arg.Score,"liker鐨勬暟閲忎负",arg.Liker)
 										}
 									}
 								}
 								if compareFlag == 1 {
-									arg.FillLiker(nil, threshold)
+									FillLiker(arg,nil, threshold)
 								}
 								if compareFlag == 2 {
-									arg.FillLiker(tableIds, threshold)
+									FillLiker(arg,tableIds, threshold)
 								}
 								//logger.Info("-------------------鎴愬姛缁檒iker璧嬪��,闀垮害涓猴細", len(arg.Liker))
 							}
@@ -283,7 +263,7 @@
 }
 
 // 璁＄畻鍖哄煙鍐呯殑鐩爣鏁伴噺浠ュ強灏嗙浉浼煎害銆佸崰姣斻�佸昂瀵哥瓑鎵撳寘
-func (a *AreaMap) CountAreaObjs(arg *SdkData) {
+func CountAreaObjs(a *structure.AreaMap,arg *structure.SdkData) {
 
 	a.TargetNum = 0
 	threshold := 0.0       // 鐩镐技搴�
@@ -298,7 +278,7 @@
 		if threshold <= obj.Score && size <= float64(obj.Rects.Width*obj.Rects.Height) && intersectionper <= PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale) {
 			// 杩欐瑕佸榻愯〃杈惧紡閲屾墍闇�瑕佺殑鎵�鏈夊弬鏁�
 			a.TargetNum++
-			arg1 := Arg{obj.Id,obj.Score, PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale), float64(obj.Rects.Width * obj.Rects.Height), obj.IsYolo, obj.Rects, obj.Feature, obj.ThftRes, []*BaseInfo{}}
+			arg1 := structure.Arg{obj.Id,obj.Score, PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale), float64(obj.Rects.Width * obj.Rects.Height), obj.IsYolo, obj.Rects, obj.Feature, obj.ThftRes, []*BaseInfo{}}
 			//logger.Println("鏀捐繘鍘荤殑arg锛�-------", arg1)
 			a.Args = append(a.Args, &arg1)
 			a.FilterData = append(a.FilterData, &arg1)
@@ -312,16 +292,16 @@
 }
 
 // 鎶妔dk浠庢暟鎹抚涓婃彁鍙栫殑鎸夌収鍖哄煙鍒嗙被褰掔疆
-func SdkDataFormat(cameraId string, arg *SdkData, cameraPolygons []protomsg.CameraPolygon) {
+func SdkDataFormat(cameraId string, arg *structure.SdkData, cameraPolygons []protomsg.CameraPolygon) {
 	logger.Info("==================================鏈瑂dkData涓В鍑烘潵鐨勭洰鏍囨暟鎹�=======================================")
 	for _, photo := range arg.Photo {
 		logger.Info("--------瑙ｆ瀽鍑烘潵鐨勬暟鎹�---", cameraId, arg.IpcId, photo.Rects, photo.Score)
 	}
 	for _, polygon := range cameraPolygons {
 		//logger.Println("++++++鍦ㄨ繖鍎跨湅涓�涓嬪尯鍩熷晩:", polygon.Polygon)
-		areaMap := AreaMap{CameraId: cameraId, AreaId: polygon.Id, AreaJson: polygon.Polygon, TriggerLine: polygon.TriggerLine, DirectionLine: polygon.DirectionLine}
+		areaMap := structure.AreaMap{CameraId: cameraId, AreaId: polygon.Id, AreaJson: polygon.Polygon, TriggerLine: polygon.TriggerLine, DirectionLine: polygon.DirectionLine}
 		// 涓烘瘡涓憚鍍忔満鍖哄煙濉厖鏁版嵁
-		areaMap.CountAreaObjs(arg)
+		CountAreaObjs(&areaMap,arg)
 		arg.AreaMapList = append(arg.AreaMapList, &areaMap)
 	}
 }
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index c30b80b..97bd829 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -3,6 +3,7 @@
 import (
 	"ruleprocess/cache"
 	"ruleprocess/logger"
+	"ruleprocess/structure"
 	"sort"
 	"strconv"
 	"strings"
@@ -12,107 +13,8 @@
 	"github.com/knetic/govaluate"
 )
 
-// 姣忎釜鐩爣鐨勫弬鏁帮細鐩镐技搴︼紝鍗犳瘮锛屽昂瀵�
-type Arg struct {
-	Id         uint64
-	Score      float64 // 鍖哄煙鍐呯殑鐩爣鐨勭浉浼煎害
-	Proportion float64 // 鍖哄煙鍐呯殑鐩爣鐨勫崰姣�
-	Size       float64 // 鍖哄煙鍐呯殑鐩爣鐨勫昂瀵�
-	IsYolo     bool    // 鏄惁鏄痽olo鏁版嵁
-	Location   Rect    // 璁颁笅姣忎釜鐩爣鐨勪綅缃弬鏁帮紝鏈�鍚庣粰缁撴灉瑁呴厤浜鸿劯鏁版嵁鐨勬椂鍊欑敤鐨勫埌
-	Feature    []byte
-	ThftRes    protomsg.ThftResult
-	Liker      []*BaseInfo
-}
-
-// 姣忎釜鍖哄煙鍐呯殑鍥剧墖鏁版嵁闆嗗悎
-type AreaMap struct {
-	CameraId      string
-	AreaId        string
-	GroupId       string
-	TaskId        string
-	SdkId         string
-	SdkName       string
-	AreaJson      string
-	TriggerLine   string
-	DirectionLine string
-	TargetNum     int    // 鍖哄煙鍐呯洰鏍囨暟閲�
-	Args          []*Arg // 鍖哄煙鍐呯洰鏍囬泦鍚�
-	FilterData    []*Arg // 杩囨护鍚庡尯鍩熷唴鐩爣闆嗗悎
-	Time          string // 褰撳墠鏃堕棿锛堢敤浠ュ尮閰嶆椂闂磋鍒欙級
-	IsEffective   bool   // 瑙勫垯涓槸鍚︾敤鍒颁簡姝ゅ尯鍩�
-	KeepRight     bool   // 鏄惁闈犲彸琛�
-	IsStatic      bool   // 鏄惁闈欐
-}
-
-// sdk杈撳嚭鐨勫浘鐗囦笂鍗曚釜鐩爣鐨勬暟鎹�
-type PhotoMap struct {
-	Id      uint64
-	Rects   Rect    // 鐭╁舰鍖哄煙鍙傛暟
-	Score   float64 // 鐩镐技搴﹀緱鍒嗭紙鏈夊澶х▼搴﹀儚涓�涓洰鏍囥�備汉鑴革紝浜轰綋鎴栬溅绛夌瓑锛�
-	IsYolo  bool    // 鏄惁鏄痽olo鏁版嵁
-	ThftRes protomsg.ThftResult
-	Feature []byte
-}
-
-// 姣忎釜绠楁硶瀵逛簬褰撳墠甯х敾闈㈣嚜宸辨彁鍙栫殑鏁版嵁
-type SdkData struct {
-	TaskId      string
-	IpcId       string
-	IsYolo      bool
-	Photo       []PhotoMap // yolo绠楁硶缁撴瀯锛屼篃鍙互瀛樹汉鑴哥殑鏁版嵁锛屾瘯绔熶汉鑴镐腑鑳界敤瑙勫垯鏉ユ祴鐨勮繕鏄偅浜涘弬鏁�
-	KeepRight   bool       // 鏄惁闈犲彸琛� 绠楁硶鍒ゆ柇鐨勪笌涓婁竴甯у浘鍍忕殑姣旇緝缁撴灉
-	IsStatic    bool       // 鏄惁闈欐
-	ImageWidth  int        // 鎽勫儚鏈烘媿鎽勭殑鍥惧儚瀹� 鍍忕礌
-	ImageHeight int        // 鎽勫儚鏈烘媿鎽勭殑鍥惧儚楂� 鍍忕礌
-	AreaMapList []*AreaMap // 鏈瑂dk鎻愬彇鐨勬暟鎹寜鐓у尯鍩熷垝鍒嗗悗鐨勬暟鎹泦鍚�
-}
-
-// 浠庣畻娉曟ā鍧楀効鎷挎潵鐨勫涓�甯у浘鍍忓悇涓畻娉曟彁鍙栫殑鏁版嵁闆嗗悎
-type SdkDatas struct {
-	CameraId   string
-	TaskId     string
-	Sdkdata    []*SdkData
-	RuleResult map[string]interface{} // 杩囧畬瑙勫垯鍚庢墦鐨勬爣绛� face: []FaceResult, yolo: []Result
-}
-
-type ResultMsg struct {
-	*protomsg.SdkMessage
-	RuleResult map[string]interface{} // 杩囧畬瑙勫垯鍚庢墦鐨勬爣绛� face: []FaceResult, yolo: []Result
-}
-
-// 杩囪鍒欏簱鎵撲笂鐨勬爣绛�
-type Result struct {
-	TaskId       string // 浠诲姟id
-	SdkName      string
-	RuleGroupId  string // 瑙勫垯缁刬d
-	DefenceState bool   // 鏄惁甯冮槻
-	AlarmLevel   int32  // 鎶ヨ绛夌骇
-	RuleText     string // 鏂囧瓧鐗堣鍒欑粍
-	Location     []Rect // 鐩爣鐨勫潗鏍�
-	AlarmPolygon string // 瑙﹀彂鐨勬姤璀︽
-	IsLink       bool   // 鏄惁鏄仈鍔ㄤ换鍔�
-	Others
-}
-type Others struct {
-	CacheData []ResultMsg //(鏈粍瑙勫垯涓惈鏈夋寔缁椂闂寸殑瑙勫垯寮�鍚殑瀹氭椂鍣ㄧ紦瀛樼殑鏁版嵁甯�)
-	LinkCache []ResultMsg
-	TimeLabel string
-}
-
-// 杩囪鍒欏簱鎵撲笂鐨勬爣绛�
-type FaceResult struct {
-	Result
-	Args []Arg
-}
-type LittleRuleResult struct {
-	SdkName string // 璁板綍涓嬫缁撴灉鏄摢涓猻dk鐨勭粨鏋�
-	Result  string // 宸插寘鍚簡鍓嶇疆杩炴帴绗�
-	Sort    int32
-}
-
 // 瀵瑰崟甯у浘鍍忕殑鍒ゆ柇 thisSdkDatas  褰撳墠浼犲叆鐨勮繖甯ф暟鎹紝cacheSdkData 瀹氭椂鍣ㄩ噷缂撳瓨鐨勪竴甯ф暟鎹� 娌℃湁灏辫繑鍥瀗il  (thisSdkDatas SdkDatas, cacheSdkDatas SdkDatas)
-func Judge(args *SdkDatas, message *protomsg.SdkMessage) {
+func Judge(args *structure.SdkDatas, message *protomsg.SdkMessage) {
 	if len(args.Sdkdata) > 0 {
 		// 鎷垮埌鏈憚鍍忔満鐨勫尯鍩�
 		cameraPolygons := GetPolygons(args.CameraId)
@@ -126,8 +28,8 @@
 		//logger.Println("鐪嬩笅鎽勫儚鏈轰笅鐨勪换鍔＄粍锛�",taskRuleList)
 		// 寰楀埌灞炰簬璇ユ憚鍍忔満鐨勮嫢骞茬粍浠诲姟鐨勫畬鏁磋鍒欙紙璺熸瘡涓�鏉″畬鏁磋鍒欐瘮杈冧箣鍚庡緱鍑烘湰寮犲浘鍍忓浜庢煇涓鍒欐槸鍚︽姤璀︾殑缁撴灉銆傛斁杩沵ap锛屾瘮濡傛湰甯у浘鍍忕殑id锛屾墍纰版挒鎴愬姛鐨勮鍒檌d锛�
 		args.RuleResult = make(map[string]interface{})
-		args.RuleResult["yolo"] = []Result{}
-		args.RuleResult["face"] = []FaceResult{}
+		args.RuleResult["yolo"] = []structure.Result{}
+		args.RuleResult["face"] = []structure.FaceResult{}
 		//logger.Warn("浼犺繘鍘讳箣鍓嶆槸浠�涔堝痉琛岋細",args.RuleResult["yolo"])
 		if taskGroup != nil && len(taskGroup.GroupRules) > 0 {
 			// 鍏堣繃鐙珛锛屽啀杩囪仈鍔�
@@ -136,7 +38,7 @@
 				taskId := taskGroup.TaskId
 				//logger.Println("------------鏈粍浠诲姟涓嬬殑瑙勫垯缁勭殑鏁伴噺锛�",len(ruleList))
 				temp := group.Rules // temp涓轰竴缁勫畬鏁磋鍒� 鍦ㄦ闇�瑕佸垽鏂鍒欐槸鍚︽槸鑱斿姩瑙勫垯
-				label := Others{}
+				label := structure.Others{}
 				if len(temp) > 0 {
 					if group.SetType != "linkTask" {
 						// 鐙珛浠诲姟鐨勫鐞�
@@ -149,7 +51,7 @@
 				taskId := taskGroup.TaskId
 				//logger.Println("------------鏈粍浠诲姟涓嬬殑瑙勫垯缁勭殑鏁伴噺锛�",len(ruleList))
 				temp := group.Rules // temp涓轰竴缁勫畬鏁磋鍒� 鍦ㄦ闇�瑕佸垽鏂鍒欐槸鍚︽槸鑱斿姩瑙勫垯
-				label := Others{}
+				label := structure.Others{}
 				if len(temp) > 0 {
 					if group.SetType == "linkTask" {
 						// groupId涓惈鏈塴ink鍒欎负鑱斿姩浠诲姟
@@ -161,7 +63,7 @@
 	}
 }
 
-func RunRule(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage, label Others) bool {
+func RunRule(args *structure.SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage, label structure.Others) bool {
 	defer func() {
 		if err := recover(); err != nil {
 			logger.Error("姣斿瑙勫垯鏈夎", err)
@@ -170,7 +72,7 @@
 	logger.Info("+++++++++++瑙勫垯寮�濮嬭繍琛�+++++++++++++++++褰撳墠澶ц鍒�--锛�", (*groupRule).GroupText)
 	//logger.Warn("浼犺繘鍘讳箣鍚庢槸浠�涔堝痉琛岋細",args.RuleResult["yolo"])
 	Compare(args, groupRule)
-	resultSplice := []*LittleRuleResult{}
+	resultSplice := []*structure.LittleRuleResult{}
 	sdkNames := ""
 	polygonId := ""
 	// 鍏堣繃瀹屾潯浠惰鍒�
@@ -320,7 +222,7 @@
 				// 鎵撲汉鑴告爣绛惧拰yolo鏍囩
 				// 鏈�鍚庢垚鍔熸姤璀︽墠鎶婄鍚堟潯浠剁殑浜鸿劯鏁版嵁濉炶繘缁撴灉鏍囩閲�
 				// 閰嶄簡浜鸿劯鐨勭畻娉曟墠鎶婁汉鑴哥殑鏁版嵁鐢╁嚭鏉ユ墦鏍囩
-				faces := []Arg{}
+				faces := []structure.Arg{}
 				faceFlag := false
 				for j := 0; j < len(groupRule.Rules); j++ {
 					if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a97e" || groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" {
@@ -341,7 +243,7 @@
 				//}
 				logger.Warn("___________________________________________________________________________缁堜簬璧板畬涓囬噷闀垮緛")
 				// 鎶婁粬浠殑浣嶇疆鏁版嵁涔熶紶涓嬪幓
-				locations := []Rect{}
+				locations := []structure.Rect{}
 				for _, sdkData := range args.Sdkdata {
 					if sdkData.IpcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && sdkNames != "" { // 鎶妝olo鏁版嵁鐨勫悇涓洰鏍囩殑鍧愭爣杈撳嚭鏂逛究鍚庨潰鐢绘
 						for _, areaMap := range sdkData.AreaMapList {
@@ -357,11 +259,11 @@
 					islink = false
 				}
 				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,})
 					//logger.Info("-------------------yolo缁撴灉鏍囩闀垮害", len(args.RuleResult["yolo"].([]Result)))
 				}
 				if faceFlag {
-					args.RuleResult["face"] = append(args.RuleResult["face"].([]FaceResult), FaceResult{Result{taskId, sdkNames, groupRule.GroupId, groupRule.DefenceState, groupRule.AlarmLevel, groupRule.GroupText, []Rect{}, polygonId, islink, label,}, faces})
+					args.RuleResult["face"] = append(args.RuleResult["face"].([]structure.FaceResult), structure.FaceResult{structure.Result{taskId, sdkNames, groupRule.GroupId, groupRule.DefenceState, groupRule.AlarmLevel, groupRule.GroupText, []structure.Rect{}, polygonId, islink, label,}, faces})
 					//logger.Info("-------------------face缁撴灉鏍囩", len(args.RuleResult["face"].([]FaceResult)))
 				}
 				return true
@@ -380,8 +282,8 @@
 	}
 }
 
-func putFaceToResult(am *AreaMap, faceList []Arg) []Arg {
-	faces := []Arg{}
+func putFaceToResult(am *structure.AreaMap, faceList []structure.Arg) []structure.Arg {
+	faces := []structure.Arg{}
 	if len(am.FilterData) > 0 {
 		for _, data := range am.FilterData {
 			flag := true
@@ -399,8 +301,8 @@
 	return faces
 }
 
-func putYolosToResult(am *AreaMap) []Rect {
-	locations := []Rect{}
+func putYolosToResult(am *structure.AreaMap) []structure.Rect {
+	locations := []structure.Rect{}
 	if len(am.FilterData) > 0 {
 		for _, data := range am.FilterData {
 			locations = append(locations, data.Location)
@@ -411,7 +313,7 @@
 }
 
 // 鑱斿姩浠诲姟鐨勫鐞�
-func LinkTask(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage, label Others) {
+func LinkTask(args *structure.SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage, label structure.Others) {
 	// new涓�涓畾鏃跺櫒锛屽鏋滀互姝roupId涓烘爣蹇楃殑瀹氭椂鍣ㄤ笉瀛樺湪鐨勮瘽
 	logger.Info("------------------------------------------褰撳墠鏄仈鍔ㄤ换鍔★紝瑙勫垯鏄細", groupRule.GroupText)
 	var flag bool = true
@@ -436,7 +338,7 @@
 				}
 			}
 			if flag1 {
-				TimeEleList[groupRule.GroupId].RuleResults = append(TimeEleList[groupRule.GroupId].RuleResults, &RuleResult{groupRule.Rules[j].CameraId, groupRule.Rules[j].Sort, "", groupRule.Rules[j].RuleWithPre, ResultMsg{}})
+				TimeEleList[groupRule.GroupId].RuleResults = append(TimeEleList[groupRule.GroupId].RuleResults, &RuleResult{groupRule.Rules[j].CameraId, groupRule.Rules[j].Sort, "", groupRule.Rules[j].RuleWithPre, structure.ResultMsg{}})
 			}
 		}
 	}
@@ -452,19 +354,19 @@
 				tempMap := make(map[string]interface{})
 				for k, result := range args.RuleResult {
 					if k == "yolo" {
-						tempMap[k] = []Result{}
-						for _, res := range result.([]Result) {
-							tempMap[k] = append(tempMap[k].([]Result), res)
+						tempMap[k] = []structure.Result{}
+						for _, res := range result.([]structure.Result) {
+							tempMap[k] = append(tempMap[k].([]structure.Result), res)
 						}
 					}
 					if k == "face" {
-						tempMap[k] = []FaceResult{}
-						for _, res := range result.([]FaceResult) {
-							tempMap[k] = append(tempMap[k].([]FaceResult), res)
+						tempMap[k] = []structure.FaceResult{}
+						for _, res := range result.([]structure.FaceResult) {
+							tempMap[k] = append(tempMap[k].([]structure.FaceResult), res)
 						}
 					}
 				}
-				va.CacheData = ResultMsg{message, tempMap}
+				va.CacheData = structure.ResultMsg{message, tempMap}
 				logger.Info("杩欎釜鎽勫儚鏈�--", args.CameraId, "--琚祴浜堜簡result", va.Result)
 			}
 		}
@@ -493,19 +395,19 @@
 					logger.Info("___________________________________________________________________鑱斿姩浠诲姟鎶ヨ")
 					if TimeEleList[groupRule.GroupId] != nil { // 鏋佸伓灏旀湁鎯呭喌浼氱瓑浜巒il锛屼笉鐭ラ亾涓哄暐锛屽仛涓垽鏂互闃插畷鏈�
 						// 鎶婃暟缁勯噷缂撳瓨鐨勬暟鎹彇鍑烘潵涓�璧锋姤璀�
-						label.LinkCache = []ResultMsg{}
+						label.LinkCache = []structure.ResultMsg{}
 						for _, ruleRes := range TimeEleList[groupRule.GroupId].RuleResults {
 							label.LinkCache = append(label.LinkCache, ruleRes.CacheData)
 						}
 						logger.Debug("鑱斿姩浠诲姟缂撳瓨浜嗗嚑涓暟鎹�", len(label.LinkCache))
-						for i := 0; i < len(args.RuleResult["yolo"].([]Result)); i++ {
-							if args.RuleResult["yolo"].([]Result)[i].RuleGroupId == groupRule.GroupId { // 鎶婅仈鍔ㄦ暟鎹拷鍔犱笂
-								args.RuleResult["yolo"].([]Result)[i].Others.LinkCache = label.LinkCache
+						for i := 0; i < len(args.RuleResult["yolo"].([]structure.Result)); i++ {
+							if args.RuleResult["yolo"].([]structure.Result)[i].RuleGroupId == groupRule.GroupId { // 鎶婅仈鍔ㄦ暟鎹拷鍔犱笂
+								args.RuleResult["yolo"].([]structure.Result)[i].Others.LinkCache = label.LinkCache
 							}
 						}
-						for i := 0; i < len(args.RuleResult["face"].([]FaceResult)); i++ {
-							if args.RuleResult["face"].([]FaceResult)[i].RuleGroupId == groupRule.GroupId { // 鎶婅仈鍔ㄦ暟鎹拷鍔犱笂
-								args.RuleResult["face"].([]FaceResult)[i].Others.LinkCache = label.LinkCache
+						for i := 0; i < len(args.RuleResult["face"].([]structure.FaceResult)); i++ {
+							if args.RuleResult["face"].([]structure.FaceResult)[i].RuleGroupId == groupRule.GroupId { // 鎶婅仈鍔ㄦ暟鎹拷鍔犱笂
+								args.RuleResult["face"].([]structure.FaceResult)[i].Others.LinkCache = label.LinkCache
 							}
 						}
 					}
@@ -514,8 +416,8 @@
 		} else {
 			logger.Warn("鏁扮粍涓嶅渾婊′笉鎵撴爣绛�")
 			// 鍊掓槸鎶婃墦鐨勭粍瑙勫垯鏍囩缁欏幓鎺変簡鍟�
-			lens := len(args.RuleResult["yolo"].([]Result)) - 1
-			args.RuleResult["yolo"] = args.RuleResult["yolo"].([]Result)[0:lens]
+			lens := len(args.RuleResult["yolo"].([]structure.Result)) - 1
+			args.RuleResult["yolo"] = args.RuleResult["yolo"].([]structure.Result)[0:lens]
 		}
 	} else { // 娌℃湁鎶ヨ锛�
 		//logger.Info("杩欏抚鍥惧儚鍦ㄤ换鍔′笅鐨勪竴鏁存潯瑙勫垯涓嬶紙鑱斿姩浠诲姟涓嬪氨鏄窡鏈憚鍍忔満鍍忕浉鍏崇殑灏忚鍒欙級鐨勫垽鏂粨鏋滀负false")
@@ -537,7 +439,7 @@
 }
 
 // 杩囨护瑙勫垯鍏堢瓫閫夊嚭绗﹀悎鏉′欢鐨勭洰鏍囨暟閲�
-func filterRule(rule *protomsg.Rule, am *AreaMap) LittleRuleResult {
+func filterRule(rule *protomsg.Rule, am *structure.AreaMap) structure.LittleRuleResult {
 	if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a97e" || rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a972" {
 		// 澶勭悊鐨勬槸浜鸿劯绠楁硶 濡傛灉杩欐潯瑙勫垯閰嶇疆鐨勬槸浜鸿劯绠楁硶锛岃繃婊ゅ畬鏉′欢涔嬪悗鐩存帴寰楀嚭缁撴灉锛屽洜涓鸿偗瀹氭病鏈夋暟閲忔潯浠讹紝鑷繁鎷兼帴
 		//logger.Info("瑙勫垯鐨勭畻娉昳d鍜屽尯鍩熺殑绠楁硶id锛�", rule.SdkId, "===", am.sdkId)
@@ -561,7 +463,7 @@
 					flag = "true"
 				}
 				logger.Info("---------浜鸿劯姣斿绗﹀悎鏉′欢鐨勬暟閲忎负锛�", len(am.FilterData))
-				return LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + flag, rule.Sort}
+				return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + flag, rule.Sort}
 			}
 			if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a97e" { // 浜鸿劯妫�娴�
 				//logger.Debug("褰撳墠灏忚鍒欐槸锛�",rule)
@@ -569,7 +471,7 @@
 					// 濡傛灉鏄笉瑙勭煩鐨勮繛鎺ョ缁熺粺杩斿洖false 瑙勫垯涔熷彧鑳藉垽鏂汉鑴哥殑鐩镐技搴︼紝鎵�浠ヤ笉瀛樺湪鍒殑杩炴帴绗�
 					if rule.SdkArgAlias == "score" || rule.SdkArgAlias == "proportion" || rule.SdkArgAlias == "size" { // 鍒ゆ柇鐨勬槸鐩镐技鍊硷紝鍗犳瘮锛屽昂瀵哥瓑杩囨护鏉′欢锛屽鏋滃啀鏈夛紝杩樺彲浠ュ啀鍔�
 						logger.Info("-----------------------杩囪鍒欎箣鍓嶅尯鍩熷唴鐨勪汉鑴告暟閲忎负锛�", am.TargetNum)
-						var args []*Arg
+						var args []*structure.Arg
 						if rule.RuleWithPre == "&&" {
 							args = am.FilterData
 							//logger.Info("杩囨护鍚庣殑args鐨勯暱搴︿负锛�",len(args))
@@ -602,27 +504,27 @@
 						logger.Info("杩囧畬鏉′欢鍚庣殑鐩爣鏁伴噺涓猴細", am.TargetNum)
 						if am.TargetNum > 0 {
 							logger.Info("锛侊紒锛侊紒锛侊紒锛侊紒锛佷汉鑴告娴嬫垚鍔�")
-							return LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort}
+							return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort}
 						} else {
-							return LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+							return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort}
 						}
 					} else {
-						return LittleRuleResult{}
+						return structure.LittleRuleResult{}
 					}
 				} else {
-					return LittleRuleResult{}
+					return structure.LittleRuleResult{}
 				}
 			} else {
-				return LittleRuleResult{}
+				return structure.LittleRuleResult{}
 			}
 		} else {
-			return LittleRuleResult{}
+			return structure.LittleRuleResult{}
 		}
 	} else {
 		// 澶勭悊鐨勯兘鏄痽olo鏁版嵁
 		if rule.PolygonId == am.AreaId { // 棣栧厛杩欐潯瑙勫垯寰楁槸杩欎釜绠楁硶鐨勮鍒欙紝鍏舵瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
 			if rule.SdkArgAlias == "score" || rule.SdkArgAlias == "proportion" || rule.SdkArgAlias == "size" { // 鍒ゆ柇鐨勬槸鐩镐技鍊硷紝鍗犳瘮锛屽昂瀵哥瓑杩囨护鏉′欢锛屽鏋滃啀鏈夛紝杩樺彲浠ュ啀鍔�
-				var args []*Arg
+				var args []*structure.Arg
 				if rule.RuleWithPre == "&&" {
 					args = am.FilterData
 				} else {
@@ -651,23 +553,23 @@
 				}
 				am.TargetNum = len(am.FilterData) // 鎶婄鍚堟潯浠剁殑鐩爣鏁伴噺鏇存柊鍒皌argetNum瀛楁
 				if am.TargetNum > 0 {
-					return LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort}
+					return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort}
 				} else {
-					return LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+					return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort}
 				}
 
 			} else {
-				return LittleRuleResult{}
+				return structure.LittleRuleResult{}
 			}
 
 		} else {
-			return LittleRuleResult{}
+			return structure.LittleRuleResult{}
 		}
 	}
 }
 
 // 濡傛灉鏈夋寔缁椂闂存潯浠剁淮鎶ゅ紑鍚竴涓畾鏃跺櫒
-func duration(rule *protomsg.Rule, groupId string, am *AreaMap, args *SdkDatas, message *protomsg.SdkMessage) {
+func duration(rule *protomsg.Rule, groupId string, am *structure.AreaMap, args *structure.SdkDatas, message *protomsg.SdkMessage) {
 	if rule.PolygonId == am.AreaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�  閰嶇疆鐨勭畻娉曡瀵圭殑涓�
 		if rule.SdkArgAlias == "duration" { //
 			logger.Info("褰撳墠灏忚鍒欐槸锛�---------", rule)
@@ -682,7 +584,7 @@
 
 			if flag {
 				timeLength, _ := strconv.Atoi(rule.SdkArgValue)
-				timeEle := TimeElement{N: timeLength, InitN: timeLength, AlarmFlag: false, BufferFlag: 10, CacheSdkData: ResultMsg{message, args.RuleResult}} // 鎵旇繘鍘讳竴涓畾鏃跺櫒鍏冪礌锛堝苟缂撳瓨褰撳墠鐢婚潰甯ф暟鎹級
+				timeEle := TimeElement{N: timeLength, InitN: timeLength, AlarmFlag: false, BufferFlag: 10, CacheSdkData: structure.ResultMsg{message, args.RuleResult}} // 鎵旇繘鍘讳竴涓畾鏃跺櫒鍏冪礌锛堝苟缂撳瓨褰撳墠鐢婚潰甯ф暟鎹級
 				//TimeEleList = make(map[string]timeElement)
 				TimeEleList[groupId+"+"+rule.Id] = &timeEle // 瀹氭椂鍣ㄥ厓绱犱互褰撳墠鎸佺画鏃堕棿灏忚鍒檌d涓洪敭
 				logger.Info("鍒涘缓浜嗚鏁板櫒")
@@ -692,13 +594,13 @@
 }
 
 // 缁欐暟鎹簱鐨勮鍒欒〃杈惧紡浠ｅ弬 args: 涓�鏉″瓙瑙勫垯锛屽尯鍩熸暟鎹�
-func transferParameters(rule *protomsg.Rule, am *AreaMap) LittleRuleResult {
+func transferParameters(rule *protomsg.Rule, am *structure.AreaMap) structure.LittleRuleResult {
 	if rule.PolygonId == am.AreaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
 		if rule.SdkArgAlias == "objCount" { // 濡傛灉鍙傛暟鏄鍖哄煙鍐呯洰鏍囨暟閲� 鍗硑olo 浜鸿劯涓嶄細鏈夋暟閲�
 			//logger.Info("褰撳墠灏忚鍒欐槸锛�---------", rule)
 			//logger.Info("寰楀嚭缁撴灉闃舵", "姣旇緝鐨勮鍒欐槸锛�", rule)
 			if rule.Operator == "" {
-				return LittleRuleResult{am.SdkName, strconv.Itoa(am.TargetNum) + "" + rule.RuleWithPre, rule.Sort} // 濡傛灉鍚庨潰涓嶈窡鎿嶄綔绗﹀氨鐩存帴杩斿洖鏁伴噺  姣斿瑕佽窡涓嬩竴涓尯鍩熸瘮杈冩暟閲忕殑灏辩洿鎺ヨ繑鍥炴湰鍖哄煙鐨勬暟閲�
+				return structure.LittleRuleResult{am.SdkName, strconv.Itoa(am.TargetNum) + "" + rule.RuleWithPre, rule.Sort} // 濡傛灉鍚庨潰涓嶈窡鎿嶄綔绗﹀氨鐩存帴杩斿洖鏁伴噺  姣斿瑕佽窡涓嬩竴涓尯鍩熸瘮杈冩暟閲忕殑灏辩洿鎺ヨ繑鍥炴湰鍖哄煙鐨勬暟閲�
 			}
 			//args := am.targetNum     targetNum 宸叉垚鎵�鏈夌洰鏍囩殑鎬绘暟閲忥紝杩欓噷鍙畻yolo鐨�
 			var num int = 0
@@ -710,13 +612,13 @@
 			formula := strconv.Itoa(num) + " " + rule.Operator + " " + rule.SdkArgValue
 			expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
 			result, _ := expression.Evaluate(nil)                      // 寰楀埌鏁板鍏紡鐨勭粨鏋�
-			return LittleRuleResult{am.SdkName, rule.RuleWithPre + " " + strconv.FormatBool(result.(bool)), rule.Sort}
+			return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + " " + strconv.FormatBool(result.(bool)), rule.Sort}
 			// 鍔犱笂鍏充簬绠楁硶鐨勫垽鏂潯浠讹紝涓嶈兘鍙湁鍏充簬瑙勫垯鐨勶紝鏈夌殑绠楁硶鏈韩灏辨槸涓�涓鍒欙紝濡備釜浣撻潤姝紝闈犲彸琛�,鎵�浠ワ紝鎷垮埌褰撳墠瀛愯鍒欑殑sdkid鏉ュ垽鏂槸鍚︽槸閭ｄ簺鐗规畩鐨勮鍒�
 		}
 	}
-	return LittleRuleResult{}
+	return structure.LittleRuleResult{}
 }
-func timeRuleResult(rule *protomsg.Rule, am *AreaMap) LittleRuleResult {
+func timeRuleResult(rule *protomsg.Rule, am *structure.AreaMap) structure.LittleRuleResult {
 	if rule.PolygonId == am.AreaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
 		if rule.SdkArgAlias == "time_rule" { // 鍒ゆ柇鏄惁绗﹀悎鏃堕棿瑙�
 			//logger.Info("----------褰撳墠鏃堕棿瑙勫垯锛�---------", rule)
@@ -745,7 +647,7 @@
 						break
 					}
 				}
-				return LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + flag, rule.Sort}
+				return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + flag, rule.Sort}
 			}
 
 			if rule.Operator == "unsatisfy" || rule.Operator == "!=" { // 涓嶆弧瓒虫墍閫夌殑鏃堕棿瑙勫垯
@@ -765,10 +667,10 @@
 						break
 					}
 				}
-				return LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + flag, rule.Sort}
+				return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + flag, rule.Sort}
 			}
 
 		}
 	}
-	return LittleRuleResult{}
+	return structure.LittleRuleResult{}
 }
diff --git a/ruleserver/timeTicker.go b/ruleserver/timeTicker.go
index 2449663..abe6c4d 100644
--- a/ruleserver/timeTicker.go
+++ b/ruleserver/timeTicker.go
@@ -3,6 +3,7 @@
 import (
 	"fmt"
 	"ruleprocess/logger"
+	"ruleprocess/structure"
 	"strings"
 	"time"
 )
@@ -18,7 +19,7 @@
 	InitN        int       // 璧嬪�煎悗灏变笉鍙樼殑鍒濆鍊�
 	BufferFlag   int       // 缂撳啿瀹归敊浣� 杩炵画n甯alse鎵嶄负false
 	AlarmFlag    bool      // 鎶ヨ鏍囧織浣� 瀹氭椂鍣ㄥ紑鍚悗绗竴娆℃姤璀︽椂浼氳缃负true 寰�鍚庡啀鏉ユ姤璀︿篃涓嶄細鎻掕繘ES
-	CacheSdkData ResultMsg // 瀹氭椂鍣ㄧ殑缂撳瓨鏁版嵁 鎸佺画鏃堕棿绫荤殑寮�鍚畾鏃跺櫒鏃惰缂撳瓨涓�甯�
+	CacheSdkData structure.ResultMsg // 瀹氭椂鍣ㄧ殑缂撳瓨鏁版嵁 鎸佺画鏃堕棿绫荤殑寮�鍚畾鏃跺櫒鏃惰缂撳瓨涓�甯�
 	GroupId      string    // 鑱斿姩瑙勫垯闇�瑕佽褰曚笅姝ゆ椂鐨勮鍒欑粍id
 	RuleResults  []*RuleResult
 }
@@ -28,7 +29,7 @@
 	Sort        int32     // 鎽勫儚鏈哄湪瑙勫垯缁勪腑搴忓彿
 	Result      string    // 鎽勫儚鏈鸿繃婊ゆ暟鎹緱鍑虹殑缁撴灉
 	RuleWithPre string    // 鎽勫儚鏈轰箣闂寸殑杩炴帴绗�
-	CacheData   ResultMsg // 缂撳瓨褰撳墠甯ф暟鎹�
+	CacheData   structure.ResultMsg // 缂撳瓨褰撳墠甯ф暟鎹�
 }
 
 func TimeTicker() {
@@ -69,7 +70,7 @@
 }
 
 // 鍒ゆ柇鏄惁绗﹀悎瀹氭椂鍣ㄦ潯浠�
-func TimerAlarm(oth *Others, groupId string, result bool) (string) {
+func TimerAlarm(oth *structure.Others, groupId string, result bool) (string) {
 	var flagTime string //
 	// 鍒ゆ柇鏈夋棤姝よ鍒欑粍鐨勫畾鏃跺櫒
 	flag := false
@@ -92,7 +93,7 @@
 						logger.Debug("鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��-------------棣栨绗﹀悎鎸佺画鏃堕棿瑙勫垯骞舵姤璀�")
 						flagTime = "10"
 						timeEle.AlarmFlag = true
-						oth.CacheData = []ResultMsg{}
+						oth.CacheData = []structure.ResultMsg{}
 						oth.CacheData = append(oth.CacheData,timeEle.CacheSdkData)
 						oth.TimeLabel = flagTime
 					}
@@ -143,7 +144,7 @@
 func (p SubList) Less(i, j int) bool { return p[i].Sort < p[j].Sort }
 
 // 缁撴瀯浣撴牴鎹煇瀛楁鎺掑簭
-type resultList []*LittleRuleResult
+type resultList []*structure.LittleRuleResult
 
 func (p resultList) Swap(i, j int)      { p[i], p[j] = p[j], p[i] }
 func (p resultList) Len() int           { return len(p) }
diff --git a/structure/gragh.go b/structure/gragh.go
new file mode 100644
index 0000000..f8bfd92
--- /dev/null
+++ b/structure/gragh.go
@@ -0,0 +1,21 @@
+package structure
+
+//Point 鍧愭爣鐐�
+type Point struct {
+	X float64 `json:"x"`
+	Y float64 `json:"y"`
+}
+
+//Rect 妫�娴嬬洰鏍�
+type Rect struct {
+	X      float64
+	Y      float64
+	Width  float64
+	Height float64
+}
+
+//Pointfloat 鍧愭爣鐐�
+type Pointfloat struct {
+	X float64 `json:"x"`
+	Y float64 `json:"y"`
+}
\ No newline at end of file
diff --git a/structure/rule.go b/structure/rule.go
new file mode 100644
index 0000000..e1e3104
--- /dev/null
+++ b/structure/rule.go
@@ -0,0 +1,126 @@
+package structure
+
+import "basic.com/pubsub/protomsg.git"
+
+// 姣忎釜鐩爣鐨勫弬鏁帮細鐩镐技搴︼紝鍗犳瘮锛屽昂瀵�
+type Arg struct {
+	Id         uint64
+	Score      float64 // 鍖哄煙鍐呯殑鐩爣鐨勭浉浼煎害
+	Proportion float64 // 鍖哄煙鍐呯殑鐩爣鐨勫崰姣�
+	Size       float64 // 鍖哄煙鍐呯殑鐩爣鐨勫昂瀵�
+	IsYolo     bool    // 鏄惁鏄痽olo鏁版嵁
+	Location   Rect    // 璁颁笅姣忎釜鐩爣鐨勪綅缃弬鏁帮紝鏈�鍚庣粰缁撴灉瑁呴厤浜鸿劯鏁版嵁鐨勬椂鍊欑敤鐨勫埌
+	Feature    []byte
+	ThftRes    protomsg.ThftResult
+	Liker      []*BaseInfo
+}
+
+// 姣忎釜鍖哄煙鍐呯殑鍥剧墖鏁版嵁闆嗗悎
+type AreaMap struct {
+	CameraId      string
+	AreaId        string
+	GroupId       string
+	TaskId        string
+	SdkId         string
+	SdkName       string
+	AreaJson      string
+	TriggerLine   string
+	DirectionLine string
+	TargetNum     int    // 鍖哄煙鍐呯洰鏍囨暟閲�
+	Args          []*Arg // 鍖哄煙鍐呯洰鏍囬泦鍚�
+	FilterData    []*Arg // 杩囨护鍚庡尯鍩熷唴鐩爣闆嗗悎
+	Time          string // 褰撳墠鏃堕棿锛堢敤浠ュ尮閰嶆椂闂磋鍒欙級
+	IsEffective   bool   // 瑙勫垯涓槸鍚︾敤鍒颁簡姝ゅ尯鍩�
+	KeepRight     bool   // 鏄惁闈犲彸琛�
+	IsStatic      bool   // 鏄惁闈欐
+}
+
+// sdk杈撳嚭鐨勫浘鐗囦笂鍗曚釜鐩爣鐨勬暟鎹�
+type PhotoMap struct {
+	Id      uint64
+	Rects   Rect    // 鐭╁舰鍖哄煙鍙傛暟
+	Score   float64 // 鐩镐技搴﹀緱鍒嗭紙鏈夊澶х▼搴﹀儚涓�涓洰鏍囥�備汉鑴革紝浜轰綋鎴栬溅绛夌瓑锛�
+	IsYolo  bool    // 鏄惁鏄痽olo鏁版嵁
+	ThftRes protomsg.ThftResult
+	Feature []byte
+}
+
+// 姣忎釜绠楁硶瀵逛簬褰撳墠甯х敾闈㈣嚜宸辨彁鍙栫殑鏁版嵁
+type SdkData struct {
+	TaskId      string
+	IpcId       string
+	IsYolo      bool
+	Photo       []PhotoMap // yolo绠楁硶缁撴瀯锛屼篃鍙互瀛樹汉鑴哥殑鏁版嵁锛屾瘯绔熶汉鑴镐腑鑳界敤瑙勫垯鏉ユ祴鐨勮繕鏄偅浜涘弬鏁�
+	KeepRight   bool       // 鏄惁闈犲彸琛� 绠楁硶鍒ゆ柇鐨勪笌涓婁竴甯у浘鍍忕殑姣旇緝缁撴灉
+	IsStatic    bool       // 鏄惁闈欐
+	ImageWidth  int        // 鎽勫儚鏈烘媿鎽勭殑鍥惧儚瀹� 鍍忕礌
+	ImageHeight int        // 鎽勫儚鏈烘媿鎽勭殑鍥惧儚楂� 鍍忕礌
+	AreaMapList []*AreaMap // 鏈瑂dk鎻愬彇鐨勬暟鎹寜鐓у尯鍩熷垝鍒嗗悗鐨勬暟鎹泦鍚�
+}
+
+// 浠庣畻娉曟ā鍧楀効鎷挎潵鐨勫涓�甯у浘鍍忓悇涓畻娉曟彁鍙栫殑鏁版嵁闆嗗悎
+type SdkDatas struct {
+	CameraId   string
+	TaskId     string
+	Sdkdata    []*SdkData
+	RuleResult map[string]interface{} // 杩囧畬瑙勫垯鍚庢墦鐨勬爣绛� face: []FaceResult, yolo: []Result
+}
+
+type ResultMsg struct {
+	*protomsg.SdkMessage
+	RuleResult map[string]interface{} // 杩囧畬瑙勫垯鍚庢墦鐨勬爣绛� face: []FaceResult, yolo: []Result
+}
+
+// 杩囪鍒欏簱鎵撲笂鐨勬爣绛�
+type Result struct {
+	TaskId       string // 浠诲姟id
+	SdkName      string
+	RuleGroupId  string // 瑙勫垯缁刬d
+	DefenceState bool   // 鏄惁甯冮槻
+	AlarmLevel   int32  // 鎶ヨ绛夌骇
+	RuleText     string // 鏂囧瓧鐗堣鍒欑粍
+	Location     []Rect // 鐩爣鐨勫潗鏍�
+	AlarmPolygon string // 瑙﹀彂鐨勬姤璀︽
+	IsLink       bool   // 鏄惁鏄仈鍔ㄤ换鍔�
+	Others
+}
+type Others struct {
+	CacheData []ResultMsg //(鏈粍瑙勫垯涓惈鏈夋寔缁椂闂寸殑瑙勫垯寮�鍚殑瀹氭椂鍣ㄧ紦瀛樼殑鏁版嵁甯�)
+	LinkCache []ResultMsg
+	TimeLabel string
+}
+
+// 杩囪鍒欏簱鎵撲笂鐨勬爣绛�
+type FaceResult struct {
+	Result
+	Args []Arg
+}
+type LittleRuleResult struct {
+	SdkName string // 璁板綍涓嬫缁撴灉鏄摢涓猻dk鐨勭粨鏋�
+	Result  string // 宸插寘鍚簡鍓嶇疆杩炴帴绗�
+	Sort    int32
+}
+
+type TimeRange struct {
+	Start string `json:"start"`
+	End   string `json:"end"`
+}
+type Day struct {
+	Day       int         `json:"day"`        // 鏍囩ず褰撳墠鏄熸湡鍑�
+	TimeRange []TimeRange `json:"time_range"` // 褰撳ぉ鐨勫嚑涓椂闂存
+}
+
+type BaseInfo struct {
+	TableId      string  `json:"tableId"`
+	TableName    string  `json:"tableName"`
+	BwType       string  `json:"bwType"`
+	CompareScore float64 `json:"compareScore"`
+	PersonId     string  `json:"personId"`
+	PersonName   string  `json:"personName"`
+	PersonPicUrl string  `json:"personPicUrl"`
+	PhoneNum     string  `json:"phoneNum"`
+	Sex          string  `json:"sex"`
+	IdCard       string  `json:"idCard"`
+	MonitorLevel string  `json:"monitorLevel"`
+	Content      string  `json:"content"`
+}

--
Gitblit v1.8.0