From 6b5f372e6077e1b0880b6ba389375641c0a1a15a Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 25 六月 2019 10:51:36 +0800
Subject: [PATCH] --
---
ruleserver/ruleToformula.go | 44 ++++++++++++++++++++++++++++++--------------
1 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 6f6ffbf..1a5af39 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -60,6 +60,12 @@
score float64 // 鍖哄煙鍐呯殑鐩爣鐨勭浉浼煎害
proportion float64 // 鍖哄煙鍐呯殑鐩爣鐨勫崰姣�
size float64 // 鍖哄煙鍐呯殑鐩爣鐨勫昂瀵�
+ liker []LikePerson
+}
+
+type LikePerson struct {
+ Id string // 涓庝箣鐩镐技鐨勫簳搴撲汉鍛樼殑id
+ Score float64 // 涓庡簳搴撲汉鍛樼殑鐩镐技鍊�
}
// 姣忎釜鍖哄煙鍐呯殑鍥剧墖鏁版嵁闆嗗悎
@@ -83,7 +89,8 @@
// sdk杈撳嚭鐨勫浘鐗囦笂鍗曚釜鐩爣鐨勬暟鎹�
type PhotoMap struct {
Rects Rect // 鐭╁舰鍖哄煙鍙傛暟
- Score float64 // 鐩镐技搴﹀緱鍒�
+ Score float64 // 鐩镐技搴﹀緱鍒嗭紙鏈夊澶х▼搴﹀儚涓�涓洰鏍囥�備汉鑴革紝浜轰綋鎴栬溅绛夌瓑锛�
+ Liker []LikePerson // 濡傛灉鏄汉鑴哥殑璇濆挨鍏舵槸姣斿锛屽簲瀛樹笅浠栬窡搴曞簱鐨勪汉鍛樼殑鐩镐技鎯呭喌 yolo鐨勮瘽缁檔il灏辫
}
// 浠庨�氶亾涓幏鍙栫殑sdk杈撳嚭鐨勫浘鍍忔暟鎹�(鐩墠涓昏鏄痽olo绠楁硶鐨勬暟鎹�)
@@ -110,7 +117,7 @@
type Result struct {
TaskId string // 浠诲姟id
RuleGroupId string // 瑙勫垯缁刬d
- AlarmLevel int32 // 鎶ヨ绛夌骇
+ AlarmLevel int32 // 鎶ヨ绛夌骇
RuleText string // 鏂囧瓧鐗堣鍒欑粍
}
@@ -188,11 +195,17 @@
// 灏嗗瓧绗︿覆鏍煎紡鐨勫潗鏍囧簭鍒楀寲涓篜oint鏍煎紡
func Json2points(areaPoints string) []Point {
var pts []Point
-
- err := json.Unmarshal([]byte(areaPoints), &pts)
- if err != nil {
- fmt.Println("json.Unmarshal閿欒", err)
- panic("搴忓垪鍖栧潗鏍囧紓甯革紝绋嬪簭閫�鍑�")
+ if areaPoints == "" {
+ pts = append(pts, Point{0, 0})
+ pts = append(pts, Point{0, 540})
+ pts = append(pts, Point{960, 540})
+ pts = append(pts, Point{960, 0})
+ } else {
+ err := json.Unmarshal([]byte(areaPoints), &pts)
+ if err != nil {
+ fmt.Println("json.Unmarshal閿欒", err)
+ panic("搴忓垪鍖栧潗鏍囧紓甯革紝绋嬪簭閫�鍑�")
+ }
}
return pts
}
@@ -295,6 +308,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)
@@ -311,9 +325,8 @@
flag := splice1(&areaMap)
if flag != "" {
fmt.Println("寮鸿鎷煎噾涓�涓汉鏁版槸鍚﹀ぇ浜�0鐨勭粨鏋�", flag)
- completeFormula = completeFormula + groupRule.Rules[j].RuleWithPre + "" + flag
+ completeFormula = flag
}
-
}
for j := 0; j < len(groupRule.Rules); j++ {
// 杩欐杩囩殑鏄椂闂磋鍒欙紙鏃堕棿娈电瓑锛�
@@ -356,7 +369,7 @@
if flag {
fmt.Println("瀹氭椂鍣ㄦ姤璀︿簡")
// 杩囧畬瑙勫垯鍚庢墦涓爣绛撅紝鍛婅瘔璋冪敤鑰呮湰甯ф暟鎹拡瀵瑰摢涓换鍔″摢缁勮鍒欐姤璀︿簡
- arg.RuleResult = append(arg.RuleResult, Result{taskId, groupRule.GroupId,groupRule.AlarmLevel,groupRule.GroupText})
+ arg.RuleResult = append(arg.RuleResult, Result{taskId, groupRule.GroupId, groupRule.AlarmLevel, groupRule.GroupText})
return true
} else {
return false
@@ -414,7 +427,7 @@
formula = strconv.FormatFloat(arg.size, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
}
expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
- result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
+ result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
if result.(bool) {
am.filterData = append(am.filterData, arg) // 寰楀埌绗﹀悎鏉′欢鐨勮繃婊ゆ暟鎹�
}
@@ -447,14 +460,16 @@
}
}
}
+
// 鍐椾綑鎷兼帴
-func splice1 (am *AreaMap) string {
+func splice1(am *AreaMap) string {
args := am.targetNum
- formula := strconv.Itoa(args) + " " + ">" + "0"
+ formula := strconv.Itoa(args) + " " + ">" + "0"
expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
return strconv.FormatBool(result.(bool))
}
+
// 缁欐暟鎹簱鐨勮鍒欒〃杈惧紡浠ｅ弬 args: 涓�鏉″瓙瑙勫垯锛屽尯鍩熸暟鎹�
func transferParameters(rule *protomsg.Rule, am *AreaMap) string {
if rule.PolygonId == am.areaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
@@ -484,11 +499,12 @@
} else if rule.SdkId == "FaceDetect" { // 浜鸿劯妫�娴�
if rule.Operator == "==" || rule.Operator == ">=" || rule.Operator == "<=" || rule.Operator == "<" || rule.Operator == ">" || rule.Operator == "!=" {
// 濡傛灉鏄笉瑙勭煩鐨勮繛鎺ョ缁熺粺杩斿洖false 瑙勫垯涔熷彧鑳藉垽鏂汉鑴哥殑鐩镐技搴︼紝鎵�浠ヤ笉瀛樺湪鍒殑杩炴帴绗�
+
return "false"
} else {
return "false"
}
- } else {
+ } else if rule.SdkId == "FaceCompare"{
}
--
Gitblit v1.8.0