From ee960033e881a16f0243a349036b7fdac8975228 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 29 七月 2019 15:05:30 +0800
Subject: [PATCH] 人脸多区域坐标去重
---
ruleserver/ruleToformula.go | 515 ++++++++++++--------------------------------------------
1 files changed, 111 insertions(+), 404 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index fd32535..3986576 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -1,7 +1,7 @@
package ruleserver
import (
- "encoding/json"
+ "fmt"
"ruleprocess/cache"
"ruleprocess/logger"
"sort"
@@ -9,56 +9,9 @@
"strings"
"time"
- bigCache "basic.com/pubsub/cache.git"
- "basic.com/pubsub/cache.git/esutil"
"basic.com/pubsub/protomsg.git"
"github.com/knetic/govaluate"
)
-
-func init() {
- bigCache.Init()
-}
-
-// 浠诲姟
-type Task struct {
- camID string //鎽勫儚鏈篒D
- taskID string //浠诲姟ID
- sdkID string //绠楁硶ID
- areaId string //鍖哄煙id
- areaName string //鍖哄煙鍚嶇О
- topicType string //瑙勫垯涓婚绫诲瀷锛岀洰鏍�/鎸佺画鏃堕棿/鐏垫晱搴︾瓑
-}
-
-// 鏁版嵁搴撲腑鐨勮鍒欏厓绱�
-type SingleRule struct {
- Task
- operatorType string // 鎿嶄綔绗︼紝>=,==...
- compareType string // 瀵规瘮绫诲瀷锛屽�硷紝琚�夐」
- compareValue string // 瀵规瘮鐨勫��
- ruleWithPrevious string // 璺熶笂涓�鏉＄殑閫昏緫鍏崇郴
- groupId string // 澶ц鍒檌d
-}
-
-// 鏁版嵁搴撲腑鍗曟潯瀛愯鍒� 璺熸暟鎹簱鏄犲皠鐨�
-type CameraTaskArg struct {
- Id string `json:"id"`
- CameraTaskId string `json:"camera_task_id"`
- CameraId string `json:"camera_id"`
- PolygonId string `json:"polygon_id"`
- SdkId string `json:"sdk_id"`
- SdkArgAlias string `json:"sdk_arg_alias"`
- Operator string `json:"operator"` //鎿嶄綔绗︼紝>=,==...
- OperatorType string `json:"operator_type"` //瀵规瘮绫诲瀷锛屽�硷紝琚�夐」
- SdkArgValue string `json:"sdk_arg_value"` //瀵规瘮鐨勫��
- Sort int `json:"sort"`
- RuleWithPrevious string `json:"rule_with_previous"` //璺熶笂涓�鏉＄殑閫昏緫鍏崇郴
- GroupId string `json:"group_id"` //澶ц鍒檌d
-}
-
-// sdk杈撳嚭鐨勫浘鐗囨彁鍙栧弬鏁版暟鎹箣鍚庣殑鏁版嵁闆嗗悎锛屼篃鏄紶缁欎笅涓�姝ョ敤浜庤祴鍊肩殑鏁版嵁闆嗗悎
-type AreaMapList struct {
- areaMapList []AreaMap
-}
// 姣忎釜鐩爣鐨勫弬鏁帮細鐩镐技搴︼紝鍗犳瘮锛屽昂瀵�
type Arg struct {
@@ -69,12 +22,7 @@
Location Rect // 璁颁笅姣忎釜鐩爣鐨勪綅缃弬鏁帮紝鏈�鍚庣粰缁撴灉瑁呴厤浜鸿劯鏁版嵁鐨勬椂鍊欑敤鐨勫埌
Feature []byte
ThftRes protomsg.ThftResult
- Liker []*protomsg.Baseinfo
-}
-
-type LikePerson struct {
- Id string // 涓庝箣鐩镐技鐨勫簳搴撲汉鍛樼殑id
- Score float64 // 涓庡簳搴撲汉鍛樼殑鐩镐技鍊�
+ Liker []*BaseInfo
}
// 姣忎釜鍖哄煙鍐呯殑鍥剧墖鏁版嵁闆嗗悎
@@ -121,15 +69,13 @@
// 浠庣畻娉曟ā鍧楀効鎷挎潵鐨勫涓�甯у浘鍍忓悇涓畻娉曟彁鍙栫殑鏁版嵁闆嗗悎
type SdkDatas struct {
CameraId string
+ TaskId string
Sdkdata []*SdkData
- RuleResult map[string]interface{} // 杩囧畬瑙勫垯鍚庢墦鐨勬爣绛� face: []Arg yolo: []Result cacheData: SdkDatas
+ RuleResult map[string]interface{} // 杩囧畬瑙勫垯鍚庢墦鐨勬爣绛� face: []Arg, yolo: []Result, cacheData: SdkDatas, timeLabel: 0,1,2,3,4,5
}
-// 灏嗕紶閫掕繃鏉ョ殑鍙傛暟杞寲涓�
-//protomsg.SdkMessage.TaskLabel.SdkmsgWithTask.sdkdata
-
type ResultMsg struct {
- protomsg.SdkMessage
+ *protomsg.SdkMessage
RuleResult map[string]interface{} // 杩囧畬瑙勫垯鍚庢墦鐨勬爣绛�
}
@@ -138,10 +84,17 @@
TaskId string // 浠诲姟id
SdkName string
RuleGroupId string // 瑙勫垯缁刬d
+ DefenceState bool //鏄惁甯冮槻
AlarmLevel int32 // 鎶ヨ绛夌骇
RuleText string // 鏂囧瓧鐗堣鍒欑粍
Location []Rect // 鐩爣鐨勫潗鏍�
AlarmPolygon string // 瑙﹀彂鐨勬姤璀︽
+}
+
+// 杩囪鍒欏簱鎵撲笂鐨勬爣绛�
+type FaceResult struct {
+ Result
+ Args []Arg
}
type LittleRuleResult struct {
SdkName string // 璁板綍涓嬫缁撴灉鏄摢涓猻dk鐨勭粨鏋�
@@ -149,74 +102,36 @@
Sort int32
}
-//
-type Face struct {
- Location Rect // 浜鸿劯鍧愭爣妗�
- SdkName string
- ThftRes protomsg.ThftResult
- Liker []LikePerson // 鐩镐技浜哄憳锛堝鏋滄槸鍗曠函鐨勪汉鑴告娴嬪彲鏃犳椤癸級
-}
-
-// 鍖呭惈N鏉¤鍒欏厓绱犵殑涓�鏁存潯瑙勫垯
-type CompleteRule struct {
- rule string
-}
-
-// 鏍规嵁鎽勫儚鏈篿d鎷垮埌鎽勫儚鏈烘墍鏈夊尯鍩�
-func GetPolygons(cameraId string) []protomsg.CameraPolygon {
- var cameraPolygons []protomsg.CameraPolygon
- cameraPolygons = cache.GetPolygonsByCameraId(cameraId)
- logger.Debug("------=======鏌ョ湅涓嬪叏閮ㄥ尯鍩燂細",cameraPolygons)
- return cameraPolygons
-}
-
-// 鎶妔dk浠庢暟鎹抚涓婃彁鍙栫殑鎸夌収鍖哄煙鍒嗙被褰掔疆
-func SdkDataFormat(cameraId string, arg *SdkData, cameraPolygons []protomsg.CameraPolygon) {
- logger.Info("==================================鏈瑂dkData涓В鍑烘潵鐨勭洰鏍囨暟鎹�=======================================")
- for _, photo := range arg.Photo {
- logger.Info("--------瑙ｆ瀽鍑烘潵鐨勬暟鎹�---", cameraId, arg.IpcId, photo.Rects, photo.Score)
- }
- for _, polygon := range cameraPolygons {
- //logger.Println("++++++鍦ㄨ繖鍎跨湅涓�涓嬪尯鍩熷晩:", polygon.Polygon)
- areaMap := AreaMap{cameraId: cameraId, areaId: polygon.Id, areaJson: polygon.Polygon, triggerLine: polygon.TriggerLine, directionLine: polygon.DirectionLine}
- // 涓烘瘡涓憚鍍忔満鍖哄煙濉厖鏁版嵁
- areaMap.CountAreaObjs(arg)
- arg.AreaMapList = append(arg.AreaMapList, &areaMap)
- }
-}
-
// 瀵瑰崟甯у浘鍍忕殑鍒ゆ柇 thisSdkDatas 褰撳墠浼犲叆鐨勮繖甯ф暟鎹紝cacheSdkData 瀹氭椂鍣ㄩ噷缂撳瓨鐨勪竴甯ф暟鎹� 娌℃湁灏辫繑鍥瀗il (thisSdkDatas SdkDatas, cacheSdkDatas SdkDatas)
-func Judge(args *SdkDatas) {
+func Judge(args *SdkDatas, message *protomsg.SdkMessage) {
if len(args.Sdkdata) > 0 {
// 鎷垮埌鏈憚鍍忔満鐨勫尯鍩�
cameraPolygons := GetPolygons(args.CameraId)
// 鎶婃墍鏈夌殑sdk鎻愬彇鐨勬暟鎹兘鎸夋墍灞炴憚鍍忔満鐨勫尯鍩熷綊缃�
+ logger.Debug("褰撳墠鎽勫儚鏈篿d涓猴細",message.Cid,"褰撳墠鎽勫儚鏈烘墽琛岀殑浠诲姟鏄細",message.Tasklab.Taskname)
for _, arg := range args.Sdkdata {
SdkDataFormat(args.CameraId, arg, cameraPolygons)
}
// 璺戞湰鎽勫儚鏈虹殑鎵�鏈夎鍒欑粍 涓�缁勪竴缁勮窇
- taskRuleList := GetRuleGroup(args.CameraId) // 鏈憚鍍忔満涓嬫墍鏈変换鍔＄粍
+ taskGroup := GetRuleGroup(args.CameraId, args.TaskId) // 鏈憚鍍忔満涓嬫墍鏈変换鍔＄粍
//logger.Println("鐪嬩笅鎽勫儚鏈轰笅鐨勪换鍔＄粍锛�",taskRuleList)
// 寰楀埌灞炰簬璇ユ憚鍍忔満鐨勮嫢骞茬粍浠诲姟鐨勫畬鏁磋鍒欙紙璺熸瘡涓�鏉″畬鏁磋鍒欐瘮杈冧箣鍚庡緱鍑烘湰寮犲浘鍍忓浜庢煇涓鍒欐槸鍚︽姤璀︾殑缁撴灉銆傛斁杩沵ap锛屾瘮濡傛湰甯у浘鍍忕殑id锛屾墍纰版挒鎴愬姛鐨勮鍒檌d锛�
args.RuleResult = make(map[string]interface{})
args.RuleResult["yolo"] = []Result{}
- args.RuleResult["face"] = []Arg{}
- if len(taskRuleList) > 0 {
- for _, taskRule := range taskRuleList {
+ args.RuleResult["face"] = []FaceResult{}
+ if taskGroup != nil && len(taskGroup.GroupRules) > 0 {
+ for _, group := range taskGroup.GroupRules {
//logger.Println("------------------------------浠诲姟瑙勫垯锛�",taskRule)
- ruleList := taskRule.GroupRules // 鑾峰彇鐨勬槸task涓嬮潰鐨勪换鍔＄粍
- taskId := taskRule.TaskId
+ taskId := taskGroup.TaskId
//logger.Println("------------鏈粍浠诲姟涓嬬殑瑙勫垯缁勭殑鏁伴噺锛�",len(ruleList))
- for i := 0; i < len(ruleList); i++ {
- temp := ruleList[i].Rules // temp涓轰竴缁勫畬鏁磋鍒� 鍦ㄦ闇�瑕佸垽鏂鍒欐槸鍚︽槸鑱斿姩瑙勫垯
- if len(temp) > 0 {
- if ruleList[i].SetType == "linkTask" {
- // groupId涓惈鏈塴ink鍒欎负鑱斿姩浠诲姟
- LinkTask(args, ruleList[i], taskId)
- } else {
- // 鐙珛浠诲姟鐨勫鐞�
- RunRule(args, ruleList[i], taskId)
- }
+ temp := group.Rules // temp涓轰竴缁勫畬鏁磋鍒� 鍦ㄦ闇�瑕佸垽鏂鍒欐槸鍚︽槸鑱斿姩瑙勫垯
+ if len(temp) > 0 {
+ if group.SetType == "linkTask" {
+ // groupId涓惈鏈塴ink鍒欎负鑱斿姩浠诲姟
+ LinkTask(args, group, taskId, message)
+ } else {
+ // 鐙珛浠诲姟鐨勫鐞�
+ RunRule(args, group, taskId, message)
}
}
}
@@ -224,89 +139,7 @@
}
}
-// 缁欑洰鏍囧～鍏卨iker
-func (arg *Arg) fillLiker() {
- bytes := bigCache.Getdbpersonmsg("", arg.Feature, true)
- var m map[string]float32
- err1 := json.Unmarshal(bytes, &m)
- if err1 != nil {
- logger.Error("getBaseInfo瑙ｅ帇閿欒", err1)
- }
- //logger.Info("----------------------------------------map鏄�", m)
- for key, val := range m {
- baseinfo, err1 := esutil.Dbpersoninfosbyid(key)
- if err1 != nil {
- logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊", err1)
- }
- baseinfo.CompareScore = Retain(val)
- arg.Liker = append(arg.Liker, &baseinfo)
- }
- //logger.Info("------------------绗竴娆＄湅args:",*arg)
-}
-// 淇濈暀鍥涗綅灏忔暟
-func Retain(f float32)(float32) {
- s:= strconv.FormatFloat(float64(f), 'f', 4, 64)
- v, err := strconv.ParseFloat(s, 32)
- if err != nil {
- logger.Error("淇濈暀鍥涗綅灏忔暟杞崲閿欒")
- }
- return float32(v)
-}
-func Compare(args *SdkDatas, groupRule *protomsg.GroupRule) {
- compareFlag := 0
- tableIds := ""
- // 鐪嬬湅鏄惁鏈夊彧閰嶄汉鑴告瘮瀵圭畻娉曚絾娌℃湁閰嶅姣斿簱鐨勮鍒欙紝濡傛灉鏈夛紝鍒欐瘮瀵瑰璞′负鍏ㄩ儴搴曞簱
- for j := 0; j < len(groupRule.Rules); j++ {
- if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" { // 閰嶄簡浜鸿劯姣斿
- if groupRule.Rules[j].SdkArgAlias == "compareBase" && groupRule.Rules[j].SdkArgValue != "" { // 閰嶄簡姣斿搴曞簱鐨勫弬鏁颁絾娌℃湁閰嶅叏閮ㄥ簳搴�
- compareFlag = 2
- tableIds = groupRule.Rules[j].SdkArgValue + "," // 鏈�鍚庝細澶氫竴涓猼ableId锛屽垏鍑烘潵鐨勬暟缁勫彇len-1灏卞彲浠�
- }
- if groupRule.Rules[j].SdkArgAlias == "compareBase" && groupRule.Rules[j].SdkArgValue == "" { // 閰嶇殑鍙傛暟鏄瘮瀵瑰叏閮ㄥ簳搴�
- compareFlag = 1
- }
- }
- }
- // 涓轰簡娴嬭瘯浣滀笅寮婏紝鐩存帴璁╁叾姣斿鍏ㄩ儴搴曞簱
- //compareFlag = 1
- if compareFlag == 0 {
- logger.Info("娌℃湁閰嶇疆瀵规瘮搴曞簱鍙傛暟")
- return
- }
- for j := 0; j < len(groupRule.Rules); j++ {
- if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" {
- for _, sdkData := range args.Sdkdata {
- if sdkData.IpcId == "A8B73405-373D-4F23-CED2-A617EBD7EC55" { // 鎼滅储鍒颁汉鑴告娴嬬殑sdkdata 鐜板湪鍏充簬浜鸿劯鐨勫彧鏈変粬涓�涓猻dk锛屽叏鎵句粬
- logger.Info("============================================杩涜浜鸿劯瀵规瘮")
- for _, areaMap := range sdkData.AreaMapList {
- logger.Info("-------------浜鸿劯姣斿涔嬪墠鐩爣鏁伴噺",len(areaMap.args))
- // 鎷垮尯鍩熶腑姣忎釜浜鸿劯鐗瑰緛鍊煎幓瀵规瘮锛屽～鍏呭叾liker
- if groupRule.Rules[j].PolygonId == areaMap.areaId {
- logger.Info("--------------鐪嬬湅compareFlag鐨勫�硷細",compareFlag)
- for _, arg := range areaMap.args {
- if compareFlag == 1 {
- arg.fillLiker()
- }
- if compareFlag == 2 {
- array := strings.Split(tableIds, ",")
- logger.Info("--------------------------鐪嬬湅瀵规瘮搴曞簱鐨勫��;",array)
- for i := 0; i < len(array)-1; i++ {
- arg.fillLiker()
- }
- }
- logger.Info("-------------------鎴愬姛缁檒iker璧嬪��,闀垮害涓猴細", len(arg.Liker))
- }
- areaMap.filterData = areaMap.args
- //logger.Info("=======绗竴娆＄湅args锛�",(areaMap.filterData))
- }
- logger.Info("-------------------------------浜鸿劯瀵规瘮涔嬪悗鐨勭洰鏍囨暟閲�",len(areaMap.args))
- }
- }
- }
- }
- }
-}
-func RunRule(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string) bool {
+func RunRule(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage) bool {
defer func() {
if err := recover(); err != nil {
logger.Error("姣斿瑙勫垯鏈夎", err.(string))
@@ -329,11 +162,7 @@
sdkName := sdk.SdkName
logger.Info("瑙勫垯鐨刬pcId涓巗dkData鐨処pcId:", ipcId, "===", sdkData.IpcId)
if ipcId == sdkData.IpcId {
- logger.Info("褰撳墠璧扮殑瑙勫垯鐨勭畻娉曟槸--锛�", sdkName, "---")
- logger.Info("========================鏈夊嚑涓尯鍩燂細",len(sdkData.AreaMapList))
- for _,areaMap := range sdkData.AreaMapList{
- logger.Info("妫�鏌ヤ竴涓嬪尯鍩熺殑鍏蜂綋鏁版嵁锛�",areaMap.areaJson)
- }
+ logger.Info("褰撳墠璧扮殑瑙勫垯鏄�--锛�", sdkName, "---","")
for _, areaMap := range sdkData.AreaMapList {
ruleResult := filterRule(groupRule.Rules[j], areaMap)
if ruleResult.Result != "" {
@@ -406,22 +235,7 @@
}
}
}
- // 鏈�鍚庤繃鎸佺画鏃堕棿绛夋椂闂寸淮搴︾殑鏉′欢
- for j := 0; j < len(groupRule.Rules); j++ {
- for _, sdkData := range args.Sdkdata {
- sdk, err := cache.GetSdkById(groupRule.Rules[j].SdkId)
- if err != nil {
- logger.Error("娌℃煡鍒皊dk鐨勪俊鎭�---", err)
- }
- ipcId := sdk.IpcId
- if ipcId == sdkData.IpcId {
- for _, areaMap := range sdkData.AreaMapList {
- // 鍘诲紑鍚竴涓畾鏃跺櫒
- duration(groupRule.Rules[j], groupRule.GroupId, areaMap, args)
- }
- }
- }
- }
+
// 灏嗘暟缁勬寜sort鎺掑簭
sort.Sort(resultList(resultSplice))
// 鎺掑簭鍚庡彇鍚勮嚜鐨勭粨鏋滃拰杩炴帴绗︽嫾鍑鸿鍒欒〃杈惧紡寰楀嚭缁撴灉
@@ -444,104 +258,98 @@
}
if completeFormula != "" {
logger.Info("缁撴灉鍏紡-----------锛�", completeFormula)
- expression, _ := govaluate.NewEvaluableExpression(completeFormula)
- if strings.HasPrefix(completeFormula, "&&") || strings.HasPrefix(completeFormula, "||") {
+ expression, err := govaluate.NewEvaluableExpression(completeFormula)
+ if strings.HasPrefix(completeFormula, "&&") || strings.HasPrefix(completeFormula, "||") || err != nil{
panic("瑙勫垯鏈夎锛屽緱鍒扮殑鏁板鍏紡涓嶅彲瑙ｆ瀽")
}
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
- if !result.(bool) {
- // 缁欒繖甯ф暟鎹墦涓婅鍒欑粍鏍囩
- //args.RuleResult = append(args.RuleResult, Result{TaskId: taskId, RuleGroupId: groupRule.GroupId})
- for k, timeEle := range TimeEleList {
- if strings.Contains(k, groupRule.GroupId) {
- timeEle.N = timeEle.InitN // 閲嶇疆瀹氭椂鍣�
+
+ if result.(bool) {
+ // 鏈�鍚庢垚鍔熸姤璀︽墠鎶婄鍚堟潯浠剁殑浜鸿劯鏁版嵁濉炶繘缁撴灉鏍囩閲�
+ // 閰嶄簡浜鸿劯鐨勭畻娉曟墠鎶婁汉鑴哥殑鏁版嵁鐢╁嚭鏉ユ墦鏍囩
+ faces := []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" {
+ faceFlag = true
}
}
- logger.Info("-------------------閲嶇疆鐩稿叧鐨勫畾鏃跺櫒骞惰繑鍥瀎alse---------------")
- return false
- } else {
- // 鍒ゆ柇鎸佺画鏃堕棿鏉′欢锛屽幓鐪嬫睜瀛愰噷鏄惁鏈変笌鏈抚鏁版嵁鏈夊叧鐨勫畾鏃跺櫒锛屽鏋滄湁锛岀湅姝ゆ椂鏄惁璧板埌0锛屾病鏈夋瀹氭椂鍣ㄦ垨鏈夊畾鏃跺櫒璧板埌0鐨勮瘽杩斿洖鎴愬姛鎶ヨ
- var flag bool = true
- for k, timeEle := range TimeEleList {
- if strings.Contains(k, groupRule.GroupId) {
- if timeEle.N != 0 { // 杩欑粍瑙勫垯鐨勫畾鏃跺櫒瑕佸叏閮ㄧ瓑浜�0
- logger.Info("鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��-------------涓嶅啢锛屼綘鏄瀹氭椂鍣ㄦ墦璐ョ殑锛�")
- flag = false
+ for _, sdkData := range args.Sdkdata {
+ if sdkData.IpcId == "A8B73405-373D-4F23-CED2-A617EBD7EC55" && faceFlag { // sdkData閲屾湁浜鸿劯鏁版嵁涓旈厤缃簡绠楁硶鎵嶆妸绗﹀悎鏉′欢鐨勬暟鎹杩涙爣绛鹃噷鍘�
+ for _, areaMap := range sdkData.AreaMapList {
+ faces = append(faces, putFaceToResult(areaMap,faces)...)
}
}
}
- //TimerAlarm(args,groupRule.GroupId)
- if flag {
- // 鏈�鍚庢垚鍔熸姤璀︽墠鎶婄鍚堟潯浠剁殑浜鸿劯鏁版嵁濉炶繘缁撴灉鏍囩閲�
- // 閰嶄簡浜鸿劯鐨勭畻娉曟墠鎶婁汉鑴哥殑鏁版嵁鐢╁嚭鏉ユ墦鏍囩
- faces := []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" {
- faceFlag = true
+ for _,face := range faces {
+ logger.Debug("鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�擾_______________鐪嬬湅浜鸿劯鐨勫潗鏍�:",face.Location)
+ }
+ logger.Warn("___________________________________________________________________________缁堜簬璧板畬涓囬噷闀垮緛")
+ // 鎶婁粬浠殑浣嶇疆鏁版嵁涔熶紶涓嬪幓
+ locations := []Rect{}
+ for _, sdkData := range args.Sdkdata {
+ if sdkData.IpcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && sdkNames != "" { // 鎶妝olo鏁版嵁鐨勫悇涓洰鏍囩殑鍧愭爣杈撳嚭鏂逛究鍚庨潰鐢绘
+ for _, areaMap := range sdkData.AreaMapList {
+ locations = append(locations, putYolosToResult(areaMap)...)
}
}
+ }
+ logger.Debug("------locations鐨勫唴瀹癸細", locations)
+ if sdkNames != "" {
+ args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkNames, groupRule.GroupId,groupRule.DefenceState,groupRule.AlarmLevel, groupRule.GroupText, locations, polygonId})
+ 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},faces})
+ logger.Info("-------------------face缁撴灉鏍囩", len(args.RuleResult["face"].([]FaceResult)))
+ }
+ // 鏈�鍚庤繃鎸佺画鏃堕棿绛夋椂闂寸淮搴︾殑鏉′欢 鎶婃椂闂磋鍒欎綅缃皟鏁村埌杩欎釜浣嶇疆鏄负浜嗙紦瀛樻暟鎹�
+ for j := 0; j < len(groupRule.Rules); j++ {
for _, sdkData := range args.Sdkdata {
- if sdkData.IpcId == "A8B73405-373D-4F23-CED2-A617EBD7EC55" && faceFlag { // sdkData閲屾湁浜鸿劯鏁版嵁涓旈厤缃簡绠楁硶鎵嶆妸绗﹀悎鏉′欢鐨勬暟鎹杩涙爣绛鹃噷鍘�
+ sdk, err := cache.GetSdkById(groupRule.Rules[j].SdkId)
+ if err != nil {
+ logger.Error("娌℃煡鍒皊dk鐨勪俊鎭�---", err)
+ }
+ ipcId := sdk.IpcId
+ if ipcId == sdkData.IpcId {
for _, areaMap := range sdkData.AreaMapList {
- faces = append(faces, putFaceToResult(areaMap)...)
+ // 鍘诲紑鍚竴涓畾鏃跺櫒
+ duration(groupRule.Rules[j], groupRule.GroupId, areaMap, args, message)
}
}
}
- if faceFlag {
- args.RuleResult["face"] = faces
- }
- logger.Warn("___________________________________________________________________________缁堜簬璧板畬涓囬噷闀垮緛")
- // 鎶婁粬浠殑浣嶇疆鏁版嵁涔熶紶涓嬪幓
- locations := []Rect{}
- for _, sdkData := range args.Sdkdata {
- if sdkData.IpcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && sdkNames != "" { // 鎶妝olo鏁版嵁鐨勫悇涓洰鏍囩殑鍧愭爣杈撳嚭鏂逛究鍚庨潰鐢绘
- for _, areaMap := range sdkData.AreaMapList {
- locations = append(locations, putYolosToResult(areaMap)...)
- }
- }
- }
- logger.Debug("------locations鐨勫唴瀹癸細",locations)
- if sdkNames != "" {
- args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkNames, groupRule.GroupId, groupRule.AlarmLevel, groupRule.GroupText, locations,polygonId})
- logger.Info("-------------------yolo缁撴灉鏍囩闀垮害", len(args.RuleResult["yolo"].([]Result)))
- }
- if args.RuleResult["face"] != nil {
- logger.Info("-------------------face缁撴灉鏍囩", len(args.RuleResult["face"].([]Arg)))
- }
+ }
+ // 杩涜瀹氭椂鍣ㄧ殑澶勭悊鍜屽垽鏂�
+ timeFlag := TimerAlarm(args, groupRule.GroupId, result.(bool))
+ if timeFlag == "01" || timeFlag == "10" || timeFlag == "11" { // 婊¤冻瀹氭椂鍣ㄦ潯浠�
return true
} else {
return false
}
+ } else {
+ // 缁撴灉涓哄亣鏃朵篃瑕佽蛋锛屾湁鏃跺�欎负鍋囩殑鐘舵�佸弽杞暟鎹篃闇�瑕佽褰曚笅鏉�
+ timeFlag := TimerAlarm(args, groupRule.GroupId, result.(bool))
+ fmt.Println(timeFlag)
+ return false
}
} else {
return false
}
}
-func TimerAlarm(args SdkDatas,groupId string) (int) {
- var flagTime int = 0 // 涓�0鐨勬剰鎬濇槸
- for k, timeEle := range TimeEleList {
- if strings.Contains(k, groupId) {
- if timeEle.N == 0 && !timeEle.AlarmFlag { // 杩欑粍瑙勫垯鐨勫畾鏃跺櫒瑕佸叏閮ㄧ瓑浜�0 鏆備笖璁や负涓�缁勮鍒欏彧鏈変竴涓畾鏃跺櫒
- logger.Info("鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��-------------棣栨绗﹀悎鎸佺画鏃堕棿瑙勫垯骞舵姤璀�")
- flagTime = 1
- timeEle.AlarmFlag = true
- args.RuleResult["cacheData"] = timeEle.CacheSdkData
- }
- if timeEle.N == 0 && timeEle.AlarmFlag {
- logger.Info("-------------------------绗﹀悎鎸佺画鏃堕棿瑙勫垯浣嗗苟涓嶆槸棣栨锛屼笉鎶ヨ")
- flagTime = 2
- }
- }
- }
- return flagTime
-}
-func putFaceToResult(am *AreaMap) []Arg {
+func putFaceToResult(am *AreaMap,faceList []*Arg) []Arg {
faces := []Arg{}
if len(am.filterData) > 0 {
for _, data := range am.filterData {
- faces = append(faces, *data)
+ 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 {
+ flag = false
+ }
+ }
+ if flag {
+ faces = append(faces, *data)
+ }
}
}
@@ -560,61 +368,8 @@
return locations
}
-// 璁＄畻鍖哄煙鍐呯殑鐩爣鏁伴噺浠ュ強灏嗙浉浼煎害銆佸崰姣斻�佸昂瀵哥瓑鎵撳寘
-func (a *AreaMap) CountAreaObjs(arg *SdkData) {
-
- a.targetNum = 0
- threshold := 0.0 // 鐩镐技搴�
- intersectionper := 0.2 // 鍗犳瘮
- size := 0.0 // 灏哄
-
- areaPoints := Json2points(a.areaJson)
- widthScale := float64(arg.ImageWidth / 960)
- heigthScale := float64(arg.ImageHeight / 540)
- for _, obj := range arg.Photo {
- //logger.Info("------------------鐪嬬湅sdkData:", arg.SdkName, "鐨凱hoto鏁版嵁----------------", obj, "----椤轰究鐪嬬湅鍗犳瘮-----锛�", PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale))
- if threshold <= obj.Score && size <= float64(obj.Rects.Width*obj.Rects.Height) && intersectionper <= PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale) {
- // 杩欐瑕佸榻愯〃杈惧紡閲屾墍闇�瑕佺殑鎵�鏈夊弬鏁�
- a.targetNum++
- arg1 := Arg{obj.Score, PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale), float64(obj.Rects.Width * obj.Rects.Height), obj.IsYolo, obj.Rects, obj.Feature, obj.ThftRes, []*protomsg.Baseinfo{}}
- //logger.Println("鏀捐繘鍘荤殑arg锛�-------", arg1)
- a.args = append(a.args, &arg1)
- a.filterData = append(a.filterData, &arg1)
- }
- }
- a.time = time.Unix(time.Now().Unix(), 0).String()[11:16]
- a.keepRight = arg.KeepRight
- a.isStatic = arg.IsStatic
- //logger.Println("--------------------鐪嬬湅鍖哄煙鏁版嵁锛�",*a)
-}
-
-// 灏嗗瓧绗︿覆鏍煎紡鐨勫潗鏍囧簭鍒楀寲涓篜oint鏍煎紡
-func Json2points(areaPoints string) []Point {
- var pts []Point
- if areaPoints == "[]" {
- logger.Error("=====================姝ゅ尯鍩熶负鍏ㄩ儴鍖哄煙")
- 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 {
- logger.Error("json.Unmarshal閿欒", err)
- panic("搴忓垪鍖栧潗鏍囧紓甯革紝绋嬪簭閫�鍑�")
- }
- }
- return pts
-}
-
-// 浠ユ憚鍍忔満id鏌ュ嚭璺熷叾鐩稿叧鐨勬墍鏈変换鍔′笅鐨勬墍鏈夎鍒欑粍
-func GetRuleGroup(cameraId string) []*protomsg.TaskGroupArgs {
- all := cache.GetCameraTaskRulesByCameraId(cameraId)
- return all
-}
-
// 鑱斿姩浠诲姟鐨勫鐞�
-func LinkTask(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string) {
+func LinkTask(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage) {
// new涓�涓畾鏃跺櫒锛屽鏋滀互姝roupId涓烘爣蹇楃殑瀹氭椂鍣ㄤ笉瀛樺湪鐨勮瘽
logger.Info("------------------------------------------褰撳墠鏄仈鍔ㄤ换鍔★紝瑙勫垯鏄細", groupRule.GroupText)
var flag bool = true
@@ -644,7 +399,7 @@
}
}
// 寰�鏁扮粍閲岃祴鍊�
- isOk := RunRule(args, groupRule, taskId)
+ isOk := RunRule(args, groupRule, taskId, message)
if isOk {
logger.Info("杩欏抚鍥惧儚鍦ㄤ换鍔′笅鐨勪竴鏁存潯瑙勫垯涓嬶紙鑱斿姩浠诲姟涓嬪氨鏄窡鏈憚鍍忔満鍍忕浉鍏崇殑灏忚鍒欙級鐨勫垽鏂粨鏋滀负true")
// 鏍规嵁cameraId鍘绘洿鏂版垨鑰呮彃鍏ョ粨鏋�,鐒跺悗鍒ゆ柇鏄惁鏁扮粍鏄惁鍙互寰楀嚭鎶ヨ鐨勭粨璁�
@@ -677,7 +432,7 @@
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
if result.(bool) {
logger.Info("___________________________________________________________________鑱斿姩浠诲姟鎶ヨ")
- args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, "", groupRule.GroupId, groupRule.AlarmLevel, groupRule.GroupText, []Rect{},""})
+ args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, "", groupRule.GroupId, groupRule.DefenceState,groupRule.AlarmLevel, groupRule.GroupText, []Rect{}, ""})
logger.Info("-------------------yolo缁撴灉鏍囩鏈夊嚑涓�", len(args.RuleResult["yolo"].([]Result)))
if args.RuleResult["face"] != nil {
logger.Info("-------------------face缁撴灉鏍囩鏈夊嚑涓�", len(args.RuleResult["face"].([]Arg)))
@@ -707,25 +462,9 @@
//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" && rule.SdkArgAlias != "compareBase"{
- argValue, err := strconv.ParseFloat(rule.SdkArgValue, 64)
- if err != nil {
- logger.Error("瑙勫垯閰嶇疆鐨勯槇鍊奸潪娉�")
- return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
- }
+ if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a972" && rule.SdkArgAlias != "time_rule" && rule.SdkArgAlias != "compareBase" {
+ logger.Debug("褰撳墠灏忚鍒欐槸锛�",rule)
flag := "false"
- for _, obj := range am.filterData {
- for index := 0; index < len(obj.Liker); {
- // 灏嗚揪涓嶅埌闃堝�肩殑鐩镐技鑰呬粠鐩镐技鑰呮暟缁勪腑鍒犻櫎
- logger.Debug("=======================鐩镐技鍊硷細", float64(obj.Liker[index].CompareScore*100))
- if float64(obj.Liker[index].CompareScore*100) < argValue {
- // Go 璇█涓垏鐗囧垹闄ゅ厓绱犵殑鏈川鏄細浠ヨ鍒犻櫎鍏冪礌涓哄垎鐣岀偣锛屽皢鍓嶅悗涓や釜閮ㄥ垎鐨勫唴瀛橀噸鏂拌繛鎺ヨ捣鏉ャ�備笉鐢ㄦ��鐤戯紝鏁扮粍鍒犻櫎鍏冪礌灏辫繖涔堝潙鐖�
- obj.Liker = append(obj.Liker[:index], obj.Liker[index+1:]...)
- } else {
- index++
- }
- }
- }
// 鎶婃病鏈夌浉浼艰�呯殑浜鸿劯浠巉ilterData涓垹闄�
for index := 0; index < len(am.filterData); {
// 灏嗚揪涓嶅埌闃堝�肩殑鐩镐技鑰呬粠鐩镐技鑰呮暟缁勪腑鍒犻櫎
@@ -742,6 +481,7 @@
return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + flag, rule.Sort}
}
if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a97e" { // 浜鸿劯妫�娴�
+ logger.Debug("褰撳墠灏忚鍒欐槸锛�",rule)
if rule.Operator == "==" || rule.Operator == ">=" || rule.Operator == "<=" || rule.Operator == "<" || rule.Operator == ">" || rule.Operator == "!=" {
// 濡傛灉鏄笉瑙勭煩鐨勮繛鎺ョ缁熺粺杩斿洖false 瑙勫垯涔熷彧鑳藉垽鏂汉鑴哥殑鐩镐技搴︼紝鎵�浠ヤ笉瀛樺湪鍒殑杩炴帴绗�
if rule.SdkArgAlias == "score" || rule.SdkArgAlias == "proportion" || rule.SdkArgAlias == "size" { // 鍒ゆ柇鐨勬槸鐩镐技鍊硷紝鍗犳瘮锛屽昂瀵哥瓑杩囨护鏉′欢锛屽鏋滃啀鏈夛紝杩樺彲浠ュ啀鍔�
@@ -749,8 +489,10 @@
var args []*Arg
if rule.RuleWithPre == "&&" {
args = am.filterData
+ logger.Info("杩囨护鍚庣殑args鐨勯暱搴︿负锛�",len(args))
} else {
args = am.args
+ logger.Info("娌¤繃婊ょ殑args鐨勯暱搴︿负锛�",len(args))
}
// 鍏堟竻绌鸿繃婊ゅ悗鐨勬暟鎹紝鍐嶅線閲屽鏈杩囨护鍚庣殑鏁版嵁
am.filterData = am.filterData[0:0]
@@ -794,7 +536,6 @@
// 澶勭悊鐨勯兘鏄痽olo鏁版嵁
if rule.PolygonId == am.areaId { // 棣栧厛杩欐潯瑙勫垯寰楁槸杩欎釜绠楁硶鐨勮鍒欙紝鍏舵瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
if rule.SdkArgAlias == "score" || rule.SdkArgAlias == "proportion" || rule.SdkArgAlias == "size" { // 鍒ゆ柇鐨勬槸鐩镐技鍊硷紝鍗犳瘮锛屽昂瀵哥瓑杩囨护鏉′欢锛屽鏋滃啀鏈夛紝杩樺彲浠ュ啀鍔�
- logger.Info("----------褰撳墠鏉′欢瑙勫垯锛�---------", rule)
var args []*Arg
if rule.RuleWithPre == "&&" {
args = am.filterData
@@ -803,6 +544,7 @@
}
// 鍏堟竻绌鸿繃婊ゅ悗鐨勬暟鎹紝鍐嶅線閲屽鏈杩囨护鍚庣殑鏁版嵁
am.filterData = am.filterData[0:0]
+ logger.Debug("鐪嬬湅args锛氾細锛氾細锛�", args)
for _, arg := range args {
var formula string
if rule.SdkArgAlias == "score" {
@@ -839,9 +581,10 @@
}
// 濡傛灉鏈夋寔缁椂闂存潯浠剁淮鎶ゅ紑鍚竴涓畾鏃跺櫒
-func duration(rule *protomsg.Rule, groupId string, am *AreaMap, args *SdkDatas) {
+func duration(rule *protomsg.Rule, groupId string, am *AreaMap, args *SdkDatas, message *protomsg.SdkMessage) {
if rule.PolygonId == am.areaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓� 閰嶇疆鐨勭畻娉曡瀵圭殑涓�
if rule.SdkArgAlias == "duration" { //
+ logger.Info("褰撳墠灏忚鍒欐槸锛�---------", rule)
// 鍏堢湅鐪嬪畾鏃跺櫒鍏冪礌闃熷垪涓槸鍚︽湁杩欎釜鎽勫儚鏈鸿繖涓尯鍩熺殑瀹氭椂鍣�,濡傛灉鏈夊氨涓嶈兘鍐嶆鍒涘缓浜�
var flag bool = true
for k, _ := range TimeEleList {
@@ -853,9 +596,9 @@
if flag {
timeLength, _ := strconv.Atoi(rule.SdkArgValue)
- timeEle := TimeElement{N: timeLength, InitN: timeLength, AlarmFlag: false, CacheSdkData: *args} // 鎵旇繘鍘讳竴涓畾鏃跺櫒鍏冪礌锛堝苟缂撳瓨褰撳墠鐢婚潰甯ф暟鎹級
+ timeEle := TimeElement{N: timeLength, InitN: timeLength, AlarmFlag: false, BufferFlag: 10, CacheSdkData: ResultMsg{message, args.RuleResult}} // 鎵旇繘鍘讳竴涓畾鏃跺櫒鍏冪礌锛堝苟缂撳瓨褰撳墠鐢婚潰甯ф暟鎹級
//TimeEleList = make(map[string]timeElement)
- TimeEleList[groupId+" "+rule.Id] = &timeEle // 瀹氭椂鍣ㄥ厓绱犱互鎽勫儚鏈篿d鎷兼帴鍖哄煙id涓洪敭
+ TimeEleList[groupId+" "+rule.Id] = &timeEle // 瀹氭椂鍣ㄥ厓绱犱互缁勮鍒檌d鍜屽綋鍓嶆寔缁椂闂村皬瑙勫垯id涓洪敭
logger.Info("鍒涘缓浜嗚鏁板櫒骞朵笖璁℃暟鍣ㄩ泦鍚堜负锛�", TimeEleList)
}
}
@@ -865,7 +608,8 @@
// 缁欐暟鎹簱鐨勮鍒欒〃杈惧紡浠ｅ弬 args: 涓�鏉″瓙瑙勫垯锛屽尯鍩熸暟鎹�
func transferParameters(rule *protomsg.Rule, am *AreaMap) LittleRuleResult {
if rule.PolygonId == am.areaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
- if rule.SdkArgAlias == "targetNum" { // 濡傛灉鍙傛暟鏄鍖哄煙鍐呯洰鏍囨暟閲� 鍗硑olo 浜鸿劯涓嶄細鏈夋暟閲�
+ 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} // 濡傛灉鍚庨潰涓嶈窡鎿嶄綔绗﹀氨鐩存帴杩斿洖鏁伴噺 姣斿瑕佽窡涓嬩竴涓尯鍩熸瘮杈冩暟閲忕殑灏辩洿鎺ヨ繑鍥炴湰鍖哄煙鐨勬暟閲�
@@ -880,7 +624,7 @@
formula := strconv.Itoa(num) + " " + rule.Operator + " " + rule.SdkArgValue
expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
- return LittleRuleResult{am.sdkName, strconv.FormatBool(result.(bool)) + "" + rule.RuleWithPre, rule.Sort}
+ return LittleRuleResult{am.sdkName, rule.RuleWithPre + " " + strconv.FormatBool(result.(bool)), rule.Sort}
// 鍔犱笂鍏充簬绠楁硶鐨勫垽鏂潯浠讹紝涓嶈兘鍙湁鍏充簬瑙勫垯鐨勶紝鏈夌殑绠楁硶鏈韩灏辨槸涓�涓鍒欙紝濡備釜浣撻潤姝紝闈犲彸琛�,鎵�浠ワ紝鎷垮埌褰撳墠瀛愯鍒欑殑sdkid鏉ュ垽鏂槸鍚︽槸閭ｄ簺鐗规畩鐨勮鍒�
} else if rule.SdkId == "IsStatic" { // 闈欐绠楁硶
if am.isStatic {
@@ -900,7 +644,7 @@
}
func timeRuleResult(rule *protomsg.Rule, am *AreaMap) LittleRuleResult {
if rule.PolygonId == am.areaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
- if rule.SdkArgAlias == "time_rule" { // 鍒ゆ柇鏄惁绗﹀悎鏃堕棿瑙勫垯
+ if rule.SdkArgAlias == "time_rule" { // 鍒ゆ柇鏄惁绗﹀悎鏃堕棿瑙�
logger.Info("----------褰撳墠鏃堕棿瑙勫垯锛�---------", rule)
// 鏍规嵁鏀惧�煎瓧娈甸噷瀛樼殑鏃堕棿瑙勫垯鐨刬d鍘诲彟涓�涓〃閲屾煡闇�瑕佹瘮瀵圭殑鏃堕棿娈碉紙姣斿褰撳墠鏃堕棿鏄懆涓夛紝搴旀牴鎹尯鍩焛d鏌ュ嚭鍏跺懆涓夌殑鍑犱釜甯冮槻鏃堕棿娈碉紝鏁扮粍锛�
//logger.Info("鏃堕棿瑙勫垯鐨勬祴璇�")
@@ -953,41 +697,4 @@
}
}
return LittleRuleResult{}
-}
-
-// 鏍规嵁浼犲叆鐨勫瓧绗︿覆寰楀埌鍏跺湪涓�鍛ㄥ唴鐨勭储寮� 鍛ㄤ竴鍒板懆鏃ュ垎鍒搴�1鍒�7
-func getIndexOfWeek(weekday string) int {
- var weekdays = [7]string{"Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"}
- for k, value := range weekdays {
- if value == weekday {
- return k + 1 // 鍥犱负鏁版嵁搴撲腑瀛樼殑鏄�1-7浠ｈ〃鐨勫懆涓�鍒板懆鏃�
- }
- }
- return 0
-}
-
-type TimeRange struct {
- Start string `json:"start"`
- End string `json:"end"`
-}
-type day struct {
- Day int `json:"day"` // 鏍囩ず褰撳墠鏄熸湡鍑�
- TimeRange []TimeRange `json:"time_range"` // 褰撳ぉ鐨勫嚑涓椂闂存
-}
-
-// 鍙栧嚭鏌愪釜鏃堕棿瑙勫垯鐨勭鍑犲ぉ鐨勮鍒欐闆嗗悎
-func GetTimeById(id string, index int) []TimeRange {
- _, cameraTimeRule := cache.GetTimeRuleById(id)
- var timeRangeList []day
- err := json.Unmarshal([]byte(cameraTimeRule.TimeRule), &timeRangeList)
- if err != nil {
- logger.Error("鍙栨椂闂磋鍒欐椂鍙嶅簭鍒楀寲閿欒锛�")
- }
- for _, timerange := range timeRangeList {
- if timerange.Day == index {
- //logger.Println("鍙栧埌鐨勬椂闂磋鍒欙細", timerange.TimeRange)
- return timerange.TimeRange
- }
- }
- return nil
}
--
Gitblit v1.8.0