~jinersong/ruleprocess.git

			@@ -112,13 +112,13 @@
			IsStatic bool // 是否静止
			ImageWidth int // 摄像机拍摄的图像宽像素
			ImageHeight int // 摄像机拍摄的图像高像素
			AreaMapList []*AreaMap // 本sdk提取的数据按照区域划分后的数据集合
			AreaMapList []AreaMap // 本sdk提取的数据按照区域划分后的数据集合
			}

			// 从算法模块儿拿来的对一帧图像各个算法提取的数据集合
			type SdkDatas struct {
			CameraId string
			Sdkdata []SdkData
			Sdkdata []*SdkData
			RuleResult map[string]interface{} // 过完规则后打的标签 face: []Arg yolo: []Result
			}

			@@ -168,7 +168,7 @@
			if item.CameraId == cameraId && item.Type != "line" {
			// 需要根据比例把前台画的区域的坐标转化为相应摄像机拍摄的图像的大小 x坐标分别image.width/页面区域宽 y坐标分别image.height/页面区域高
			// 前台宽高固定
			log.Println("------------符合条件的区域：",item)
			//log.Println("------------符合条件的区域：",item)
			cameraPolygons = append(cameraPolygons, item)
			}
			}
			@@ -179,22 +179,24 @@
			// 把sdk从数据帧上提取的按照区域分类归置
			func SdkDataFormat(cameraId string, arg *SdkData, cameraPolygons []protomsg.CameraPolygon) {
			for _, polygon := range cameraPolygons {
			log.Println("++++++在这儿看一下区域啊", polygon)
			areaMap := &AreaMap{cameraId: cameraId, areaId: polygon.Id, areaJson: polygon.Polygon, triggerLine: polygon.TriggerLine, directionLine: polygon.DirectionLine}
			//log.Println("++++++在这儿看一下区域啊", polygon)
			areaMap := AreaMap{cameraId: cameraId, areaId: polygon.Id, areaJson: polygon.Polygon, triggerLine: polygon.TriggerLine, directionLine: polygon.DirectionLine}
			// 为每个摄像机区域填充数据
			areaMap.CountAreaObjs(arg)
			log.Println("-------areaMap的内容",areaMap)
			arg.AreaMapList = append(arg.AreaMapList, areaMap)
			log.Println("-------AreaMapList的内容",arg.AreaMapList)
			}
			}

			// 对单帧图像的判断是舍弃（或者说对于某些需求可以放ES数据库一份）还是返回
			func Judge(args *SdkDatas) {
			func Judge(args SdkDatas) {
			if len(args.Sdkdata) > 0 {
			// 拿到本摄像机的区域
			cameraPolygons := GetPolygons(args.CameraId)
			// 把所有的sdk提取的数据都按所属摄像机的区域归置
			for _, arg := range args.Sdkdata {
			SdkDataFormat(args.CameraId, &arg, cameraPolygons)
			SdkDataFormat(args.CameraId, arg, cameraPolygons)
			}
			// 跑本摄像机的所有规则组一组一组跑
			taskRuleList := GetRuleGroup(args.CameraId) // 本摄像机下所有任务组
			@@ -224,17 +226,16 @@
			}
			}
			}
			func RunRule(args SdkDatas, groupRule protomsg.GroupRule, taskId string) bool {
			func RunRule(args SdkDatas, groupRule *protomsg.GroupRule, taskId string) bool {
			resultSplice := []*LittleRuleResult{}
			// 先过完条件规则
			log.Println("---------------------看下这个组规则：", groupRule.Rules)
			for j := 0; j < len(groupRule.Rules); j++ {
			for _, sdkData := range args.Sdkdata {
			if sdkData.SdkId == "812b674b-2375-4589-919a-5c1c3278a975" {
			log.Println("入侵的算法数据", sdkData)
			}
			for _, areaMap := range sdkData.AreaMapList {
			ruleResult := filterRule(groupRule.Rules[j], areaMap)
			ruleResult := filterRule(groupRule.Rules[j], &areaMap)
			if ruleResult.Result != "" {
			log.Println("条件规则结果：", ruleResult.Result)
			resultSplice = append(resultSplice, &ruleResult)
			@@ -247,7 +248,7 @@
			for _, sdkData := range args.Sdkdata {
			for _, areaMap := range sdkData.AreaMapList {
			for j := 0; j < len(groupRule.Rules); j++ {
			putFaceToResult(groupRule.Rules[j], areaMap, faces)
			putFaceToResult(groupRule.Rules[j], &areaMap, faces)
			}
			}
			}
			@@ -256,7 +257,7 @@
			for j := 0; j < len(groupRule.Rules); j++ {
			for _, sdkData := range args.Sdkdata {
			for _, areaMap := range sdkData.AreaMapList {
			ruleResult := transferParameters(groupRule.Rules[j], areaMap)
			ruleResult := transferParameters(groupRule.Rules[j], &areaMap)
			if ruleResult.Result != "" {
			log.Println("数量规则结果：", ruleResult.Result)
			resultSplice = append(resultSplice, &ruleResult)
			@@ -268,7 +269,7 @@
			for j := 0; j < len(groupRule.Rules); j++ {
			for _, sdkData := range args.Sdkdata {
			for _, areaMap := range sdkData.AreaMapList {
			ruleResult := timeRuleResult(groupRule.Rules[j], areaMap)
			ruleResult := timeRuleResult(groupRule.Rules[j], &areaMap)
			if ruleResult.Result != "" {
			log.Println("时间规则结果：", ruleResult.Result)
			resultSplice = append(resultSplice, &ruleResult)
			@@ -280,7 +281,7 @@
			for j := 0; j < len(groupRule.Rules); j++ {
			for _, sdkData := range args.Sdkdata {
			for _, areaMap := range sdkData.AreaMapList {
			duration(groupRule.Rules[j], areaMap)
			duration(groupRule.Rules[j], &areaMap)
			}
			}
			}
			@@ -364,7 +365,6 @@

			// }
			for _, obj := range arg.Photo {
			log.Println("-------------------看看areajson-------------", a.areaJson)
			log.Println("------------------看看sdkData的Photo数据----------------", obj, "----顺便看看占比-----：", PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale))
			if threshold <= obj.Score && size <= float64(obj.Rects.Width*obj.Rects.Height) && intersectionper <= PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale) {
			// 这步要备齐表达式里所需要的所有参数
			@@ -417,7 +417,7 @@
			}

			// 联动任务的处理
			func linkTask(args SdkDatas, groupRule protomsg.GroupRule, taskId string) {
			func linkTask(args SdkDatas, groupRule *protomsg.GroupRule, taskId string) {
			// new一个定时器，如果以此groupId为标志的定时器不存在的话
			var flag bool = true
			var timeEle = TimeElement{N: 3, InitN: 3, GroupId: groupRule.GroupId}