From 5913d9cfae97f9b15721c4facf9ceb8749da350e Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 25 六月 2019 13:52:08 +0800
Subject: [PATCH] 占比乘以100
---
ruleserver/ruleToformula.go | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index b6456d1..820432a 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -3,6 +3,7 @@
import (
"encoding/json"
"fmt"
+ "log"
"sort"
"strconv"
"strings"
@@ -308,6 +309,7 @@
func singleTask(aml *AreaMapList, arg *ArgsFromSdk, groupRule *protomsg.GroupRule, taskId string) bool {
var completeFormula string = ""
for _, areaMap := range aml.areaMapList {
+ //fmt.Println("褰撳墠瑙勫垯缁勪负---------锛�",groupRule)
for j := 0; j < len(groupRule.Rules); j++ {
// 鍏堣繃瀹屾潯浠舵暟鎹�
filterRule(groupRule.Rules[j], &areaMap)
@@ -346,7 +348,7 @@
if completeFormula != "" {
expression, _ := govaluate.NewEvaluableExpression(completeFormula)
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
- fmt.Println("杩欏抚鍥惧儚鍦ㄤ换鍔′笅鐨勯櫎浜嗘寔缁椂闂村鐨勪竴鏁存潯瑙勫垯涓嬬殑鍒ゆ柇缁撴灉", result)
+ //fmt.Println("杩欏抚鍥惧儚鍦ㄤ换鍔′笅鐨勯櫎浜嗘寔缁椂闂村鐨勪竴鏁存潯瑙勫垯涓嬬殑鍒ゆ柇缁撴灉", result)
// 鐢变簬澶╃劧鎴栫殑鍏崇郴锛屾弧瓒充竴涓氨璇ユ姤璀�,鍗宠甯ф暟鎹浜庢煇涓换鍔＄殑鏌愪釜瑙勫垯缁勫簲璇ユ姤璀�
if !result.(bool) { // 濡傛灉涓嶇鍚堟潯浠讹紝搴旇閲嶇疆瀹氭椂鍣ㄥ厓绱狅紝绛夌鍚堟椂鍐嶅紑鍚�,鎶妅ey涓寘鍚换鍔d鐨則imeEle閮介噸缃�
for k, timeEle := range TimeEleList {
@@ -416,12 +418,14 @@
}
// 鍏堟竻绌鸿繃婊ゅ悗鐨勬暟鎹紝鍐嶅線閲屽鏈杩囨护鍚庣殑鏁版嵁
am.filterData = am.filterData[0:0]
+ log.Println("鐪嬩竴涓嬪綋鍓嶅皬瑙勫垯锛�",*rule)
for _, arg := range args {
var formula string
if rule.SdkArgAlias == "score" {
formula = strconv.FormatFloat(arg.score, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
} else if rule.SdkArgAlias == "proportion" {
formula = strconv.FormatFloat(arg.proportion, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
+ fmt.Println("鍗犳瘮鐨勫瓧绗︿覆鍏紡锛�--------",formula)
} else {
formula = strconv.FormatFloat(arg.size, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
}
@@ -463,6 +467,7 @@
// 鍐椾綑鎷兼帴
func splice1(am *AreaMap) string {
args := am.targetNum
+ log.Println("鐪嬬湅鍖哄煙鍐呯洰鏍囨暟閲忥細----------",args)
formula := strconv.Itoa(args) + " " + ">" + "0"
expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
@@ -504,6 +509,7 @@
return "false"
}
} else if rule.SdkId == "FaceCompare"{
+ // 鍙渶瑕佽繃婊ら槇鍊硷紝杩囨护瀹屽悗鏁扮粍闀垮害澶т簬0鍗充负鎶ヨ锛屼絾濡備綍瀵规瘡涓�寮犻兘鎶ヨ鍛�
}
--
Gitblit v1.8.0