From 18827e9e25797b6d24ad7ad4785f7e80fe46a409 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 18 十一月 2019 19:05:14 +0800
Subject: [PATCH] 车辆版本

---
 algorithm/personUnsual/personUnsual.go |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/algorithm/personUnsual/personUnsual.go b/algorithm/personUnsual/personUnsual.go
index dc2f0bc..be358ce 100644
--- a/algorithm/personUnsual/personUnsual.go
+++ b/algorithm/personUnsual/personUnsual.go
@@ -9,9 +9,9 @@
 )
 
 // 浜哄憳寮傚父绠楁硶
-func Entrance(rule *protomsg.Rule, am *structure.AreaMap,lable *structure.Others,args *structure.SdkDatas,message *protomsg.SdkMessage) structure.LittleRuleResult {
+func Entrance(rule *protomsg.Rule, am *structure.AreaMap, lable *structure.Others, args *structure.SdkDatas, message *protomsg.SdkMessage) structure.LittleRuleResult {
 	if rule.PolygonId == am.AreaId { // 棣栧厛杩欐潯瑙勫垯寰楁槸杩欎釜绠楁硶鐨勮鍒欙紝鍏舵瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
-		logger.Debug("---------璧颁簡浜哄憳寮傚父绠楁硶",rule.Id,rule.SdkArgAlias,rule.Operator,rule.SdkArgValue,am.AreaId)
+		logger.Debug("---------璧颁簡浜哄憳寮傚父绠楁硶", rule.Id, rule.SdkArgAlias, rule.Operator, rule.SdkArgValue, am.AreaId)
 		if rule.SdkArgAlias == "score" || rule.SdkArgAlias == "proportion" || rule.SdkArgAlias == "size" || rule.SdkArgAlias == "" { // 鍒ゆ柇鐨勬槸鐩镐技鍊硷紝鍗犳瘮锛屽昂瀵哥瓑杩囨护鏉′欢锛屽鏋滃啀鏈夛紝杩樺彲浠ュ啀鍔�
 			return filterRule(rule, am)
 		} else if rule.SdkArgAlias == "objCount" {
@@ -39,15 +39,16 @@
 		//logger.Debug("鐪嬬湅args锛氾細锛氾細锛�", args)
 		for _, arg := range args {
 			var formula string
-			if rule.SdkArgAlias == "score" {
-				formula = strconv.FormatFloat(arg.Score, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
-				logger.Info("褰撳墠鐩镐技搴﹀皬鍏紡锛�", formula)
-			} else if rule.SdkArgAlias == "proportion" {
-				formula = strconv.FormatFloat(arg.Proportion, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
-				logger.Info("褰撳墠鍗犳瘮灏忓叕寮忥細", formula)
-			} else {
-				formula = strconv.FormatFloat(arg.Size, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
-				logger.Info("褰撳墠灏哄灏忓叕寮忥細", formula)
+			switch rule.SdkArgAlias {
+			case "score":
+				formula = strconv.FormatFloat(arg.Score, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue
+				logger.Info("鐩镐技搴﹀皬鍏紡锛�", formula)
+			case "proportion":
+				formula = strconv.FormatFloat(arg.Proportion, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue
+				logger.Info("鍗犳瘮鍏紡锛�", formula)
+			case "size":
+				formula = strconv.FormatFloat(arg.Size, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue
+				logger.Info("灏哄灏忓叕寮忥細", formula)
 			}
 			expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
 			result, _ := expression.Evaluate(nil)                      // 寰楀埌鏁板鍏紡鐨勭粨鏋�

--
Gitblit v1.8.0