From e75a57b17af950c3de54514959dc6944eea86b2b Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 19 七月 2019 11:53:10 +0800
Subject: [PATCH] ---
---
labelFilter/ruleForLabel.go | 39 +++++++++++++++++++++++++++++++++++++--
ruleserver/readyDataForRule.go | 5 ++---
2 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go
index d00dfe8..0300723 100644
--- a/labelFilter/ruleForLabel.go
+++ b/labelFilter/ruleForLabel.go
@@ -3,13 +3,24 @@
import (
"github.com/knetic/govaluate"
"ruleprocess/logger"
+ "ruleprocess/ruleserver"
)
func Judge(){
+ //鎷垮埌鎵�鏈夎鍒欑粍
+ //閬嶅巻鎵�鏈夌殑瑙勫垯缁勶紝鐪嬬湅绗﹀悎鍝釜瑙勫垯缁勶紝灏辨妸鏁版嵁鎻掑叆鍒板摢涓鍒欑粍鐨勭洰鏍囨満鍣ㄤ笂
+
+ //鍏堝垽鏂椂闂磋鍒欙紝涓嶇鍚堟瑙勫垯锛岀洿鎺ョ暐杩�
+
+ //閬嶅巻瑙勫垯缁勪腑鐨勫皬瑙勫垯锛屾瘡涓皬瑙勫垯寰楀嚭涓�涓猻tring绫诲瀷鐨刡ool鍊硷紝鐒跺悗鐢� && 鎴� || 鎷兼帴璧锋潵
+
+ //寰楀嚭鎬荤殑鍒ゆ柇缁撴灉
+
+ //绗﹀悎鏈鍒欑粍鐨勫氨鎶婃暟鎹帹閫佸埌璇ョ洰鐨勬湇鍔″櫒涓�
}
-//
-func timeJudge(label *Label,groupRule *GroupRule){
+// 鏄惁绗﹀悎鏃堕棿瑙勫垯
+func timeJudge(label *Label,groupRule *GroupRule) string{
}
// 浼犲叆涓や釜鏃堕棿鐨勫瓧绗︿覆锛屽垽鏂涓�涓椂闂存槸鍚﹀皬浜庣浜屼釜鏃堕棿
@@ -26,4 +37,28 @@
logger.Error("甯﹀叆鍙傛暟鏈夎")
}
return result.(bool)
+}
+
+// 鏄惁绗﹀悎鎽勫儚鏈鸿鍒�
+func cameraJudge(label *Label,rule *Rule) string{
+ return "true"
+}
+
+// 鏄惁绗﹀悎搴曞簱瑙勫垯
+func baseJudge(label *Label,rule *Rule) string{
+ return "true"
+}
+
+//鏄惁绗﹀悎浜哄憳瑙勫垯
+func personJudge(label *Label,rule *Rule) string{
+ return "true"
+}
+
+// 鏄惁绗﹀悎甯冮槻绛夌骇瑙勫垯
+func defenceJudge(label *Label,rule *Rule) string{
+ return "true"
+}
+// 璋冪敤鐩爣鏈嶅姟鍣ㄧ殑鎻掑叆鎺ュ彛
+func pushData (data ruleserver.ResultMsg){
+
}
\ No newline at end of file
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index e075219..383a1e5 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -8,7 +8,6 @@
"fmt"
"github.com/go-yaml/yaml"
"io/ioutil"
- "os"
"ruleprocess/cache"
"ruleprocess/logger"
"strconv"
@@ -176,8 +175,8 @@
logger.Error("鏍规嵁id鏌ヨ搴曞簱淇℃伅鍑洪敊锛�",err,"--杩斿洖鍊奸暱搴︿负锛�",len(table))
}
base := BaseInfo{TableId:baseinfo.TableId,TableName:table[0].TableName,BwType:table[0].BwType,CompareScore:Retain(m[baseinfo.Id]),PersonId:baseinfo.Id,PersonName:baseinfo.PersonName,PersonPicUrl:baseinfo.PersonPicUrl,PhoneNum:baseinfo.PhoneNum,Sex:baseinfo.Sex,MonitorLevel:baseinfo.MonitorLevel,Content:""}
- logger.Debug("鐪嬬湅杩欎釜base鐨勫姣斿�兼槸澶氬皯锛�",base)
- os.Exit(1)
+ //logger.Debug("鐪嬬湅杩欎釜base鐨勫姣斿�兼槸澶氬皯锛�",base)
+ //os.Exit(1)
arg.Liker = append(arg.Liker, &base)
}
}
--
Gitblit v1.8.0