From 811da147dccb634292afc698d73decc23ea77bf1 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 15 七月 2019 15:58:30 +0800
Subject: [PATCH] 更新cache解决区域重复问题，开始标签过滤器模块，把数据准备的代码拆出来
---
ruleserver/ruleToformula.go | 327 ------------------------------------------------------
1 files changed, 0 insertions(+), 327 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 00b3f3d..d0ed233 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -1,7 +1,6 @@
package ruleserver
import (
- "encoding/json"
"fmt"
"ruleprocess/cache"
"ruleprocess/logger"
@@ -10,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 {
@@ -71,11 +23,6 @@
Feature []byte
ThftRes protomsg.ThftResult
Liker []*protomsg.Baseinfo
-}
-
-type LikePerson struct {
- Id string // 涓庝箣鐩镐技鐨勫簳搴撲汉鍛樼殑id
- Score float64 // 涓庡簳搴撲汉鍛樼殑鐩镐技鍊�
}
// 姣忎釜鍖哄煙鍐呯殑鍥剧墖鏁版嵁闆嗗悎
@@ -126,9 +73,6 @@
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
RuleResult map[string]interface{} // 杩囧畬瑙勫垯鍚庢墦鐨勬爣绛�
@@ -148,42 +92,6 @@
SdkName string // 璁板綍涓嬫缁撴灉鏄摢涓猻dk鐨勭粨鏋�
Result string // 宸插寘鍚簡鍓嶇疆杩炴帴绗�
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)
@@ -225,88 +133,6 @@
}
}
-// 缁欑洰鏍囧～鍏卨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,message *protomsg.SdkMessage) bool {
defer func() {
if err := recover(); err != nil {
@@ -507,72 +333,7 @@
return false
}
}
-// 鍒ゆ柇鏄惁绗﹀悎瀹氭椂鍣ㄦ潯浠�
-func TimerAlarm(args *SdkDatas,groupId string,result bool) (string) {
- var flagTime string //
- // 鍒ゆ柇鏈夋棤姝よ鍒欑粍鐨勫畾鏃跺櫒
- flag := false
- for k,_ := range TimeEleList {
- logger.Debug("-----------------鐪嬬湅杩欎釜key鍜実roupId",k,groupId)
- if strings.Contains(k, groupId) {
- flag = true
- }
- }
- if flag { // 鏈夊畾鏃跺櫒
- if result { // 缁撴灉涓虹湡
- for k, timeEle := range TimeEleList {
- if strings.Contains(k, groupId) {
- if timeEle.N == 0 && timeEle.AlarmFlag {
- logger.Debug("-------------------------绗﹀悎鎸佺画鏃堕棿瑙勫垯浣嗗苟涓嶆槸棣栨锛屼笉鎶ヨ")
- flagTime = "11"
- args.RuleResult["timeLabel"] = flagTime
- }
- if timeEle.N == 0 && !timeEle.AlarmFlag { // 杩欑粍瑙勫垯鐨勫畾鏃跺櫒瑕佸叏閮ㄧ瓑浜�0 鏆備笖璁や负涓�缁勮鍒欏彧鏈変竴涓畾鏃跺櫒
- logger.Debug("鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��-------------棣栨绗﹀悎鎸佺画鏃堕棿瑙勫垯骞舵姤璀�")
- flagTime = "10"
- timeEle.AlarmFlag = true
- args.RuleResult["cacheData"] = timeEle.CacheSdkData
- args.RuleResult["timeLabel"] = flagTime
- }
- if timeEle.N != 0 {
- flagTime = "00"
- // 鏈夊畾鏃跺櫒浣嗕笉涓�0鎶婂凡鎵撶殑鏍囩鍒犻櫎
- args.RuleResult = nil
- logger.Debug("------------------------缁撴灉涓虹湡浣嗚鏁板櫒涓嶅埌0锛屼笉鎶ヨ,姝ゆ椂鐨勮鏁板櫒鐨勫�间负锛�",timeEle.N)
- }
- }
- }
- } else { // 缁撴灉涓哄亣
- for k, timeEle := range TimeEleList {
- if strings.Contains(k, groupId) {
- if timeEle.AlarmFlag {
- if timeEle.BufferFlag == 0 {
- logger.Debug("------------------------------鏉�姝诲畾鏃跺櫒锛屾姤璀︽甯х姸鎬佹敼鍙樼殑鏁版嵁锛屾鏃剁殑璁℃暟鍣ㄧ殑鍊间负",timeEle.N)
- flagTime = "12"
- args.RuleResult["timeLabel"] = flagTime
- delete(TimeEleList,k)
- } else {
- if timeEle.BufferFlag > 0 {
- timeEle.BufferFlag--
- }
- }
- } else {
- delete(TimeEleList,k)
- }
- }
- }
- }
- } else { // 鏃犲畾鏃跺櫒
- if result {
- flagTime = "01"
- args.RuleResult["timeLabel"] = flagTime
- } else {
- flagTime = "00"
- }
- }
- return flagTime
-}
func putFaceToResult(am *AreaMap) []Arg {
faces := []Arg{}
@@ -595,59 +356,6 @@
}
//logger.Println("-----------------------------------------------鍚浣犳槸绌虹殑锛�",faces)
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 == "[]" || 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
}
// 鑱斿姩浠诲姟鐨勫鐞�
@@ -993,39 +701,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