~jinersong/ruleprocess.git

			@@ -121,6 +121,20 @@
			args.RuleResult["face"] = []FaceResult{}
			//logger.Warn("传进去之前是什么德行：",args.RuleResult["yolo"])
			if taskGroup != nil && len(taskGroup.GroupRules) > 0 {
			// 先过独立，再过联动
			for _, group := range taskGroup.GroupRules {
			//logger.Println("------------------------------任务规则：",taskRule)
			taskId := taskGroup.TaskId
			//logger.Println("------------本组任务下的规则组的数量：",len(ruleList))
			temp := group.Rules // temp为一组完整规则在此需要判断规则是否是联动规则
			label := make(map[string]interface{})
			if len(temp) > 0 {
			if group.SetType != "linkTask" {
			// 独立任务的处理
			RunRule(args, group, taskId, message,label)
			}
			}
			}
			for _, group := range taskGroup.GroupRules {
			//logger.Println("------------------------------任务规则：",taskRule)
			taskId := taskGroup.TaskId
			@@ -131,9 +145,6 @@
			if group.SetType == "linkTask" {
			// groupId中含有link则为联动任务
			LinkTask(args, group, taskId, message,label)
			} else {
			// 独立任务的处理
			RunRule(args, group, taskId, message,label)
			}
			}
			}
			@@ -286,7 +297,7 @@
			}
			// 进行定时器的处理和判断
			timeFlag := TimerAlarm(label, groupRule.GroupId, result.(bool))
			if timeFlag == "01" \|\| timeFlag == "10" \|\| timeFlag == "11" { // 满足定时器条件
			if timeFlag == "01" \|\| timeFlag == "10" \|\| timeFlag == "11" { // 没有定时器或者满足定时器条件
			// 打人脸标签和yolo标签
			// 最后成功报警才把符合条件的人脸数据塞进结果标签里
			// 配了人脸的算法才把人脸的数据甩出来打标签
			@@ -317,13 +328,17 @@
			}
			}
			}
			nihao := make(map[string]interface{})
			for k,v := range label{
			nihao[k] = v
			}
			//logger.Debug("------locations的内容：", locations)
			if sdkNames != "" {
			args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkNames, groupRule.GroupId,groupRule.DefenceState,groupRule.AlarmLevel, groupRule.GroupText, locations, polygonId,label})
			args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkNames, groupRule.GroupId,groupRule.DefenceState,groupRule.AlarmLevel, groupRule.GroupText, locations, polygonId,nihao})
			//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,label},faces})
			args.RuleResult["face"] = append(args.RuleResult["face"].([]FaceResult), FaceResult{Result{taskId, sdkNames, groupRule.GroupId,groupRule.DefenceState,groupRule.AlarmLevel, groupRule.GroupText, []Rect{}, polygonId,nihao},faces})
			//logger.Info("-------------------face结果标签", len(args.RuleResult["face"].([]FaceResult)))
			}
			return true
			@@ -399,7 +414,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{message,args.RuleResult}})
			TimeEleList[groupRule.GroupId].RuleResults = append(TimeEleList[groupRule.GroupId].RuleResults, &RuleResult{groupRule.Rules[j].CameraId, groupRule.Rules[j].Sort, "", groupRule.Rules[j].RuleWithPre,ResultMsg{}})
			}
			}
			}
			@@ -412,6 +427,27 @@
			for _, va := range timeEle.RuleResults {
			if va.CameraId == args.CameraId {
			va.Result = strconv.FormatBool(isOk)
			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)
			}
			}
			if k == "face" {
			tempMap[k] = []FaceResult{}
			for _,res := range result.([]FaceResult) {
			tempMap[k] = append(tempMap[k].([]FaceResult),res)
			}
			}
			}
			for _,result := range args.RuleResult["yolo"].([]Result) {
			for k,_ := range result.Others {
			logger.Warn("放进联动缓存的键是",k)
			}
			}
			va.CacheData = ResultMsg{message,tempMap}
			logger.Info("这个摄像机--", args.CameraId, "--被赋予了result", va.Result)
			}
			}
			@@ -439,12 +475,25 @@
			if result.(bool) {
			logger.Info("___________________________________________________________________联动任务报警")
			// 把数组里缓存的数据取出来一起报警
			label["linkCache"] = []*ResultMsg{}
			label["linkCache"] = []ResultMsg{}
			for _, ruleRes := range TimeEleList[groupRule.GroupId].RuleResults {
			label["linkCache"] = append(label["linkCache"].([]*ResultMsg),ruleRes.CacheData)
			label["linkCache"] = append(label["linkCache"].([]ResultMsg),ruleRes.CacheData)
			}
			logger.Debug("联动任务缓存了几个数据",len(label["linkCache"].([]*ResultMsg)))
			//os.Exit(1)
			logger.Debug("联动任务缓存了几个数据",len(label["linkCache"].([]ResultMsg)))
			//for _,result := range args.RuleResult["yolo"].([]Result) {
			// if result.RuleGroupId == groupRule.GroupId {
			// result.Others["linkCache"] = label
			// }
			//}
			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"]
			//res := args.RuleResult["yolo"].([]Result)[i]
			//res.Others["linkCache"] = label["linkCache"]
			//args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result)[:i],args.RuleResult["yolo"].([]Result)[i+1:]...)
			//args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result),res)
			}
			}
			}
			}
			} else {