From e8166a1b997086554a83c486d99d3887733c322d Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期日, 29 九月 2019 11:21:33 +0800
Subject: [PATCH] 删减冗余代码 把分值和id改回性别和年龄描述
---
go.sum | 2 ++
insertdata/insertDataToEs.go | 7 +++----
go.mod | 1 +
ruleserver/ruleToformula.go | 34 ++++++++--------------------------
4 files changed, 14 insertions(+), 30 deletions(-)
diff --git a/go.mod b/go.mod
index f9b9ef1..5c019fc 100644
--- a/go.mod
+++ b/go.mod
@@ -10,6 +10,7 @@
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051
basic.com/valib/gopherdiscovery.git v0.0.0-20190605034340-15d89d8b4e28
basic.com/valib/gosdk.git v0.0.0-20190531034110-0062fdaaa05a // indirect
+ basic.com/valib/logger.git v0.0.0-20190927065828-cb651da7c223
github.com/Microsoft/go-winio v0.4.12 // indirect
github.com/ajg/form v1.5.1 // indirect
github.com/go-yaml/yaml v2.1.0+incompatible
diff --git a/go.sum b/go.sum
index b5a7301..d9ba200 100644
--- a/go.sum
+++ b/go.sum
@@ -26,6 +26,8 @@
basic.com/valib/gosdk.git v0.0.0-20190531034110-0062fdaaa05a/go.mod h1:mT/jbyl3++GmYjh/jBF65Ein6O6/yd4qIQbSFMCZoE4=
basic.com/valib/logger.git v0.0.0-20190926101623-99e2471fbbf5 h1:kBGQ+7tbDY4kIyZJVK3gLqAFzK8zS7o7323pSgfXXBs=
basic.com/valib/logger.git v0.0.0-20190926101623-99e2471fbbf5/go.mod h1:SPlOGUUlxCscwF1dkqmLb0oJXVqg1uJ8hsPXLFxrw1M=
+basic.com/valib/logger.git v0.0.0-20190927065828-cb651da7c223 h1:LPTDC1cOb2ZhuAkflqWXrIQ2RPYPS+ntoRgvpnZm4bY=
+basic.com/valib/logger.git v0.0.0-20190927065828-cb651da7c223/go.mod h1:SPlOGUUlxCscwF1dkqmLb0oJXVqg1uJ8hsPXLFxrw1M=
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
code.cloudfoundry.org/bytefmt v0.0.0-20180906201452-2aa6f33b730c/go.mod h1:wN/zk7mhREp/oviagqUXY3EwuHhWyOvAdsn5Y4CzOrc=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 8f87b0b..e153444 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -1,13 +1,12 @@
package insertdata
import (
+ "basic.com/valib/logger.git"
"encoding/base64"
"encoding/json"
"errors"
- "fmt"
"net"
"ruleprocess/cache"
- "basic.com/valib/logger.git"
"strconv"
"time"
@@ -243,9 +242,9 @@
"",
alarmRules,
time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
- strconv.FormatUint(face.Id, 10), //鏆傛敼涓轰汉鑴竔d strconv.FormatUint(face.Id, 10)
+ sex, //鏆傛敼涓轰汉鑴竔d strconv.FormatUint(face.Id, 10)
face.ThftRes.Age,
- fmt.Sprintf("%.2f",face.Score), // 鏆傛敼涓哄垎鍊糵mt.Sprintf("%.2f",face.Score)
+ ageDescription, // 鏆傛敼涓哄垎鍊糵mt.Sprintf("%.2f",face.Score)
race,
face.ThftRes.Smile,
face.ThftRes.Beauty,
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 1033825..bfc8b07 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -580,7 +580,7 @@
//logger.Info("瑙勫垯鐨勭畻娉昳d鍜屽尯鍩熺殑绠楁硶id锛�", rule.SdkId, "===", am.sdkId)
if rule.PolygonId == am.areaId { // 绠楁硶鍜屽尯鍩熼兘寰楀鐨勪笂
- if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a972" && rule.SdkArgAlias != "time_rule"{
+ if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a972" && rule.SdkArgAlias != "time_rule" {
if rule.RuleWithPre == "||" {
return LittleRuleResult{}
} else {
@@ -648,17 +648,15 @@
} else {
return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
}
- } else {
- return LittleRuleResult{}
}
- } else {
- return LittleRuleResult{}
+ } else if rule.SdkArgAlias == "" { // 浠�涔堝弬鏁伴兘涓嶉厤鐨勬儏鍐�
+ if am.targetNum > 0 {
+ return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "true", rule.Sort}
+ } else {
+ return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+ }
}
- } else {
- return LittleRuleResult{}
}
- } else {
- return LittleRuleResult{}
}
} else {
// 澶勭悊鐨勯兘鏄痽olo鏁版嵁
@@ -704,14 +702,10 @@
} else {
return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
}
- } else {
- return LittleRuleResult{}
}
-
- } else {
- return LittleRuleResult{}
}
}
+ return LittleRuleResult{}
}
// 濡傛灉鏈夋寔缁椂闂存潯浠剁淮鎶ゅ紑鍚竴涓畾鏃跺櫒
@@ -762,18 +756,6 @@
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
return LittleRuleResult{am.sdkName, rule.RuleWithPre + " " + strconv.FormatBool(result.(bool)), rule.Sort}
// 鍔犱笂鍏充簬绠楁硶鐨勫垽鏂潯浠讹紝涓嶈兘鍙湁鍏充簬瑙勫垯鐨勶紝鏈夌殑绠楁硶鏈韩灏辨槸涓�涓鍒欙紝濡備釜浣撻潤姝紝闈犲彸琛�,鎵�浠ワ紝鎷垮埌褰撳墠瀛愯鍒欑殑sdkid鏉ュ垽鏂槸鍚︽槸閭ｄ簺鐗规畩鐨勮鍒�
- } else if rule.SdkId == "IsStatic" { // 闈欐绠楁硶
- if am.isStatic {
- return LittleRuleResult{}
- } else {
- return LittleRuleResult{}
- }
- } else if rule.SdkId == "KeepRight" { // 闈犲彸琛岀畻娉�
- if am.keepRight {
- return LittleRuleResult{}
- } else {
- return LittleRuleResult{}
- }
}
}
return LittleRuleResult{}
--
Gitblit v1.8.0