~jinersong/ruleprocess.git

			@@ -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("规则的算法id和区域的算法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{}
			}
			}