From 993dc81c942d6b1315684cda034c8859a6f4d02b Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 06 十一月 2019 11:15:40 +0800
Subject: [PATCH] ---
---
ruleserver/ruleToformula.go | 379 +++++++++++++++++++++---------------------------------
1 files changed, 147 insertions(+), 232 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 4f8151d..562d284 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -2,117 +2,27 @@
import (
"ruleprocess/cache"
- "ruleprocess/logger"
+ "ruleprocess/structure"
+ "basic.com/valib/logger.git"
"sort"
"strconv"
"strings"
+ "sync"
"time"
"basic.com/pubsub/protomsg.git"
"github.com/knetic/govaluate"
)
-// 姣忎釜鐩爣鐨勫弬鏁帮細鐩镐技搴︼紝鍗犳瘮锛屽昂瀵�
-type Arg struct {
- Id uint64
- Score float64 // 鍖哄煙鍐呯殑鐩爣鐨勭浉浼煎害
- Proportion float64 // 鍖哄煙鍐呯殑鐩爣鐨勫崰姣�
- Size float64 // 鍖哄煙鍐呯殑鐩爣鐨勫昂瀵�
- IsYolo bool // 鏄惁鏄痽olo鏁版嵁
- Location Rect // 璁颁笅姣忎釜鐩爣鐨勪綅缃弬鏁帮紝鏈�鍚庣粰缁撴灉瑁呴厤浜鸿劯鏁版嵁鐨勬椂鍊欑敤鐨勫埌
- Feature []byte
- ThftRes protomsg.ThftResult
- Liker []*BaseInfo
-}
-
-// 姣忎釜鍖哄煙鍐呯殑鍥剧墖鏁版嵁闆嗗悎
-type AreaMap struct {
- cameraId string
- areaId string
- groupId string
- taskId string
- sdkId string
- sdkName string
- areaJson string
- triggerLine string
- directionLine string
- targetNum int // 鍖哄煙鍐呯洰鏍囨暟閲�
- args []*Arg // 鍖哄煙鍐呯洰鏍囬泦鍚�
- filterData []*Arg // 杩囨护鍚庡尯鍩熷唴鐩爣闆嗗悎
- time string // 褰撳墠鏃堕棿锛堢敤浠ュ尮閰嶆椂闂磋鍒欙級
- isEffective bool // 瑙勫垯涓槸鍚︾敤鍒颁簡姝ゅ尯鍩�
- keepRight bool // 鏄惁闈犲彸琛�
- isStatic bool // 鏄惁闈欐
-}
-
-// sdk杈撳嚭鐨勫浘鐗囦笂鍗曚釜鐩爣鐨勬暟鎹�
-type PhotoMap struct {
- Id uint64
- Rects Rect // 鐭╁舰鍖哄煙鍙傛暟
- Score float64 // 鐩镐技搴﹀緱鍒嗭紙鏈夊澶х▼搴﹀儚涓�涓洰鏍囥�備汉鑴革紝浜轰綋鎴栬溅绛夌瓑锛�
- IsYolo bool // 鏄惁鏄痽olo鏁版嵁
- ThftRes protomsg.ThftResult
- Feature []byte
-}
-
-// 姣忎釜绠楁硶瀵逛簬褰撳墠甯х敾闈㈣嚜宸辨彁鍙栫殑鏁版嵁
-type SdkData struct {
- TaskId string
- IpcId string
- IsYolo bool
- Photo []PhotoMap // yolo绠楁硶缁撴瀯锛屼篃鍙互瀛樹汉鑴哥殑鏁版嵁锛屾瘯绔熶汉鑴镐腑鑳界敤瑙勫垯鏉ユ祴鐨勮繕鏄偅浜涘弬鏁�
- KeepRight bool // 鏄惁闈犲彸琛� 绠楁硶鍒ゆ柇鐨勪笌涓婁竴甯у浘鍍忕殑姣旇緝缁撴灉
- IsStatic bool // 鏄惁闈欐
- ImageWidth int // 鎽勫儚鏈烘媿鎽勭殑鍥惧儚瀹� 鍍忕礌
- ImageHeight int // 鎽勫儚鏈烘媿鎽勭殑鍥惧儚楂� 鍍忕礌
- AreaMapList []*AreaMap // 鏈瑂dk鎻愬彇鐨勬暟鎹寜鐓у尯鍩熷垝鍒嗗悗鐨勬暟鎹泦鍚�
-}
-
-// 浠庣畻娉曟ā鍧楀効鎷挎潵鐨勫涓�甯у浘鍍忓悇涓畻娉曟彁鍙栫殑鏁版嵁闆嗗悎
-type SdkDatas struct {
- CameraId string
- TaskId string
- Sdkdata []*SdkData
- RuleResult map[string]interface{} // 杩囧畬瑙勫垯鍚庢墦鐨勬爣绛� face: []FaceResult, yolo: []Result
-}
-
-type ResultMsg struct {
- *protomsg.SdkMessage
- RuleResult map[string]interface{} // 杩囧畬瑙勫垯鍚庢墦鐨勬爣绛� face: []FaceResult, yolo: []Result
-}
-
-// 杩囪鍒欏簱鎵撲笂鐨勬爣绛�
-type Result struct {
- TaskId string // 浠诲姟id
- SdkName string
- RuleGroupId string // 瑙勫垯缁刬d
- DefenceState bool // 鏄惁甯冮槻
- AlarmLevel int32 // 鎶ヨ绛夌骇
- RuleText string // 鏂囧瓧鐗堣鍒欑粍
- Location []Rect // 鐩爣鐨勫潗鏍�
- AlarmPolygon string // 瑙﹀彂鐨勬姤璀︽
- IsLink bool // 鏄惁鏄仈鍔ㄤ换鍔�
- Others
-}
-type Others struct {
- CacheData []ResultMsg //(鏈粍瑙勫垯涓惈鏈夋寔缁椂闂寸殑瑙勫垯寮�鍚殑瀹氭椂鍣ㄧ紦瀛樼殑鏁版嵁甯�)
- LinkCache []ResultMsg
- TimeLabel string
-}
-
-// 杩囪鍒欏簱鎵撲笂鐨勬爣绛�
-type FaceResult struct {
- Result
- Args []Arg
-}
-type LittleRuleResult struct {
- SdkName string // 璁板綍涓嬫缁撴灉鏄摢涓猻dk鐨勭粨鏋�
- Result string // 宸插寘鍚簡鍓嶇疆杩炴帴绗�
- Sort int32
-}
+var rw sync.RWMutex // 璇诲啓閿�
// 瀵瑰崟甯у浘鍍忕殑鍒ゆ柇 thisSdkDatas 褰撳墠浼犲叆鐨勮繖甯ф暟鎹紝cacheSdkData 瀹氭椂鍣ㄩ噷缂撳瓨鐨勪竴甯ф暟鎹� 娌℃湁灏辫繑鍥瀗il (thisSdkDatas SdkDatas, cacheSdkDatas SdkDatas)
-func Judge(args *SdkDatas, message *protomsg.SdkMessage) {
+func Judge(args *structure.SdkDatas, message *protomsg.SdkMessage) {
+ defer func() {
+ if err := recover(); err != nil {
+ logger.Error("瑙勫垯妯″潡鍎跨殑寮傚父鎹曡幏锛�",err)
+ }
+ }()
if len(args.Sdkdata) > 0 {
// 鎷垮埌鏈憚鍍忔満鐨勫尯鍩�
cameraPolygons := GetPolygons(args.CameraId)
@@ -126,8 +36,8 @@
//logger.Println("鐪嬩笅鎽勫儚鏈轰笅鐨勪换鍔＄粍锛�",taskRuleList)
// 寰楀埌灞炰簬璇ユ憚鍍忔満鐨勮嫢骞茬粍浠诲姟鐨勫畬鏁磋鍒欙紙璺熸瘡涓�鏉″畬鏁磋鍒欐瘮杈冧箣鍚庡緱鍑烘湰寮犲浘鍍忓浜庢煇涓鍒欐槸鍚︽姤璀︾殑缁撴灉銆傛斁杩沵ap锛屾瘮濡傛湰甯у浘鍍忕殑id锛屾墍纰版挒鎴愬姛鐨勮鍒檌d锛�
args.RuleResult = make(map[string]interface{})
- args.RuleResult["yolo"] = []Result{}
- args.RuleResult["face"] = []FaceResult{}
+ args.RuleResult["yolo"] = []structure.Result{}
+ args.RuleResult["face"] = []structure.FaceResult{}
//logger.Warn("浼犺繘鍘讳箣鍓嶆槸浠�涔堝痉琛岋細",args.RuleResult["yolo"])
if taskGroup != nil && len(taskGroup.GroupRules) > 0 {
// 鍏堣繃鐙珛锛屽啀杩囪仈鍔�
@@ -136,7 +46,7 @@
taskId := taskGroup.TaskId
//logger.Println("------------鏈粍浠诲姟涓嬬殑瑙勫垯缁勭殑鏁伴噺锛�",len(ruleList))
temp := group.Rules // temp涓轰竴缁勫畬鏁磋鍒� 鍦ㄦ闇�瑕佸垽鏂鍒欐槸鍚︽槸鑱斿姩瑙勫垯
- label := Others{}
+ label := structure.Others{}
if len(temp) > 0 {
if group.SetType != "linkTask" {
// 鐙珛浠诲姟鐨勫鐞�
@@ -149,7 +59,7 @@
taskId := taskGroup.TaskId
//logger.Println("------------鏈粍浠诲姟涓嬬殑瑙勫垯缁勭殑鏁伴噺锛�",len(ruleList))
temp := group.Rules // temp涓轰竴缁勫畬鏁磋鍒� 鍦ㄦ闇�瑕佸垽鏂鍒欐槸鍚︽槸鑱斿姩瑙勫垯
- label := Others{}
+ label := structure.Others{}
if len(temp) > 0 {
if group.SetType == "linkTask" {
// groupId涓惈鏈塴ink鍒欎负鑱斿姩浠诲姟
@@ -157,11 +67,17 @@
}
}
}
+ // 浜轰綋杩借釜
+ // 濡傛灉鏍囩涓惈鏈夋寔缁椂闂撮娆℃姤璀︾殑timeLabel鐨勮瘽鍒欎笉闇�瑕佽繃浜轰綋杩借釜锛屼笉鐒跺氨娌＄殑鎻掑叆浜�
+ fk := TrackOrNot(args.RuleResult)
+ if !fk {
+ BodyIsSame(args,message)
+ }
}
}
}
-func RunRule(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage, label Others) (bool,[]int) {
+func RunRule(args *structure.SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage, label structure.Others) (bool,[]int) {
defer func() {
if err := recover(); err != nil {
logger.Error("姣斿瑙勫垯鏈夎", err.(string))
@@ -170,7 +86,7 @@
logger.Info("+++++++++++瑙勫垯寮�濮嬭繍琛�+++++++++++++++++褰撳墠澶ц鍒�--锛�", (*groupRule).GroupText)
//logger.Warn("浼犺繘鍘讳箣鍚庢槸浠�涔堝痉琛岋細",args.RuleResult["yolo"])
Compare(args, groupRule)
- resultSplice := []*LittleRuleResult{}
+ resultSplice := []*structure.LittleRuleResult{}
sdkNames := ""
polygonId := ""
// 鍏堣繃瀹屾潯浠惰鍒�
@@ -192,15 +108,14 @@
logger.Info("鏉′欢瑙勫垯缁撴灉锛�", ruleResult.Result)
// 濡傛灉缁撴灉涓虹湡锛屾妸杩欐潯瑙勫垯涓殑鍖哄煙缃负鏈夋晥
if strings.Contains(ruleResult.Result,"true") {
- areaMap.isEffective = true
+ areaMap.IsEffective = true
}
// 濡傛灉姝ょ粨鏋滀负鐪熶笖褰撳墠杩囩殑鏄痽olo绠楁硶锛屽簲璁颁笅姝よ鍒欐墍瀵瑰簲鐨剆dkName,鍙﹀锛岃繕瑕佸幓閲� (鍚庡姞锛氭妸姝ゆ潯瑙︾鐨勫尯鍩焛d涔熻褰曚笅鏉�)
if strings.Contains(ruleResult.Result, "true") && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(sdkNames, sdkName) {
- sdkNames = sdkName + ","
- polygonId = groupRule.Rules[j].PolygonId + ","
+ sdkNames = sdkName + " "
}
- if strings.Contains(ruleResult.Result, "true") && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(polygonId, groupRule.Rules[j].PolygonId) {
- polygonId = groupRule.Rules[j].PolygonId + ","
+ if strings.Contains(ruleResult.Result, "true") && !strings.Contains(polygonId, groupRule.Rules[j].PolygonId) {
+ polygonId = groupRule.Rules[j].PolygonId + " "
}
resultSplice = append(resultSplice, &ruleResult)
}
@@ -208,7 +123,6 @@
}
}
}
-
// 鍐嶈繃鍏朵粬鏁版嵁 杩欐鐩存帴寰楀埌缁撴灉锛堢湡鎴栧亣锛� 杩囩洰鏍囨暟閲�
for j := 0; j < len(groupRule.Rules); j++ {
for _, sdkData := range args.Sdkdata {
@@ -224,14 +138,14 @@
ruleResult := transferParameters(groupRule.Rules[j], areaMap)
if ruleResult.Result != "" {
if strings.Contains(ruleResult.Result,"true") {
- areaMap.isEffective = true
+ areaMap.IsEffective = true
}
logger.Info("鏁伴噺瑙勫垯缁撴灉锛�", ruleResult.Result)
if strings.Contains(ruleResult.Result, "true") && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(sdkNames, sdkName) {
- sdkNames = sdkName + ","
+ sdkNames = sdkName + " "
}
if strings.Contains(ruleResult.Result, "true") && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(polygonId, groupRule.Rules[j].PolygonId) {
- polygonId = groupRule.Rules[j].PolygonId + ","
+ polygonId = groupRule.Rules[j].PolygonId + " "
}
resultSplice = append(resultSplice, &ruleResult)
}
@@ -253,14 +167,14 @@
ruleResult := timeRuleResult(groupRule.Rules[j], areaMap)
if ruleResult.Result != "" {
if strings.Contains(ruleResult.Result,"true") {
- areaMap.isEffective = true
+ areaMap.IsEffective = true
}
logger.Info("鏃堕棿瑙勫垯缁撴灉锛�", ruleResult.Result)
if strings.Contains(ruleResult.Result, "true") && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(sdkNames, sdkName) {
- sdkNames = sdkName + ","
+ sdkNames = sdkName + " "
}
if strings.Contains(ruleResult.Result, "true") && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(polygonId, groupRule.Rules[j].PolygonId) {
- polygonId = groupRule.Rules[j].PolygonId + ","
+ polygonId = groupRule.Rules[j].PolygonId + " "
}
resultSplice = append(resultSplice, &ruleResult)
}
@@ -320,7 +234,7 @@
// 鎵撲汉鑴告爣绛惧拰yolo鏍囩
// 鏈�鍚庢垚鍔熸姤璀︽墠鎶婄鍚堟潯浠剁殑浜鸿劯鏁版嵁濉炶繘缁撴灉鏍囩閲�
// 閰嶄簡浜鸿劯鐨勭畻娉曟墠鎶婁汉鑴哥殑鏁版嵁鐢╁嚭鏉ユ墦鏍囩
- faces := []Arg{}
+ faces := []structure.Arg{}
faceFlag := false
for j := 0; j < len(groupRule.Rules); j++ {
if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a97e" || groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" {
@@ -330,7 +244,7 @@
for _, sdkData := range args.Sdkdata {
if sdkData.IpcId == "A8B73405-373D-4F23-CED2-A617EBD7EC55" && faceFlag { // sdkData閲屾湁浜鸿劯鏁版嵁涓旈厤缃簡绠楁硶鎵嶆妸绗﹀悎鏉′欢鐨勬暟鎹杩涙爣绛鹃噷鍘�
for _, areaMap := range sdkData.AreaMapList {
- if areaMap.isEffective {
+ if areaMap.IsEffective {
faces = append(faces, putFaceToResult(areaMap, faces)...)
}
}
@@ -342,7 +256,7 @@
//}
logger.Warn("___________________________________________________________________________缁堜簬璧板畬涓囬噷闀垮緛")
// 鎶婁粬浠殑浣嶇疆鏁版嵁涔熶紶涓嬪幓
- locations := []Rect{}
+ locations := []structure.TargetInfo{}
for _, sdkData := range args.Sdkdata {
if sdkData.IpcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && sdkNames != "" { // 鎶妝olo鏁版嵁鐨勫悇涓洰鏍囩殑鍧愭爣杈撳嚭鏂逛究鍚庨潰鐢绘
for _, areaMap := range sdkData.AreaMapList {
@@ -359,12 +273,12 @@
}
var labelTypes []int // 0涓簓olo鏍囩锛�1涓篺ace鏍囩 2涓轰袱鑰呮爣绛�
if sdkNames != "" {
- args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkNames, groupRule.GroupId, groupRule.DefenceState, groupRule.AlarmLevel, groupRule.GroupText, locations, polygonId, islink,label,})
+ args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]structure.Result), structure.Result{taskId, sdkNames, groupRule.GroupId, groupRule.DefenceState, groupRule.AlarmLevel, groupRule.GroupText, locations, polygonId, islink,label,})
labelTypes = append(labelTypes,0)
//logger.Info("-------------------yolo缁撴灉鏍囩闀垮害", len(args.RuleResult["yolo"].([]Result)))
}
if faceFlag {
- args.RuleResult["face"] = append(args.RuleResult["face"].([]FaceResult), FaceResult{Result{taskId, sdkNames, groupRule.GroupId, groupRule.DefenceState, groupRule.AlarmLevel, groupRule.GroupText, []Rect{}, polygonId, islink,label,}, faces})
+ args.RuleResult["face"] = append(args.RuleResult["face"].([]structure.FaceResult), structure.FaceResult{structure.Result{taskId, sdkNames, groupRule.GroupId, groupRule.DefenceState, groupRule.AlarmLevel, groupRule.GroupText, []structure.TargetInfo{}, polygonId, islink,label,}, faces})
//logger.Info("-------------------face缁撴灉鏍囩", len(args.RuleResult["face"].([]FaceResult)))
labelTypes = append(labelTypes,1)
}
@@ -384,10 +298,10 @@
}
}
-func putFaceToResult(am *AreaMap, faceList []Arg) []Arg {
- faces := []Arg{}
- if len(am.filterData) > 0 {
- for _, data := range am.filterData {
+func putFaceToResult(am *structure.AreaMap, faceList []structure.Arg) []structure.Arg {
+ faces := []structure.Arg{}
+ if len(am.FilterData) > 0 {
+ for _, data := range am.FilterData {
flag := true
for _, face := range faceList {
if data.Location.X == face.Location.X && data.Location.Y == face.Location.Y && data.Location.Width == face.Location.Width && data.Location.Height == face.Location.Height {
@@ -403,11 +317,15 @@
return faces
}
-func putYolosToResult(am *AreaMap) []Rect {
- locations := []Rect{}
- if len(am.filterData) > 0 {
- for _, data := range am.filterData {
- locations = append(locations, data.Location)
+func putYolosToResult(am *structure.AreaMap) []structure.TargetInfo {
+ locations := []structure.TargetInfo{}
+ if len(am.FilterData) > 0 {
+ for _, data := range am.FilterData {
+ location := structure.TargetInfo{}
+ location.Rect = data.Location
+ location.TargetId = data.Id
+ location.TargetScore = data.Score
+ locations = append(locations, location)
}
}
//logger.Println("-----------------------------------------------鍚浣犳槸绌虹殑锛�",faces)
@@ -415,16 +333,20 @@
}
// 鑱斿姩浠诲姟鐨勫鐞�
-func LinkTask(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage, label Others) {
+func LinkTask(args *structure.SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage, label structure.Others) {
// new涓�涓畾鏃跺櫒锛屽鏋滀互姝roupId涓烘爣蹇楃殑瀹氭椂鍣ㄤ笉瀛樺湪鐨勮瘽
logger.Info("------------------------------------------褰撳墠鏄仈鍔ㄤ换鍔★紝瑙勫垯鏄細", groupRule.GroupText)
var flag bool = true
var timeEle = TimeElement{N: 2, InitN: 2, GroupId: groupRule.GroupId}
+ rw.Lock()
for k, timeEle1 := range TimeEleList {
if k == groupRule.GroupId {
flag = false // 宸茬粡鏈変簡杩欎釜瀹氭椂鍣ㄥ氨缃负false 涓嶅啀鏂板
timeEle = *timeEle1
}
+ }
+ for _,ruleRe := range timeEle.RuleResults {
+ logger.Info("鑱斿姩鏁扮粍閲岀殑鏁版嵁----",ruleRe.CameraId,ruleRe.Sort)
}
if flag { // 濡傛灉杩樻病鏈夎繖涓畾鏃跺櫒鍏冪礌灏辨柊澧炰竴涓�
//timeEle := TimeElement{N: 2, InitN: 2, GroupId: groupRule.GroupId} // 鎵旇繘鍘讳竴涓畾鏃跺櫒鍏冪礌
@@ -434,6 +356,7 @@
// 寰楀嚭杩欑粍瀹屾暣瑙勫垯閲屾秹鍙婂埌鍑犱釜鎽勫儚鏈猴紝鍐冲畾鐫�鏁扮粍閲屾湁鍑犱釜缁撴瀯浣�,鍘婚噸娣诲姞鏂瑰紡
for j := 0; j < len(groupRule.Rules); j++ {
var flag1 bool = true
+ logger.Info("瑙勫垯缁勪俊鎭細",groupRule.Rules[j].CameraId)
for _, ruleRes := range TimeEleList[groupRule.GroupId].RuleResults {
logger.Info("鑱斿姩鏁扮粍閲岀殑鏁版嵁锛�",ruleRes.CameraId,ruleRes.Sort)
if groupRule.Rules[j].CameraId == ruleRes.CameraId {
@@ -441,10 +364,11 @@
}
}
if flag1 {
- TimeEleList[groupRule.GroupId].RuleResults = append(TimeEleList[groupRule.GroupId].RuleResults, &RuleResult{groupRule.Rules[j].CameraId, groupRule.Rules[j].Sort, "", groupRule.Rules[j].RuleWithPre, ResultMsg{}})
+ TimeEleList[groupRule.GroupId].RuleResults = append(TimeEleList[groupRule.GroupId].RuleResults, &RuleResult{groupRule.Rules[j].CameraId, groupRule.Rules[j].Sort, "", groupRule.Rules[j].RuleWithPre, structure.ResultMsg{}})
}
}
}
+ rw.Unlock()
// 寰�鏁扮粍閲岃祴鍊�
isOk,labelTypes := RunRule(args, groupRule, taskId, message, label)
if isOk {
@@ -457,28 +381,26 @@
tempMap := make(map[string]interface{})
for k, result := range args.RuleResult {
if k == "yolo" {
- tempMap[k] = []Result{}
- for _, res := range result.([]Result) {
- tempMap[k] = append(tempMap[k].([]Result), res)
+ tempMap[k] = []structure.Result{}
+ for _, res := range result.([]structure.Result) {
+ tempMap[k] = append(tempMap[k].([]structure.Result), res)
}
}
if k == "face" {
- tempMap[k] = []FaceResult{}
- for _, res := range result.([]FaceResult) {
- tempMap[k] = append(tempMap[k].([]FaceResult), res)
+ tempMap[k] = []structure.FaceResult{}
+ for _, res := range result.([]structure.FaceResult) {
+ tempMap[k] = append(tempMap[k].([]structure.FaceResult), res)
}
}
}
- va.CacheData = ResultMsg{message, tempMap}
+ va.CacheData = structure.ResultMsg{message, tempMap}
logger.Info("杩欎釜鎽勫儚鏈�--", args.CameraId, "--琚祴浜堜簡result", va.Result)
}
}
// 鍒ゆ柇缁撴灉鏁扮粍鏄惁瀹屾弧(鍗宠璧嬪�煎畬姣�)鍙緱鍑烘姤璀︾粨鏋�
var isPerfect = true
- logger.Info("鑱斿姩浠诲姟鏁扮粍锛�")
for _, va := range timeEle.RuleResults {
//logger.Info("---------------------鐬呯瀰褰撳墠鏁扮粍________________锛�", *va)
- logger.Info("鑱斿姩瀛愬厓绱狅細",va.Sort,va.RuleWithPre,va.Result,va.CameraId)
if va.Result == "" && va.RuleWithPre != "||" {
isPerfect = false
}
@@ -498,24 +420,26 @@
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
if result.(bool) {
logger.Info("___________________________________________________________________鑱斿姩浠诲姟鎶ヨ")
+ rw.RLock()
if TimeEleList[groupRule.GroupId] != nil { // 鏋佸伓灏旀湁鎯呭喌浼氱瓑浜巒il锛屼笉鐭ラ亾涓哄暐锛屽仛涓垽鏂互闃插畷鏈�
// 鎶婃暟缁勯噷缂撳瓨鐨勬暟鎹彇鍑烘潵涓�璧锋姤璀�
- label.LinkCache = []ResultMsg{}
+ label.LinkCache = []structure.ResultMsg{}
for _, ruleRes := range TimeEleList[groupRule.GroupId].RuleResults {
label.LinkCache = append(label.LinkCache, ruleRes.CacheData)
}
logger.Debug("鑱斿姩浠诲姟缂撳瓨浜嗗嚑涓暟鎹�", len(label.LinkCache))
- for i := 0; i < len(args.RuleResult["yolo"].([]Result)); i++ {
- if args.RuleResult["yolo"].([]Result)[i].RuleGroupId == groupRule.GroupId { // 鎶婅仈鍔ㄦ暟鎹拷鍔犱笂
- args.RuleResult["yolo"].([]Result)[i].Others.LinkCache = label.LinkCache
+ for i := 0; i < len(args.RuleResult["yolo"].([]structure.Result)); i++ {
+ if args.RuleResult["yolo"].([]structure.Result)[i].RuleGroupId == groupRule.GroupId { // 鎶婅仈鍔ㄦ暟鎹拷鍔犱笂
+ args.RuleResult["yolo"].([]structure.Result)[i].Others.LinkCache = label.LinkCache
}
}
- for i := 0; i < len(args.RuleResult["face"].([]FaceResult)); i++ {
- if args.RuleResult["face"].([]FaceResult)[i].RuleGroupId == groupRule.GroupId { // 鎶婅仈鍔ㄦ暟鎹拷鍔犱笂
- args.RuleResult["face"].([]FaceResult)[i].Others.LinkCache = label.LinkCache
+ for i := 0; i < len(args.RuleResult["face"].([]structure.FaceResult)); i++ {
+ if args.RuleResult["face"].([]structure.FaceResult)[i].RuleGroupId == groupRule.GroupId { // 鎶婅仈鍔ㄦ暟鎹拷鍔犱笂
+ args.RuleResult["face"].([]structure.FaceResult)[i].Others.LinkCache = label.LinkCache
}
}
}
+ rw.RUnlock()
}
}
} else {
@@ -523,15 +447,15 @@
// 鍊掓槸鎶婃墦鐨勭粍瑙勫垯鏍囩缁欏幓鎺変簡鍟�
for _,val := range labelTypes {
if val == 0 {
- if len(args.RuleResult["yolo"].([]Result)) >= 1 {
- lens := len(args.RuleResult["yolo"].([]Result))-1
- args.RuleResult["yolo"] = args.RuleResult["yolo"].([]Result)[0:lens]
+ if len(args.RuleResult["yolo"].([]structure.Result)) >= 1 {
+ lens := len(args.RuleResult["yolo"].([]structure.Result))-1
+ args.RuleResult["yolo"] = args.RuleResult["yolo"].([]structure.Result)[0:lens]
}
}
if val == 1 {
- if len(args.RuleResult["face"].([]FaceResult)) >= 1 {
- lens := len(args.RuleResult["face"].([]FaceResult))-1
- args.RuleResult["face"] = args.RuleResult["face"].([]FaceResult)[0:lens]
+ if len(args.RuleResult["face"].([]structure.FaceResult)) >= 1 {
+ lens := len(args.RuleResult["face"].([]structure.FaceResult))-1
+ args.RuleResult["face"] = args.RuleResult["face"].([]structure.FaceResult)[0:lens]
}
}
}
@@ -546,46 +470,47 @@
// va.Result = strconv.FormatBool(isOk)
// }
//}
+ rw.Lock()
for k, _ := range TimeEleList {
if k == groupRule.GroupId {
delete(TimeEleList, k)
logger.Debug("鍥犱负瀹氭椂鍣ㄧ殑涓�甯ф暟鎹粨鏋滀负false锛屽共鎺夊畾鏃跺櫒")
}
}
+ rw.Unlock()
// 鍥犱负鏈抚鏁版嵁涓嶇鍚堣鍒欙紝鎵�浠ヤ篃涓嶇敤缁熻缁撴灉鏁扮粍閲岀殑涓滆タ
-
}
}
// 杩囨护瑙勫垯鍏堢瓫閫夊嚭绗﹀悎鏉′欢鐨勭洰鏍囨暟閲�
-func filterRule(rule *protomsg.Rule, am *AreaMap) LittleRuleResult {
+func filterRule(rule *protomsg.Rule, am *structure.AreaMap) structure.LittleRuleResult {
if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a97e" || rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a972" {
// 澶勭悊鐨勬槸浜鸿劯绠楁硶 濡傛灉杩欐潯瑙勫垯閰嶇疆鐨勬槸浜鸿劯绠楁硶锛岃繃婊ゅ畬鏉′欢涔嬪悗鐩存帴寰楀嚭缁撴灉锛屽洜涓鸿偗瀹氭病鏈夋暟閲忔潯浠讹紝鑷繁鎷兼帴
//logger.Info("瑙勫垯鐨勭畻娉昳d鍜屽尯鍩熺殑绠楁硶id锛�", rule.SdkId, "===", am.sdkId)
- if rule.PolygonId == am.areaId { // 绠楁硶鍜屽尯鍩熼兘寰楀鐨勪笂
+ 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{}
+ return structure.LittleRuleResult{}
} else {
//logger.Debug("褰撳墠灏忚鍒欐槸锛�",rule)
flag := "false"
// 鎶婃病鏈夌浉浼艰�呯殑浜鸿劯浠巉ilterData涓垹闄�
- for index := 0; index < len(am.filterData); {
+ for index := 0; index < len(am.FilterData); {
// 灏嗚揪涓嶅埌闃堝�肩殑鐩镐技鑰呬粠鐩镐技鑰呮暟缁勪腑鍒犻櫎
- logger.Info("鐪嬬湅鐩镐技鑰呬汉鏁帮細",len(am.filterData[index].Liker))
- if len(am.filterData[index].Liker) == 0 {
+ logger.Info("鐪嬬湅鐩镐技鑰呬汉鏁帮細",len(am.FilterData[index].Liker))
+ if len(am.FilterData[index].Liker) == 0 {
// Go 璇█涓垏鐗囧垹闄ゅ厓绱犵殑鏈川鏄細浠ヨ鍒犻櫎鍏冪礌涓哄垎鐣岀偣锛屽皢鍓嶅悗涓や釜閮ㄥ垎鐨勫唴瀛橀噸鏂拌繛鎺ヨ捣鏉ャ�備笉鐢ㄦ��鐤戯紝鏁扮粍鍒犻櫎鍏冪礌灏辫繖涔堝潙鐖�
- am.filterData = append(am.filterData[:index], am.filterData[index+1:]...)
+ am.FilterData = append(am.FilterData[:index], am.FilterData[index+1:]...)
} else {
index++
}
}
- if len(am.filterData) > 0 {
+ if len(am.FilterData) > 0 {
flag = "true"
}
- logger.Info("---------浜鸿劯姣斿绗﹀悎鏉′欢鐨勬暟閲忎负锛�",len(am.filterData))
- return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + flag, rule.Sort}
+ logger.Info("---------浜鸿劯姣斿绗﹀悎鏉′欢鐨勬暟閲忎负锛�",len(am.FilterData))
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + flag, rule.Sort}
}
}
if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a97e" { // 浜鸿劯妫�娴�
@@ -593,18 +518,18 @@
if rule.Operator == "==" || rule.Operator == ">=" || rule.Operator == "<=" || rule.Operator == "<" || rule.Operator == ">" || rule.Operator == "!=" {
// 濡傛灉鏄笉瑙勭煩鐨勮繛鎺ョ缁熺粺杩斿洖false 瑙勫垯涔熷彧鑳藉垽鏂汉鑴哥殑鐩镐技搴︼紝鎵�浠ヤ笉瀛樺湪鍒殑杩炴帴绗�
if rule.SdkArgAlias == "score" || rule.SdkArgAlias == "proportion" || rule.SdkArgAlias == "size" { // 鍒ゆ柇鐨勬槸鐩镐技鍊硷紝鍗犳瘮锛屽昂瀵哥瓑杩囨护鏉′欢锛屽鏋滃啀鏈夛紝杩樺彲浠ュ啀鍔�
- logger.Info("-----------------------杩囪鍒欎箣鍓嶅尯鍩熷唴鐨勪汉鑴告暟閲忎负锛�",am.targetNum)
- var args []*Arg
+ logger.Info("-----------------------杩囪鍒欎箣鍓嶅尯鍩熷唴鐨勪汉鑴告暟閲忎负锛�",am.TargetNum)
+ var args []*structure.Arg
if rule.RuleWithPre == "&&" {
- args = am.filterData
+ args = am.FilterData
//logger.Info("杩囨护鍚庣殑args鐨勯暱搴︿负锛�",len(args))
} else {
- args = am.args
+ args = am.Args
//涓嶆竻绌轰箣鍓嶇殑杩囨护鏁版嵁锛岀户缁
//logger.Info("娌¤繃婊ょ殑args鐨勯暱搴︿负锛�",len(args))
}
// 鍏堟竻绌鸿繃婊ゅ悗鐨勬暟鎹紝鍐嶅線閲屽鏈杩囨护鍚庣殑鏁版嵁
- am.filterData = am.filterData[0:0]
+ am.FilterData = am.FilterData[0:0]
//logger.Info("-----------------------浜鸿劯杩囨护鐨刟rgs閲岀殑鏁伴噺锛�", len(args))
for _, arg := range args {
var formula string
@@ -621,41 +546,39 @@
expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
if result.(bool) {
- am.filterData = append(am.filterData, arg) // 寰楀埌绗﹀悎鏉′欢鐨勮繃婊ゆ暟鎹�
+ am.FilterData = append(am.FilterData, arg) // 寰楀埌绗﹀悎鏉′欢鐨勮繃婊ゆ暟鎹�
}
}
- am.targetNum = len(am.filterData) // 鎶婄鍚堟潯浠剁殑鐩爣鏁伴噺鏇存柊鍒皌argetNum瀛楁
- logger.Info("杩囧畬鏉′欢鍚庣殑鐩爣鏁伴噺涓猴細",am.targetNum)
- if am.targetNum > 0 {
+ am.TargetNum = len(am.FilterData) // 鎶婄鍚堟潯浠剁殑鐩爣鏁伴噺鏇存柊鍒皌argetNum瀛楁
+ logger.Info("杩囧畬鏉′欢鍚庣殑鐩爣鏁伴噺涓猴細",am.TargetNum)
+ if am.TargetNum > 0 {
logger.Info("锛侊紒锛侊紒锛侊紒锛侊紒锛佷汉鑴告娴嬫垚鍔�")
- return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "true", rule.Sort}
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort}
} else {
- return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort}
}
- } else {
- return LittleRuleResult{}
}
- } else {
- return LittleRuleResult{}
+ } else if rule.SdkArgAlias == "" { // 浠�涔堝弬鏁伴兘涓嶉厤鐨勬儏鍐�
+ if am.TargetNum > 0 {
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort}
+ } else {
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+ }
}
- } else {
- return LittleRuleResult{}
}
- } else {
- return LittleRuleResult{}
}
} else {
// 澶勭悊鐨勯兘鏄痽olo鏁版嵁
- if rule.PolygonId == am.areaId { // 棣栧厛杩欐潯瑙勫垯寰楁槸杩欎釜绠楁硶鐨勮鍒欙紝鍏舵瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
+ if rule.PolygonId == am.AreaId { // 棣栧厛杩欐潯瑙勫垯寰楁槸杩欎釜绠楁硶鐨勮鍒欙紝鍏舵瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
if rule.SdkArgAlias == "score" || rule.SdkArgAlias == "proportion" || rule.SdkArgAlias == "size" { // 鍒ゆ柇鐨勬槸鐩镐技鍊硷紝鍗犳瘮锛屽昂瀵哥瓑杩囨护鏉′欢锛屽鏋滃啀鏈夛紝杩樺彲浠ュ啀鍔�
- var args []*Arg
+ var args []*structure.Arg
if rule.RuleWithPre == "&&" {
- args = am.filterData
+ args = am.FilterData
} else {
- args = am.args
+ args = am.Args
}
// 鍏堟竻绌鸿繃婊ゅ悗鐨勬暟鎹紝鍐嶅線閲屽鏈杩囨护鍚庣殑鏁版嵁
- am.filterData = am.filterData[0:0]
+ am.FilterData = am.FilterData[0:0]
//logger.Debug("鐪嬬湅args锛氾細锛氾細锛�", args)
for _, arg := range args {
var formula string
@@ -672,32 +595,35 @@
expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
if result.(bool) {
- am.filterData = append(am.filterData, arg) // 寰楀埌绗﹀悎鏉′欢鐨勮繃婊ゆ暟鎹�
+ am.FilterData = append(am.FilterData, arg) // 寰楀埌绗﹀悎鏉′欢鐨勮繃婊ゆ暟鎹�
}
}
- am.targetNum = len(am.filterData) // 鎶婄鍚堟潯浠剁殑鐩爣鏁伴噺鏇存柊鍒皌argetNum瀛楁
- if am.targetNum > 0 {
- return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "true", rule.Sort}
+ am.TargetNum = len(am.FilterData) // 鎶婄鍚堟潯浠剁殑鐩爣鏁伴噺鏇存柊鍒皌argetNum瀛楁
+ if am.TargetNum > 0 {
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort}
} else {
- return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort}
}
- } else {
- return LittleRuleResult{}
+ } else if rule.SdkArgAlias == "" {
+ if am.TargetNum > 0 {
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort}
+ } else {
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+ }
}
-
- } else {
- return LittleRuleResult{}
}
}
+ return structure.LittleRuleResult{}
}
// 濡傛灉鏈夋寔缁椂闂存潯浠剁淮鎶ゅ紑鍚竴涓畾鏃跺櫒
-func duration(rule *protomsg.Rule, groupId string, am *AreaMap, args *SdkDatas, message *protomsg.SdkMessage) {
- if rule.PolygonId == am.areaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓� 閰嶇疆鐨勭畻娉曡瀵圭殑涓�
+func duration(rule *protomsg.Rule, groupId string, am *structure.AreaMap, args *structure.SdkDatas, message *protomsg.SdkMessage) {
+ if rule.PolygonId == am.AreaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓� 閰嶇疆鐨勭畻娉曡瀵圭殑涓�
if rule.SdkArgAlias == "duration" { //
logger.Info("褰撳墠灏忚鍒欐槸锛�---------", rule)
// 鍏堢湅鐪嬪畾鏃跺櫒鍏冪礌闃熷垪涓槸鍚︽湁杩欐潯瑙勫垯鐨勫畾鏃跺櫒,濡傛灉鏈夊氨涓嶈兘鍐嶆鍒涘缓浜�
+ rw.Lock()
var flag bool = true
for k, _ := range TimeEleList {
if k == groupId+"+"+rule.Id {
@@ -708,27 +634,28 @@
if flag {
timeLength, _ := strconv.Atoi(rule.SdkArgValue)
- timeEle := TimeElement{N: timeLength, InitN: timeLength, AlarmFlag: false, BufferFlag: 10, CacheSdkData: ResultMsg{message, args.RuleResult}} // 鎵旇繘鍘讳竴涓畾鏃跺櫒鍏冪礌锛堝苟缂撳瓨褰撳墠鐢婚潰甯ф暟鎹級
+ timeEle := TimeElement{N: timeLength, InitN: timeLength, AlarmFlag: false, BufferFlag: 10, CacheSdkData: structure.ResultMsg{message, args.RuleResult}} // 鎵旇繘鍘讳竴涓畾鏃跺櫒鍏冪礌锛堝苟缂撳瓨褰撳墠鐢婚潰甯ф暟鎹級
//TimeEleList = make(map[string]timeElement)
TimeEleList[groupId+"+"+rule.Id] = &timeEle // 瀹氭椂鍣ㄥ厓绱犱互褰撳墠鎸佺画鏃堕棿灏忚鍒檌d涓洪敭
logger.Info("鍒涘缓浜嗚鏁板櫒")
}
+ rw.Unlock()
}
}
}
// 缁欐暟鎹簱鐨勮鍒欒〃杈惧紡浠ｅ弬 args: 涓�鏉″瓙瑙勫垯锛屽尯鍩熸暟鎹�
-func transferParameters(rule *protomsg.Rule, am *AreaMap) LittleRuleResult {
- if rule.PolygonId == am.areaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
+func transferParameters(rule *protomsg.Rule, am *structure.AreaMap) structure.LittleRuleResult {
+ if rule.PolygonId == am.AreaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
if rule.SdkArgAlias == "objCount" { // 濡傛灉鍙傛暟鏄鍖哄煙鍐呯洰鏍囨暟閲� 鍗硑olo 浜鸿劯涓嶄細鏈夋暟閲�
//logger.Info("褰撳墠灏忚鍒欐槸锛�---------", rule)
//logger.Info("寰楀嚭缁撴灉闃舵", "姣旇緝鐨勮鍒欐槸锛�", rule)
if rule.Operator == "" {
- return LittleRuleResult{am.sdkName, strconv.Itoa(am.targetNum) + "" + rule.RuleWithPre, rule.Sort} // 濡傛灉鍚庨潰涓嶈窡鎿嶄綔绗﹀氨鐩存帴杩斿洖鏁伴噺 姣斿瑕佽窡涓嬩竴涓尯鍩熸瘮杈冩暟閲忕殑灏辩洿鎺ヨ繑鍥炴湰鍖哄煙鐨勬暟閲�
+ return structure.LittleRuleResult{am.SdkName, strconv.Itoa(am.TargetNum) + "" + rule.RuleWithPre, rule.Sort} // 濡傛灉鍚庨潰涓嶈窡鎿嶄綔绗﹀氨鐩存帴杩斿洖鏁伴噺 姣斿瑕佽窡涓嬩竴涓尯鍩熸瘮杈冩暟閲忕殑灏辩洿鎺ヨ繑鍥炴湰鍖哄煙鐨勬暟閲�
}
//args := am.targetNum targetNum 宸叉垚鎵�鏈夌洰鏍囩殑鎬绘暟閲忥紝杩欓噷鍙畻yolo鐨�
var num int = 0
- for _, data := range am.filterData {
+ for _, data := range am.FilterData {
if data.IsYolo {
num++
}
@@ -736,26 +663,14 @@
formula := strconv.Itoa(num) + " " + rule.Operator + " " + rule.SdkArgValue
expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
- return LittleRuleResult{am.sdkName, rule.RuleWithPre + " " + strconv.FormatBool(result.(bool)), rule.Sort}
+ return structure.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{}
+ return structure.LittleRuleResult{}
}
-func timeRuleResult(rule *protomsg.Rule, am *AreaMap) LittleRuleResult {
- if rule.PolygonId == am.areaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
+func timeRuleResult(rule *protomsg.Rule, am *structure.AreaMap) structure.LittleRuleResult {
+ if rule.PolygonId == am.AreaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
if rule.SdkArgAlias == "time_rule" { // 鍒ゆ柇鏄惁绗﹀悎鏃堕棿瑙�
//logger.Info("----------褰撳墠鏃堕棿瑙勫垯锛�---------", rule)
// 鏍规嵁鏀惧�煎瓧娈甸噷瀛樼殑鏃堕棿瑙勫垯鐨刬d鍘诲彟涓�涓〃閲屾煡闇�瑕佹瘮瀵圭殑鏃堕棿娈碉紙姣斿褰撳墠鏃堕棿鏄懆涓夛紝搴旀牴鎹尯鍩焛d鏌ュ嚭鍏跺懆涓夌殑鍑犱釜甯冮槻鏃堕棿娈碉紝鏁扮粍锛�
@@ -770,11 +685,11 @@
if rule.Operator == "satisfy" || rule.Operator == "==" { // 婊¤冻鎵�閫夌殑鏃堕棿瑙勫垯
flag := "false"
for _, timeSlot := range timeList {
- formula := "'" + timeSlot.Start + "'" + "<" + "'" + am.time + "'"
+ formula := "'" + timeSlot.Start + "'" + "<" + "'" + am.Time + "'"
expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
- formula1 := "'" + timeSlot.End + "'" + ">" + "'" + am.time + "'"
+ formula1 := "'" + timeSlot.End + "'" + ">" + "'" + am.Time + "'"
expression1, _ := govaluate.NewEvaluableExpression(formula1) // 寰楀埌鏁板鍏紡
result1, _ := expression1.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
//logger.Info("鐪嬬湅杩欎袱灏婂ぇ绁�", result, result1)
@@ -783,18 +698,18 @@
break
}
}
- return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + flag, rule.Sort}
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + flag, rule.Sort}
}
if rule.Operator == "unsatisfy" || rule.Operator == "!=" { // 涓嶆弧瓒虫墍閫夌殑鏃堕棿瑙勫垯
flag := "true"
for _, timeSlot := range timeList {
- formula := "'" + timeSlot.Start + "'" + " < " + "'" + am.time + "'"
+ formula := "'" + timeSlot.Start + "'" + " < " + "'" + am.Time + "'"
//logger.Info("-----------------鏃堕棿瑙勫垯涓嶆弧瓒崇殑鍏紡start锛�", formula)
expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
- formula1 := "'" + timeSlot.End + "'" + " > " + "'" + am.time + "'"
+ formula1 := "'" + timeSlot.End + "'" + " > " + "'" + am.Time + "'"
//logger.Info("-----------------鏃堕棿瑙勫垯涓嶆弧瓒崇殑鍏紡end锛�", formula1)
expression1, _ := govaluate.NewEvaluableExpression(formula1) // 寰楀埌鏁板鍏紡
result1, _ := expression1.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
@@ -803,10 +718,10 @@
break
}
}
- return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + flag, rule.Sort}
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + flag, rule.Sort}
}
}
}
- return LittleRuleResult{}
+ return structure.LittleRuleResult{}
}
--
Gitblit v1.8.0