From 07bbfda72c30dab7200246d08c4a9557c7e988a2 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 29 六月 2019 13:48:00 +0800
Subject: [PATCH] 规则库大版本升级
---
util/upload.go | 63 +++
go.sum | 8
insertdata/insertDataToEs.go | 298 ++++++-------
util/image.go | 8
go.mod | 6
ruleserver/ruleToformula.go | 628 ++++++++++++++++++-----------
main.go | 194 ++++++--
ruleserver/timeTicker.go | 8
8 files changed, 753 insertions(+), 460 deletions(-)
diff --git a/go.mod b/go.mod
index ced18cc..2cd6c49 100644
--- a/go.mod
+++ b/go.mod
@@ -3,12 +3,12 @@
go 1.12
require (
- basic.com/dbapi.git v0.0.0-20190622030047-3ea90a522ec1
- basic.com/pubsub/protomsg.git v0.0.0-20190625090102-59334c91e550
+ basic.com/dbapi.git v0.0.0-20190628102226-9378e3d64b5f
+ basic.com/pubsub/protomsg.git v0.0.0-20190629023317-2d44243bfce4
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051
github.com/Microsoft/go-winio v0.4.12 // indirect
github.com/ajg/form v1.5.1 // indirect
- github.com/gogo/protobuf v1.2.1 // indirect
+ github.com/gogo/protobuf v1.2.1
github.com/golang/protobuf v1.3.1
github.com/gorilla/websocket v1.4.0 // indirect
github.com/knetic/govaluate v3.0.0+incompatible
diff --git a/go.sum b/go.sum
index 2c99a62..524fc9f 100644
--- a/go.sum
+++ b/go.sum
@@ -1,7 +1,7 @@
-basic.com/dbapi.git v0.0.0-20190622030047-3ea90a522ec1 h1:MAAgMzO1rd9+gYYksrtOWIB4dqQZvZEjwaZImygpSgk=
-basic.com/dbapi.git v0.0.0-20190622030047-3ea90a522ec1/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
-basic.com/pubsub/protomsg.git v0.0.0-20190625090102-59334c91e550 h1:sCzugx8u2QCXTirZYM7Rkh/kLn8HYvJH3ly415l2meY=
-basic.com/pubsub/protomsg.git v0.0.0-20190625090102-59334c91e550/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
+basic.com/dbapi.git v0.0.0-20190628102226-9378e3d64b5f h1:/pfCjoWNXbF+bXBkRj6wTYEM3V3aJz42E5y3lY83UEI=
+basic.com/dbapi.git v0.0.0-20190628102226-9378e3d64b5f/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
+basic.com/pubsub/protomsg.git v0.0.0-20190629023317-2d44243bfce4 h1:ljyCpNar72gdzLLKbFZrliugNWUJ7jYRFNUJvzRQTVE=
+basic.com/pubsub/protomsg.git v0.0.0-20190629023317-2d44243bfce4/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051 h1:9flC2o3kasaM2Y6I+mY+mxmve/pyAY/UzGQZLT3lFHM=
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051/go.mod h1:bkYiTUGzckyNOjAgn9rB/DOjFzwoSHJlruuWQ6hu6IY=
code.cloudfoundry.org/bytefmt v0.0.0-20180906201452-2aa6f33b730c/go.mod h1:wN/zk7mhREp/oviagqUXY3EwuHhWyOvAdsn5Y4CzOrc=
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 5cc012e..bb7dfdd 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -1,19 +1,22 @@
package insertdata
import (
- "errors"
"encoding/json"
+ "errors"
+ "fmt"
"log"
"net"
+ "strings"
"time"
- "basic.com/pubsub/protomsg.git"
"basic.com/dbapi.git"
- "ruleprocess/ruleserver"
- "ruleprocess/util"
+ "basic.com/pubsub/protomsg.git"
"github.com/golang/protobuf/proto"
"github.com/satori/go.uuid"
+ "ruleprocess/ruleserver"
+ "ruleprocess/util"
)
+
var weedfsUrl = "http://192.168.1.182:6333/submit"
// 浜鸿劯鐨勬暟鎹粨鏋�
type PerVideoPicture struct {
@@ -63,26 +66,26 @@
// yolo琛屼负鐨勬暟鎹粨鏋�
type Personaction struct {
- Id string `json:"id"`
- CameraId string `json:"cameraId"`
- CameraName string `json:"cameraName"`
- CameraAddr string `json:"cameraAddr"`
- TaskId string `json:"taskId"`
- TaskName string `json:"taskName"`
- SdkName string `json:"sdkName"`
- Content string `json:"content"`
- AlarmRules []AlarmRule
- AnalyServerId string `json:"analyServerId"`
- AnalyServerName string `json:"analyServerName"`
- AnalyServerIp string `json:"analyServerIp"`
- ClusterId string `json:"clusterId"`
- PicUrl string `json:"picUrl"`
- PicDate string `json:"picDate"`
- VideoUrl string `json:"videoUrl"`
- IsAlarm string `json:"isAlarm"`
- IsAckAlarm string `json:"isAckAlarm"`
- IsCollect string `json:"isCollect"`
- IsDelete int `json:"isDelete"`
+ Id string `json:"id"`
+ CameraId string `json:"cameraId"`
+ CameraName string `json:"cameraName"`
+ CameraAddr string `json:"cameraAddr"`
+ TaskId string `json:"taskId"`
+ TaskName string `json:"taskName"`
+ SdkName string `json:"sdkName"`
+ Content string `json:"content"`
+ AlarmRules []AlarmRule `json: "alramRules"`
+ AnalyServerId string `json:"analyServerId"`
+ AnalyServerName string `json:"analyServerName"`
+ AnalyServerIp string `json:"analyServerIp"`
+ ClusterId string `json:"clusterId"`
+ PicSmUrl []string `json:"picSmUrl"`
+ PicDate string `json:"picDate"`
+ VideoUrl string `json:"videoUrl"`
+ IsAlarm string `json:"isAlarm"`
+ IsAckAlarm string `json:"isAckAlarm"`
+ IsCollect string `json:"isCollect"`
+ IsDelete int `json:"isDelete"`
}
type AlarmRule struct {
@@ -90,169 +93,160 @@
AlarmLevel int32 `json:"alarmLevel"`
RuleText string `json:"ruleText"`
}
+
// 寰�ES鎻掓暟鎹�
func InsertToEs(msg ruleserver.ResultMsg) {
- log.Println("寰�ES鎻掓暟鎹�")
- // 鐩存帴浠庤鍒欑殑鏍囩鏁版嵁閲屾嬁绗﹀悎瑙勫垯鐨勪汉鑴哥粨鏋�
- for _, result := range msg.RuleResult {
- if !result.IsYolo {
- for _,face1 := range result.Faces{
- println(face1)
- }
- }
- }
- for _, sdkinfo := range msg.Tasklab.Sdkinfos {
- //if sdkinfo.Sdktype == "FaceDetect" {
- // if len(sdkinfo.Sdkdata) > 1 {
- //
- // faceParam := protomsg.ParamFacePos{}
- // err1 := proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
- // if err1 != nil {
- // log.Println("瑙ｆ瀽FACE sdk鏈夎", err1)
- // continue
- // }
- // for _, face := range faceParam.Faces {
- // pervideo := PerVideoPicture{
- // uuid.NewV4().String(),
- // msg.Cid,
- // msg.Caddr,
- // time.Now().Format("2006-01-02 15:04:05"),
- // "",
- // msg.Tasklab.Taskid,
- // msg.Tasklab.Taskname,
- // sdkinfo.SdkName,
- // "",
- // "",
- // face.Result.Gender,
- // face.Result.Age,
- // "",
- // face.Result.Race,
- // face.Result.Smile,
- // face.Result.Beauty,
- // "涓嶆槸姣忎釜浜鸿劯绠楁硶閮芥湁",
- // "---",
- // "",
- // "",
- // "",
- // "",
- // "",
- // "",
- // "",
- // "",
- // 0,
- // Base{ // 鍙湁浜鸿劯姣斿鏈夎繖涓俊鎭紝浜鸿劯妫�娴嬪苟娌℃湁
- // "鏄瘡涓汉鑴哥畻娉曢兘鏈夊悧",
- // "",
- // 0,
- // "",
- // "",
- // "",
- // "",
- // "",
- // "",
- // "",
- // "",
- // },
- // }
- // requstbody, err := json.Marshal(pervideo)
- //
- // if err != nil {
- // log.Println("json parse error ", err)
- // return
- //
- // }
- // err = EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
- // if err != nil {
- // log.Println("es can not execute right.")
- // }
- // }
- //
- // } else {
- // continue
- // }
- //}
- if sdkinfo.Sdktype == "Yolo" {
- if len(sdkinfo.Sdkdata) > 1 {
- yoloObj := protomsg.ParamYoloObj{}
- err1 := proto.Unmarshal(sdkinfo.Sdkdata, &yoloObj)
- if err1 != nil {
- log.Println("瑙ｆ瀽YOLO sdk鏈夎", err1)
- //continue
- }
- alarmRules := []AlarmRule{}
- for _,result := range msg.RuleResult {
- alarmRules = append(alarmRules,AlarmRule{result.RuleGroupId,result.AlarmLevel,result.RuleText})
- }
- isAlarm := ""
- resp := make(map[string]interface{})
- resp["fileUrl"] = ""
- if len(alarmRules) > 0 {
- isAlarm = "1"
- // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
- bdata, err := util.UnCompress(msg.Data)
- if err != nil {
- panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
- }
- i := protomsg.Image{}
- err = proto.Unmarshal(bdata, &i)
- resp,err = util.PostFormBufferData(weedfsUrl,i,uuid.NewV4().String())
- log.Println("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
- }else {
- isAlarm = "0"
- // 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
- continue
- }
- log.Println("鍥剧墖涓婁紶杩斿洖鍊硷細",resp)
- // 鏌ヨ鏈満淇℃伅
- flag,localConfig := dbapi.SysSetApi{}.GetServerInfo()
+ // 鐩存帴浠庤鍒欑殑鏍囩鏁版嵁閲屾嬁绗﹀悎瑙勫垯鐨勪汉鑴哥粨鏋�
+ if len(msg.RuleResult["faces"].([]ruleserver.Arg)) > 0 {
+ log.Println("寰�ES鎻掍汉鑴告暟鎹�")
+ for _, face := range msg.RuleResult["faces"].([]ruleserver.Arg) {
+ // 涓婁紶澶у浘
+ // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
+ bdata, err := util.UnCompress(msg.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata, &i)
+ bigPhotoUrl := make(map[string]interface{})
+ bigPhotoUrl, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
+ fmt.Println(bigPhotoUrl)
+ if len(face.Liker) == 0 {
+ // 浜鸿劯妫�娴嬶紝娌℃湁鐩镐技鐨勫簳搴撲汉鍛�
+ flag, localConfig := dbapi.SysSetApi{}.GetServerInfo()
if !flag {
log.Println("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
- // 鏌ヨcameraName
- camera,err := dbapi.CameraApi{}.GetCameraById(msg.Cid)
+ serverIp, err := GetLocalIP()
+ // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
+ bdata, err := util.UnCompress(msg.Data)
if err != nil {
- log.Println("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
}
- serverIp,err := GetLocalIP()
- peraction := Personaction{
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata, &i)
+ i1 := protomsg.Image{}
+ i1 = util.Subimg(i.Data, int(face.Location.X), int(face.Location.Y), int(face.Location.X+face.Location.Width), int(face.Location.Y+face.Location.Height))
+ resp, err := util.PostFormBufferData(weedfsUrl, i1, uuid.NewV4().String())
+ if err != nil {
+ log.Println("涓婁紶灏忓浘鍑洪敊")
+ }
+ pervideo := PerVideoPicture{
uuid.NewV4().String(),
msg.Cid,
- camera.Name,
msg.Caddr,
+ time.Now().Format("2006-01-02 15:04:05"),
+ bigPhotoUrl["fileUrl"].(string),
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
- sdkinfo.SdkName,
+ face.SdkName,
"",
- alarmRules,
+ "", // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
+ face.ThftRes.Gender,
+ face.ThftRes.Age,
+ "",
+ face.ThftRes.Race,
+ face.ThftRes.Smile,
+ face.ThftRes.Beauty,
+ "涓嶆槸姣忎釜浜鸿劯绠楁硶閮芥湁",
+ resp["fileUrl"].(string),
+ "鏆傛棤闆嗙兢",
localConfig.ServerId,
localConfig.ServerName,
serverIp,
"",
- resp["fileUrl"].(string),
- time.Now().Format("2006-01-02 15:04:05"),
"",
- isAlarm,
"",
"",
0,
+ Base{},
}
- requstbody, err := json.Marshal(peraction)
+ requstbody, err := json.Marshal(pervideo)
if err != nil {
log.Println("json parse error ", err)
return
}
- err = EsReq("POST", "http://192.168.1.182:9200/personaction/perVideoAction", requstbody)
+ err = EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
if err != nil {
log.Println("es can not execute right.")
}
- } else {
- continue
}
}
+ }
+ if len(msg.RuleResult["yolo"].([]ruleserver.Result)) > 0 {
+ log.Println("寰�ES鎻抷olo鏁版嵁")
+ var sdkNames string = ""
+ alarmRules := []AlarmRule{}
+ for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
+ sdkNames = sdkNames + yoloResult.SdkName
+ alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, yoloResult.AlarmLevel, yoloResult.RuleText})
+ }
+ isAlarm := ""
+ resp := make(map[string]interface{})
+ if len(alarmRules) > 0 {
+ isAlarm = "1"
+ // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
+ bdata, err := util.UnCompress(msg.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata, &i)
+ resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
+ log.Println("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
+ } else {
+ isAlarm = "0"
+ // 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
+ return
+ }
+ log.Println("鍥剧墖涓婁紶杩斿洖鍊硷細", resp)
+ // 鏌ヨ鏈満淇℃伅
+ flag, localConfig := dbapi.SysSetApi{}.GetServerInfo()
+ if !flag {
+ log.Println("鏌ヨ鏈満淇℃伅澶辫触锛�")
+ }
+ // 鏌ヨcameraName
+ camera, err := dbapi.CameraApi{}.GetCameraById(msg.Cid)
+ if err != nil {
+ log.Println("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
+ }
+ serverIp, err := GetLocalIP()
+ peraction := Personaction{
+ uuid.NewV4().String(),
+ msg.Cid,
+ camera.Name,
+ msg.Caddr,
+ msg.Tasklab.Taskid,
+ msg.Tasklab.Taskname,
+ sdkNames,
+ "",
+ alarmRules,
+ localConfig.ServerId,
+ localConfig.ServerName,
+ serverIp,
+ "",
+ []string{strings.Split(resp["fileUrl"].(string), "/")[1]},
+ time.Now().Format("2006-01-02 15:04:05"),
+ "",
+ isAlarm,
+ "",
+ "",
+ 0,
+ }
+ requstbody, err := json.Marshal(peraction)
+ if err != nil {
+ log.Println("json parse error ", err)
+ return
+
+ }
+ err = EsReq("POST", "http://192.168.1.182:9200/personaction/perVideoAction", requstbody)
+ if err != nil {
+ log.Println("es can not execute right.")
+ }
}
}
diff --git a/main.go b/main.go
index 958e624..030d6de 100644
--- a/main.go
+++ b/main.go
@@ -39,10 +39,10 @@
fmt.Println("recv error : ", err)
continue
} else {
- arg := ruleserver.ArgsFromSdk{}
+ arg := ruleserver.SdkDatas{}
m := paramFormat(msg, &arg)
fmt.Println("瑙ｆ瀽鍑烘潵鐨勬暟鎹細", arg)
- ruleserver.MainJudge(&arg)
+ ruleserver.Judge(&arg)
// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
resultMag := ruleserver.ResultMsg{SdkMessage: m, RuleResult: arg.RuleResult}
//fmt.Println("鎵撳畬鏍囩鍚庣殑缁撴灉锛�",resultMag)
@@ -55,7 +55,91 @@
}
// 灏嗗閮ㄤ紶杩涙潵鐨剆dk鏁版嵁鍖呰В鎴� ArgsFromSdk
-func paramFormat(msg []byte, arg *ruleserver.ArgsFromSdk) protomsg.SdkMessage {
+//func paramFormat(msg []byte, arg *ruleserver.ArgsFromSdk) protomsg.SdkMessage {
+// defer func() {
+// if err := recover(); err != nil {
+// fmt.Println("瑙ｅ寘杩囩▼鐨勯敊璇�", err.(string))
+// }
+//
+// }()
+// // 鍙嶅簭鍒楀寲鏁版嵁寰楀埌sdk鍏ュ弬
+// m := protomsg.SdkMessage{}
+// err := proto.Unmarshal(msg, &m)
+// if err != nil {
+// panic("瑙ｆ瀽msg鏃跺嚭鐜伴敊璇�")
+// }
+// arg.CameraId = m.Cid
+// arg.TaskId = m.Tasklab.Taskid
+// bdata, err := util.UnCompress(m.Data)
+// if err != nil {
+// panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+// }
+// i := protomsg.Image{}
+// err = proto.Unmarshal(bdata, &i)
+// arg.ImageWidth = int(i.Width)
+// arg.ImageHeight = int(i.Height)
+// // 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
+// arg.KeepRight = false
+// arg.IsStatic = false
+// for _, sdkinfo := range m.Tasklab.Sdkinfos { // yolo绠楁硶
+// if sdkinfo.Sdktype == "Yolo" {
+// if len(sdkinfo.Sdkdata) > 1 {
+// // 澶т簬1鎵嶆湁鏁版嵁
+// fmt.Println("----------------------------------------------------",m.Caddr)
+// yoloParam := protomsg.ParamYoloObj{}
+// err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
+// if err != nil {
+// fmt.Println("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+// continue
+// }
+// for _, info := range yoloParam.Infos {
+// if info.Typ == 0 {
+// photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)*100,IsYolo:true}
+// arg.Photo = append(arg.Photo, photoMap)
+// }
+// }
+// } else {
+// continue
+// }
+//
+// }
+// if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
+// if len(sdkinfo.Sdkdata) > 1 {
+// fmt.Println("----------------------------------------------------",m.Caddr)
+// faceParam := protomsg.ParamFacePos{}
+// err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
+// if err != nil {
+// fmt.Println("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+// continue
+// }
+// for _, info := range faceParam.Faces {
+// photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.Quality), IsYolo:false,ThftRes:*(info.Result)}
+// arg.Photo = append(arg.Photo, photoMap)
+// }
+// } else {
+// continue
+// }
+// }
+// //if sdkinfo.Sdktype == "FaceExtract" { // 浜鸿劯鎻愬彇
+//
+// //}
+//
+// }
+// return m
+//}
+
+// 灏嗗閮ㄤ紶杩涙潵鐨剅ect锛坱op,bottom,left,right锛夎浆鍖栦负鑷繁鍐呴儴鐨剅ect(left top width height)
+func rectFormat(rcobj *protomsg.Rect) ruleserver.Rect {
+ rect := ruleserver.Rect{}
+ rect.X = float64(rcobj.Left)
+ rect.Y = float64(rcobj.Top)
+ rect.Width = float64(rcobj.Right - rcobj.Left)
+ rect.Height = float64(rcobj.Bottom - rcobj.Top)
+ return rect
+}
+
+// 灏嗗閮ㄤ紶杩涙潵鐨剆dk鏁版嵁鍖呰В鎴� SdkDatas
+func paramFormat(msg []byte, args *ruleserver.SdkDatas) protomsg.SdkMessage {
defer func() {
if err := recover(); err != nil {
fmt.Println("瑙ｅ寘杩囩▼鐨勯敊璇�", err.(string))
@@ -68,42 +152,63 @@
if err != nil {
panic("瑙ｆ瀽msg鏃跺嚭鐜伴敊璇�")
}
- arg.CameraId = m.Cid
- arg.TaskId = m.Tasklab.Taskid
- bdata, err := util.UnCompress(m.Data)
- if err != nil {
- panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
- }
- i := protomsg.Image{}
- err = proto.Unmarshal(bdata, &i)
- arg.ImageWidth = int(i.Width)
- arg.ImageHeight = int(i.Height)
- // 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
- arg.KeepRight = false
- arg.IsStatic = false
+ args.CameraId = m.Cid
for _, sdkinfo := range m.Tasklab.Sdkinfos { // yolo绠楁硶
- //if sdkinfo.Sdktype == "Yolo" {
- // if len(sdkinfo.Sdkdata) > 1 {
- // // 澶т簬1鎵嶆湁鏁版嵁
- // fmt.Println("----------------------------------------------------",m.Caddr)
- // yoloParam := protomsg.ParamYoloObj{}
- // err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
- // if err != nil {
- // fmt.Println("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
- // continue
- // }
- // for _, info := range yoloParam.Infos {
- // if info.Typ == 0 {
- // photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)*100,IsYolo:true}
- // arg.Photo = append(arg.Photo, photoMap)
- // }
- // }
- // } else {
- // continue
- // }
- //
- //}
+ if sdkinfo.Sdktype == "Yolo" {
+ arg := ruleserver.SdkData{}
+ arg.TaskId = m.Tasklab.Taskid
+ arg.SdkId = sdkinfo.Sdkid
+ arg.SdkName = sdkinfo.SdkName
+ arg.IsYolo = true
+ bdata, err := util.UnCompress(m.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata, &i)
+ arg.ImageWidth = int(i.Width)
+ arg.ImageHeight = int(i.Height)
+ // 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
+ arg.KeepRight = false
+ arg.IsStatic = false
+ if len(sdkinfo.Sdkdata) > 1 {
+ // 澶т簬1鎵嶆湁鏁版嵁
+ fmt.Println("----------------------------------------------------",m.Cid)
+ yoloParam := protomsg.ParamYoloObj{}
+ err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
+ if err != nil {
+ fmt.Println("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ continue
+ }
+ for _, info := range yoloParam.Infos {
+ if info.Typ == 0 {
+ photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)*100,IsYolo:true}
+ arg.Photo = append(arg.Photo, photoMap)
+ }
+ }
+ args.Sdkdata = append(args.Sdkdata,arg)
+ } else {
+ continue
+ }
+
+ }
if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
+ arg := ruleserver.SdkData{}
+ arg.TaskId = m.Tasklab.Taskid
+ arg.SdkId = sdkinfo.Sdkid
+ arg.SdkName = sdkinfo.SdkName
+ arg.IsYolo = false
+ bdata, err := util.UnCompress(m.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata, &i)
+ arg.ImageWidth = int(i.Width)
+ arg.ImageHeight = int(i.Height)
+ // 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
+ arg.KeepRight = false
+ arg.IsStatic = false
if len(sdkinfo.Sdkdata) > 1 {
fmt.Println("----------------------------------------------------",m.Caddr)
faceParam := protomsg.ParamFacePos{}
@@ -113,9 +218,10 @@
continue
}
for _, info := range faceParam.Faces {
- photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.Quality)*100, IsYolo:false}
+ photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.Quality)*100, IsYolo:false,ThftRes:*(info.Result)}
arg.Photo = append(arg.Photo, photoMap)
}
+ args.Sdkdata = append(args.Sdkdata,arg)
} else {
continue
}
@@ -126,14 +232,4 @@
}
return m
-}
-
-// 灏嗗閮ㄤ紶杩涙潵鐨剅ect锛坱op,bottom,left,right锛夎浆鍖栦负鑷繁鍐呴儴鐨剅ect(left top width height)
-func rectFormat(rcobj *protomsg.Rect) ruleserver.Rect {
- rect := ruleserver.Rect{}
- rect.X = float64(rcobj.Left)
- rect.Y = float64(rcobj.Top)
- rect.Width = float64(rcobj.Right - rcobj.Left)
- rect.Height = float64(rcobj.Bottom - rcobj.Top)
- return rect
-}
+}
\ No newline at end of file
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 07aa2d1..9b244a9 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -57,12 +57,14 @@
// 姣忎釜鐩爣鐨勫弬鏁帮細鐩镐技搴︼紝鍗犳瘮锛屽昂瀵�
type Arg struct {
- score float64 // 鍖哄煙鍐呯殑鐩爣鐨勭浉浼煎害
- proportion float64 // 鍖哄煙鍐呯殑鐩爣鐨勫崰姣�
- size float64 // 鍖哄煙鍐呯殑鐩爣鐨勫昂瀵�
- isYolo bool // 鏄惁鏄痽olo鏁版嵁
- location Rect // 璁颁笅姣忎釜鐩爣鐨勪綅缃弬鏁帮紝鏈�鍚庣粰缁撴灉瑁呴厤浜鸿劯鏁版嵁鐨勬椂鍊欑敤鐨勫埌
- liker []LikePerson
+ Score float64 // 鍖哄煙鍐呯殑鐩爣鐨勭浉浼煎害
+ Proportion float64 // 鍖哄煙鍐呯殑鐩爣鐨勫崰姣�
+ Size float64 // 鍖哄煙鍐呯殑鐩爣鐨勫昂瀵�
+ IsYolo bool // 鏄惁鏄痽olo鏁版嵁
+ Location Rect // 璁颁笅姣忎釜鐩爣鐨勪綅缃弬鏁帮紝鏈�鍚庣粰缁撴灉瑁呴厤浜鸿劯鏁版嵁鐨勬椂鍊欑敤鐨勫埌
+ SdkName string
+ ThftRes protomsg.ThftResult
+ Liker []LikePerson
}
type LikePerson struct {
@@ -76,7 +78,8 @@
areaId string
groupId string
taskId string
- sdkIds []string
+ sdkId string
+ sdkName string
areaJson string
triggerLine string
directionLine string
@@ -90,22 +93,46 @@
// sdk杈撳嚭鐨勫浘鐗囦笂鍗曚釜鐩爣鐨勬暟鎹�
type PhotoMap struct {
- Rects Rect // 鐭╁舰鍖哄煙鍙傛暟
- Score float64 // 鐩镐技搴﹀緱鍒嗭紙鏈夊澶х▼搴﹀儚涓�涓洰鏍囥�備汉鑴革紝浜轰綋鎴栬溅绛夌瓑锛�
- IsYolo bool // 鏄惁鏄痽olo鏁版嵁
- Liker []LikePerson // 濡傛灉鏄汉鑴哥殑璇濆挨鍏舵槸姣斿锛屽簲瀛樹笅浠栬窡搴曞簱鐨勪汉鍛樼殑鐩镐技鎯呭喌 yolo鐨勮瘽缁檔il灏辫
+ Rects Rect // 鐭╁舰鍖哄煙鍙傛暟
+ Score float64 // 鐩镐技搴﹀緱鍒嗭紙鏈夊澶х▼搴﹀儚涓�涓洰鏍囥�備汉鑴革紝浜轰綋鎴栬溅绛夌瓑锛�
+ IsYolo bool // 鏄惁鏄痽olo鏁版嵁
+ SdkName string
+ ThftRes protomsg.ThftResult
+ Liker []LikePerson // 濡傛灉鏄汉鑴哥殑璇濆挨鍏舵槸姣斿锛屽簲瀛樹笅浠栬窡搴曞簱鐨勪汉鍛樼殑鐩镐技鎯呭喌 yolo鐨勮瘽缁檔il灏辫
}
// 浠庨�氶亾涓幏鍙栫殑sdk杈撳嚭鐨勫浘鍍忔暟鎹�(鐩墠涓昏鏄痽olo绠楁硶鐨勬暟鎹�)
-type ArgsFromSdk struct {
- CameraId string
+//type ArgsFromSdk struct {
+// CameraId string
+// TaskId string
+// Photo []PhotoMap // yolo绠楁硶缁撴瀯锛屼篃鍙互瀛樹汉鑴哥殑鏁版嵁锛屾瘯绔熶汉鑴镐腑鑳界敤瑙勫垯鏉ユ祴鐨勮繕鏄偅浜涘弬鏁�
+// KeepRight bool // 鏄惁闈犲彸琛� 绠楁硶鍒ゆ柇鐨勪笌涓婁竴甯у浘鍍忕殑姣旇緝缁撴灉
+// IsStatic bool // 鏄惁闈欐
+// ImageWidth int // 鎽勫儚鏈烘媿鎽勭殑鍥惧儚瀹� 鍍忕礌
+// ImageHeight int // 鎽勫儚鏈烘媿鎽勭殑鍥惧儚楂� 鍍忕礌
+// RuleResult []Result // 杩囧畬瑙勫垯鍚庢墦鐨勬爣绛�
+//}
+
+// 姣忎釜绠楁硶瀵逛簬褰撳墠甯х敾闈㈣嚜宸辨彁鍙栫殑鏁版嵁
+type SdkData struct {
TaskId string
+ SdkId string
+ SdkName string
+ IsYolo bool
Photo []PhotoMap // yolo绠楁硶缁撴瀯锛屼篃鍙互瀛樹汉鑴哥殑鏁版嵁锛屾瘯绔熶汉鑴镐腑鑳界敤瑙勫垯鏉ユ祴鐨勮繕鏄偅浜涘弬鏁�
KeepRight bool // 鏄惁闈犲彸琛� 绠楁硶鍒ゆ柇鐨勪笌涓婁竴甯у浘鍍忕殑姣旇緝缁撴灉
IsStatic bool // 鏄惁闈欐
ImageWidth int // 鎽勫儚鏈烘媿鎽勭殑鍥惧儚瀹� 鍍忕礌
ImageHeight int // 鎽勫儚鏈烘媿鎽勭殑鍥惧儚楂� 鍍忕礌
+ AreaMapList []AreaMap // 鏈瑂dk鎻愬彇鐨勬暟鎹寜鐓у尯鍩熷垝鍒嗗悗鐨勬暟鎹泦鍚�
RuleResult []Result // 杩囧畬瑙勫垯鍚庢墦鐨勬爣绛�
+}
+
+// 浠庣畻娉曟ā鍧楀効鎷挎潵鐨勫涓�甯у浘鍍忓悇涓畻娉曟彁鍙栫殑鏁版嵁闆嗗悎
+type SdkDatas struct {
+ CameraId string
+ Sdkdata []SdkData
+ RuleResult map[string]interface{} // 杩囧畬瑙勫垯鍚庢墦鐨勬爣绛� face: []Arg yolo: []Result
}
// 灏嗕紶閫掕繃鏉ョ殑鍙傛暟杞寲涓�
@@ -113,23 +140,29 @@
type ResultMsg struct {
protomsg.SdkMessage
- RuleResult []Result // 杩囧畬瑙勫垯鍚庢墦鐨勬爣绛�
+ RuleResult map[string]interface{} // 杩囧畬瑙勫垯鍚庢墦鐨勬爣绛�
}
// 杩囪鍒欏簱鎵撲笂鐨勬爣绛�
type Result struct {
TaskId string // 浠诲姟id
- IsYolo bool // 鏄惁鏄痽olo瑙﹀彂鐨勮鍒�
+ SdkName string
RuleGroupId string // 瑙勫垯缁刬d
AlarmLevel int32 // 鎶ヨ绛夌骇
RuleText string // 鏂囧瓧鐗堣鍒欑粍
- Faces []Face // 瑙﹀彂姝よ鍒欑粍鐨勪汉鑴革紙浜鸿劯绯诲垪瑙勫垯涓撶敤锛寉olo绯诲垪涓嶉渶瑕侊級
+}
+type LittleRuleResult struct {
+ SdkName string //璁板綍涓嬫缁撴灉鏄摢涓猻dk鐨勭粨鏋�
+ Result string // 宸插寘鍚簡鍓嶇疆杩炴帴绗�
+ Sort int32
}
//
type Face struct {
- Location Rect // 浜鸿劯鍧愭爣妗�
- liker []LikePerson // 鐩镐技浜哄憳锛堝鏋滄槸鍗曠函鐨勪汉鑴告娴嬪彲鏃犳椤癸級
+ Location Rect // 浜鸿劯鍧愭爣妗�
+ SdkName string
+ ThftRes protomsg.ThftResult
+ Liker []LikePerson // 鐩镐技浜哄憳锛堝鏋滄槸鍗曠函鐨勪汉鑴告娴嬪彲鏃犳椤癸級
}
// 鍖呭惈N鏉¤鍒欏厓绱犵殑涓�鏁存潯瑙勫垯
@@ -138,41 +171,189 @@
}
// 鏍规嵁鎽勫儚鏈篿d鎷垮埌鎽勫儚鏈烘墍鏈夊尯鍩�
-func GetPolygons(cameraId string) []protomsg.CameraPolygon {
+func GetPolygons(cameraId string) []*protomsg.CameraPolygon {
var api dbapi.CameraApi
data := api.FindAllPolygons()
//fmt.Println("鏌ュ埌鐨勬墍鏈夊尯鍩燂細", data)
// 鏍规嵁id浠巑ap涓嬁鍒板尯鍩�
- var cameraPolygons []protomsg.CameraPolygon
+ var cameraPolygons []*protomsg.CameraPolygon
for _, item := range data {
if item.CameraId == cameraId {
// 闇�瑕佹牴鎹瘮渚嬫妸鍓嶅彴鐢荤殑鍖哄煙鐨勫潗鏍囪浆鍖栦负鐩稿簲鎽勫儚鏈烘媿鎽勭殑鍥惧儚鐨勫ぇ灏� x鍧愭爣鍒嗗埆*image.width/椤甸潰鍖哄煙瀹� y鍧愭爣鍒嗗埆*image.height/椤甸潰鍖哄煙楂�
// 鍓嶅彴瀹介珮鍥哄畾
- cameraPolygons = append(cameraPolygons, item)
+ cameraPolygons = append(cameraPolygons, &item)
}
}
//log.Println("鏍规嵁鎽勫儚鏈篿d鏌ュ埌鐨勫尯鍩�", cameraPolygons, "--鍖哄煙鏁伴噺涓猴細", len(cameraPolygons))
return cameraPolygons
}
-// 瑙勫垯涓诲嚱鏁板叆鍙�
-func MainJudge(arg *ArgsFromSdk) {
- cameraPolygons := GetPolygons(arg.CameraId)
- list := AreaMapList{}
+// 鎶妔dk浠庢暟鎹抚涓婃彁鍙栫殑鎸夌収鍖哄煙鍒嗙被褰掔疆
+func SdkDataFormat(cameraId string, arg *SdkData, cameraPolygons []*protomsg.CameraPolygon) {
+ // cameraPolygons := GetPolygons(arg.CameraId)
+ // list := AreaMapList{}
for _, polygon := range cameraPolygons {
- areaMap := AreaMap{cameraId: arg.CameraId, areaId: polygon.Id, areaJson: polygon.Polygon, triggerLine: polygon.TriggerLine, directionLine: polygon.DirectionLine}
+ areaMap := AreaMap{cameraId: cameraId, areaId: polygon.Id, areaJson: polygon.Polygon, triggerLine: polygon.TriggerLine, directionLine: polygon.DirectionLine}
// 涓烘瘡涓憚鍍忔満鍖哄煙濉厖鏁版嵁
areaMap.CountAreaObjs(arg)
- list.areaMapList = append(list.areaMapList, areaMap)
+ arg.AreaMapList = append(arg.AreaMapList, areaMap)
}
+}
- //fmt.Println("涓烘瘡涓憚鍍忔満鍖哄煙濉厖鏁版嵁鍚庣殑鍐呭", list.areaMapList)
- // 灏嗘甯ф暟鎹寜鎽勫儚鏈哄尯鍩熷垎绫绘墦鍖呭悗鍒ゆ柇鏄惁鎶ヨ
- judge(&list, arg)
+// 瀵瑰崟甯у浘鍍忕殑鍒ゆ柇 鏄垗寮冿紙鎴栬�呰瀵逛簬鏌愪簺闇�姹傚彲浠ユ斁ES鏁版嵁搴撲竴浠斤級杩樻槸杩斿洖
+func Judge(args *SdkDatas) {
+ if len(args.Sdkdata) > 0 {
+ // 鎷垮埌鏈憚鍍忔満鐨勫尯鍩�
+ cameraPolygons := GetPolygons(args.CameraId)
+ // 鎶婃墍鏈夌殑sdk鎻愬彇鐨勬暟鎹兘鎸夋墍灞炴憚鍍忔満鐨勫尯鍩熷綊缃�
+ for _, arg := range args.Sdkdata {
+ SdkDataFormat(args.CameraId, &arg, cameraPolygons)
+ }
+ // 璺戞湰鎽勫儚鏈虹殑鎵�鏈夎鍒欑粍 涓�缁勪竴缁勮窇
+ taskRuleList := GetRuleGroup(args.CameraId) // 鏈憚鍍忔満涓嬫墍鏈変换鍔＄粍
+ // 寰楀埌灞炰簬璇ユ憚鍍忔満鐨勮嫢骞茬粍浠诲姟鐨勫畬鏁磋鍒欙紙璺熸瘡涓�鏉″畬鏁磋鍒欐瘮杈冧箣鍚庡緱鍑烘湰寮犲浘鍍忓浜庢煇涓鍒欐槸鍚︽姤璀︾殑缁撴灉銆傛斁杩沵ap锛屾瘮濡傛湰甯у浘鍍忕殑id锛屾墍纰版挒鎴愬姛鐨勮鍒檌d锛�
+ args.RuleResult["yolo"] = []Result{}
+ args.RuleResult["face"] = []Arg{}
+ if len(taskRuleList) > 0 {
+ for _, taskRule := range taskRuleList {
+ ruleList := taskRule.GroupRules // 鑾峰彇鐨勬槸task涓嬮潰鐨勪换鍔＄粍
+ taskId := taskRule.TaskId
+ 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)
+ }
+ }
+ }
+ }
+ }
+ }
+}
+func RunRule(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string) bool {
+ resultSplice := []*LittleRuleResult{}
+ // 鍏堣繃瀹屾潯浠惰鍒�
+ for j := 0; j < len(groupRule.Rules); j++ {
+ for _, sdkData := range args.Sdkdata {
+ for _, areaMap := range sdkData.AreaMapList {
+ ruleResult := filterRule(groupRule.Rules[j], &areaMap)
+ if ruleResult.Result != "" {
+ log.Println("鏉′欢瑙勫垯缁撴灉锛�", ruleResult.Result)
+ resultSplice = append(resultSplice, &ruleResult)
+ }
+ }
+ }
+ }
+ // 杩囧畬鏉′欢鏁版嵁鍚庢妸绗﹀悎鏉′欢鐨勪汉鑴告暟鎹杩涚粨鏋滄爣绛鹃噷
+ faces := []Arg{}
+ for _, sdkData := range args.Sdkdata {
+ for _, areaMap := range sdkData.AreaMapList {
+ for j := 0; j < len(groupRule.Rules); j++ {
+ putFaceToResult(groupRule.Rules[j], &areaMap, faces)
+ }
+ }
+ }
+ args.RuleResult["face"] = faces
+ // 鍐嶈繃鍏朵粬鏁版嵁 杩欐鐩存帴寰楀埌缁撴灉锛堢湡鎴栧亣锛� 杩囩洰鏍囨暟閲�
+ for j := 0; j < len(groupRule.Rules); j++ {
+ for _, sdkData := range args.Sdkdata {
+ for _, areaMap := range sdkData.AreaMapList {
+ ruleResult := transferParameters(groupRule.Rules[j], &areaMap)
+ if ruleResult.Result != "" {
+ log.Println("鏁伴噺瑙勫垯缁撴灉锛�", ruleResult.Result)
+ resultSplice = append(resultSplice, &ruleResult)
+ }
+ }
+ }
+ }
+ // 杩欐杩囩殑鏄椂闂磋鍒欙紙鏃堕棿娈电瓑锛�
+ for j := 0; j < len(groupRule.Rules); j++ {
+ for _, sdkData := range args.Sdkdata {
+ for _, areaMap := range sdkData.AreaMapList {
+ ruleResult := timeRuleResult(groupRule.Rules[j], &areaMap)
+ if ruleResult.Result != "" {
+ log.Println("鏃堕棿瑙勫垯缁撴灉锛�", ruleResult.Result)
+ resultSplice = append(resultSplice, &ruleResult)
+ }
+ }
+ }
+ }
+ // 鏈�鍚庤繃鎸佺画鏃堕棿绛夋椂闂寸淮搴︾殑鏉′欢
+ for j := 0; j < len(groupRule.Rules); j++ {
+ for _, sdkData := range args.Sdkdata {
+ for _, areaMap := range sdkData.AreaMapList {
+ duration(groupRule.Rules[j], &areaMap)
+ }
+ }
+ }
+ // 灏嗘暟缁勬寜sort鎺掑簭
+ sort.Sort(resultList(resultSplice))
+ // 鎺掑簭鍚庡彇鍚勮嚜鐨勭粨鏋滃拰杩炴帴绗︽嫾鍑鸿鍒欒〃杈惧紡寰楀嚭缁撴灉
+ completeFormula := ""
+ for _, va := range resultSplice {
+ completeFormula = completeFormula + va.Result
+ }
+ if completeFormula != "" {
+ expression, _ := govaluate.NewEvaluableExpression(completeFormula)
+ 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, taskId) {
+ timeEle.N = timeEle.InitN // 閲嶇疆瀹氭椂鍣�
+ }
+ }
+ return false
+ } else {
+ // 鍘荤湅姹犲瓙閲屾槸鍚︽湁涓庢湰甯ф暟鎹湁鍏崇殑瀹氭椂鍣紝濡傛灉鏈夛紝鐪嬫鏃舵槸鍚﹁蛋鍒�0锛屾病鏈夋瀹氭椂鍣ㄦ垨鏈夊畾鏃跺櫒璧板埌0鐨勮瘽杩斿洖鎴愬姛鎶ヨ
+ var flag bool = true
+ for k, timeEle := range TimeEleList {
+ if strings.Contains(k, taskId) {
+ if timeEle.N != 0 { // 璺熻繖涓换鍔℃湁鍏崇殑瀹氭椂鍣ㄨ鍏ㄩ儴绛変簬0
+ flag = false
+ }
+ }
+ }
+ if flag {
+ fmt.Println("鏈抚鏁版嵁绗﹀悎瑙勫垯")
+ // 濡傛灉鎴愬姛浜嗘垜搴旇鎵惧埌瑙勫垯涓秹鍙婂埌鐨剆dk锛岃褰曚笅浠栦滑鐨剆dkname
+ sdkName := ""
+ for j := 0; j < len(groupRule.Rules); j++ {
+ for _, sdkData := range args.Sdkdata {
+ if groupRule.Rules[j].SdkId == sdkData.SdkId && sdkData.IsYolo{ // 鍙褰晊olo绗﹀悎瑙勫垯鐨剆dk
+ sdkName = sdkName + "," + sdkData.SdkName
+ }
+ }
+ }
+ // 杩囧畬瑙勫垯鍚庢墦涓爣绛撅紝鍛婅瘔璋冪敤鑰呮湰甯ф暟鎹拡瀵瑰摢涓换鍔″摢缁勮鍒欐姤璀︿簡 鍚庡姞锛氬彲鑳借繕涓嶅锛岃繕闇�瑕佸尯鍒嗚Е鍙戞姤璀︾殑瀵硅薄锛屽悗闈㈠線es鏁版嵁搴撴彃鏁版嵁鏃惰鐢�
+ args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkName, groupRule.GroupId, groupRule.AlarmLevel, groupRule.GroupText})
+ return true
+ } else {
+ return false
+ }
+ }
+ } else {
+ return false
+ }
+}
+
+func putFaceToResult(rule *protomsg.Rule, am *AreaMap, faces []Arg) {
+ if rule.SdkId == am.sdkId {
+ if len(am.filterData) > 0 {
+ for _, data := range am.filterData {
+ faces = append(faces, data)
+ }
+ }
+ }
}
// 璁＄畻鍖哄煙鍐呯殑鐩爣鏁伴噺浠ュ強灏嗙浉浼煎害銆佸崰姣斻�佸昂瀵哥瓑鎵撳寘
-func (a *AreaMap) CountAreaObjs(arg *ArgsFromSdk) {
+func (a *AreaMap) CountAreaObjs(arg *SdkData) {
a.targetNum = 0
threshold := 0.0 // 鐩镐技搴�
@@ -189,16 +370,17 @@
// }
for _, obj := range arg.Photo {
- if threshold <= obj.Score && size <= float64(obj.Rects.Width*obj.Rects.Height) && intersectionper <= 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.Liker}
+ arg1 := Arg{obj.Score, PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale), float64(obj.Rects.Width * obj.Rects.Height), obj.IsYolo, obj.Rects, obj.SdkName, obj.ThftRes, obj.Liker}
log.Println("鏀捐繘鍘荤殑arg锛�-------", arg1)
a.args = append(a.args, arg1)
a.filterData = append(a.filterData, arg1)
}
}
-
+ a.sdkId = arg.SdkId
+ a.sdkName = arg.SdkName
a.time = time.Unix(time.Now().Unix(), 0).String()[11:16]
a.keepRight = arg.KeepRight
a.isStatic = arg.IsStatic
@@ -222,7 +404,7 @@
return pts
}
-// 浠ユ憚鍍忔満id鏌ュ嚭璺熷叾鐩稿叧鐨勬墍鏈変换鍔′笅鐨勮鍒欑粍
+// 浠ユ憚鍍忔満id鏌ュ嚭璺熷叾鐩稿叧鐨勬墍鏈変换鍔′笅鐨勬墍鏈夎鍒欑粍
func GetRuleGroup(cameraId string) []*protomsg.TaskGroupArgs {
// 鏌ヨ鏁版嵁搴�
// 绗竴姝ユ煡鍑鸿窡杩欎釜鎽勫儚鏈虹浉鍏崇殑group_id(澶ц鍒�)
@@ -230,16 +412,16 @@
all := api.FindAll()
//fmt.Println("鎵�鏈夎鍒�:", all)
var taskArgs []*protomsg.TaskGroupArgs
- for _, taskArg := range all {
- if taskArg.CameraId == cameraId {
- taskArgs = taskArg.TaskArgs
+ for _, camArg := range all {
+ if camArg.CameraId == cameraId {
+ taskArgs = camArg.TaskArgs
}
}
return taskArgs
}
// 鑱斿姩浠诲姟鐨勫鐞�
-func linkTask(aml *AreaMapList, arg *ArgsFromSdk, groupRule *protomsg.GroupRule, taskId string) {
+func linkTask(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string) {
// new涓�涓畾鏃跺櫒锛屽鏋滀互姝roupId涓烘爣蹇楃殑瀹氭椂鍣ㄤ笉瀛樺湪鐨勮瘽
var flag bool = true
var timeEle = TimeElement{N: 3, InitN: 3, GroupId: groupRule.GroupId}
@@ -256,10 +438,10 @@
fmt.Println("鍒涘缓浜嗚鏁板櫒骞朵笖璁℃暟鍣ㄩ泦鍚堜负锛�", TimeEleList)
// 寰楀嚭杩欑粍瀹屾暣瑙勫垯閲屾秹鍙婂埌鍑犱釜鎽勫儚鏈猴紝鍐冲畾鐫�鏁扮粍閲屾湁鍑犱釜缁撴瀯浣�,鍘婚噸娣诲姞鏂瑰紡
for j := 0; j < len(groupRule.Rules); j++ {
- var flag1 bool = false
+ var flag1 bool = true
for _, ruleRes := range TimeEleList[groupRule.GroupId].RuleResults {
if groupRule.Rules[j].CameraId == ruleRes.CameraId {
- flag1 = true
+ flag1 = false
}
}
if flag1 {
@@ -268,17 +450,17 @@
}
}
// 寰�鏁扮粍閲岃祴鍊�
- isOk := singleTask(aml, arg, groupRule, taskId)
+ isOk := RunRule(args, groupRule, taskId)
if isOk {
fmt.Println("杩欏抚鍥惧儚鍦ㄤ换鍔′笅鐨勪竴鏁存潯瑙勫垯涓嬶紙鑱斿姩浠诲姟涓嬪氨鏄窡鏈憚鍍忔満鍍忕浉鍏崇殑灏忚鍒欙級鐨勫垽鏂粨鏋滀负true")
// 鏍规嵁cameraId鍘绘洿鏂版垨鑰呮彃鍏ョ粨鏋�,鐒跺悗鍒ゆ柇鏄惁鏁扮粍鏄惁鍙互寰楀嚭鎶ヨ鐨勭粨璁�
// 寰�鑱斿姩浠诲姟鐨勭粨鏋滄暟缁勯噷鏀惧�兼垨鏇存柊
for _, va := range timeEle.RuleResults {
- if arg.CameraId != "" && va.CameraId == arg.CameraId {
+ if va.CameraId == args.CameraId {
va.Result = strconv.FormatBool(isOk)
}
}
- // 鍒ゆ柇缁撴灉鏁扮粍鏄惁瀹屾弧鍙緱鍑烘姤璀︾粨鏋�
+ // 鍒ゆ柇缁撴灉鏁扮粍鏄惁瀹屾弧(鍗宠璧嬪�煎畬姣�)鍙緱鍑烘姤璀︾粨鏋�
var isPerfect = true
for _, va := range timeEle.RuleResults {
if va.Result == "" && va.RuleWithPre != "||" {
@@ -297,8 +479,16 @@
expression, _ := govaluate.NewEvaluableExpression(completeFormula)
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
if result.(bool) {
+ sdkName := ""
+ for j := 0; j < len(groupRule.Rules); j++ {
+ for _, sdkData := range args.Sdkdata {
+ if groupRule.Rules[j].SdkId == sdkData.SdkId && sdkData.IsYolo{ // 鍙褰晊olo绗﹀悎瑙勫垯鐨剆dk
+ sdkName = sdkName + "," + sdkData.SdkName
+ }
+ }
+ }
// 杩囧畬瑙勫垯鍚庢墦涓爣绛撅紝鍛婅瘔璋冪敤鑰呮湰甯ф暟鎹拡瀵瑰摢涓换鍔″摢缁勮鍒欐姤璀︿簡
- arg.RuleResult = append(arg.RuleResult, Result{TaskId: taskId, RuleGroupId: groupRule.GroupId})
+ args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkName, groupRule.GroupId, groupRule.AlarmLevel, groupRule.GroupText})
}
}
} else {
@@ -308,7 +498,7 @@
fmt.Println("杩欏抚鍥惧儚鍦ㄤ换鍔′笅鐨勪竴鏁存潯瑙勫垯涓嬶紙鑱斿姩浠诲姟涓嬪氨鏄窡鏈憚鍍忔満鍍忕浉鍏崇殑灏忚鍒欙級鐨勫垽鏂粨鏋滀负false")
// 鎵�浠ヤ篃瑕佸幓缁撴灉鏁扮粍閲屾斁鍊兼垨鏇存柊
for _, va := range timeEle.RuleResults {
- if arg.CameraId != "" && va.CameraId == arg.CameraId { // arg.CameraId 闅忎究鎵句竴涓暟鎹�
+ if args.CameraId != "" && va.CameraId == args.CameraId { // arg.CameraId 闅忎究鎵句竴涓暟鎹�
va.Result = strconv.FormatBool(isOk)
}
}
@@ -316,167 +506,141 @@
}
}
-// 鐙珛浠诲姟
-func singleTask(aml *AreaMapList, arg *ArgsFromSdk, groupRule *protomsg.GroupRule, taskId string) bool {
- var completeFormula string = ""
- var okSdks string = "" // 璁板綍涓嬭Е鍙戣鍒欑殑鏄痽olo杩樻槸face
- for _, areaMap := range aml.areaMapList {
- //fmt.Println("褰撳墠瑙勫垯缁勪负---------锛�",groupRule)
- for j := 0; j < len(groupRule.Rules); j++ {
- // 鍏堣繃瀹屾潯浠舵暟鎹�
- filterRule(groupRule.Rules[j], &areaMap)
- }
- for j := 0; j < len(groupRule.Rules); j++ {
- // 鍐嶈繃鍏朵粬鏁版嵁 杩欐鐩存帴寰楀埌缁撴灉锛堢湡鎴栧亣锛� 杩囩洰鏍囨暟閲�
- flag,sdk := transferParameters(groupRule.Rules[j], &areaMap)
- if flag == "true" {
- okSdks = okSdks + "," + sdk
- }
- if flag != "" {
- fmt.Println("寰楀嚭鐨勭粨鏋�", flag)
- completeFormula = completeFormula + groupRule.Rules[j].RuleWithPre + "" + flag
- }
- }
- if completeFormula == "" {
- flag := splice1(&areaMap)
- if flag != "" {
- fmt.Println("寮鸿鎷煎噾涓�涓汉鏁版槸鍚﹀ぇ浜�0鐨勭粨鏋�", flag)
- completeFormula = flag
- }
- okSdks = okSdks + "," + "yolo"
- }
- for j := 0; j < len(groupRule.Rules); j++ {
- // 杩欐杩囩殑鏄椂闂磋鍒欙紙鏃堕棿娈电瓑锛�
- flag := timeRuleResult(groupRule.Rules[j], &areaMap)
- if flag != "" {
- fmt.Println("鏃堕棿瑙勫垯鐨勭粨鏋�", flag)
- completeFormula = completeFormula + groupRule.Rules[j].RuleWithPre + "" + flag
- }
- }
+// 杩囨护瑙勫垯鍏堢瓫閫夊嚭绗﹀悎鏉′欢鐨勭洰鏍囨暟閲�
+func filterRule(rule *protomsg.Rule, am *AreaMap) LittleRuleResult {
+ if rule.SdkId == "FaceDetect" || rule.SdkId == "FaceCompare" {
+ // 澶勭悊鐨勬槸浜鸿劯绠楁硶 濡傛灉杩欐潯瑙勫垯閰嶇疆鐨勬槸浜鸿劯绠楁硶锛岃繃婊ゅ畬鏉′欢涔嬪悗鐩存帴寰楀嚭缁撴灉锛屽洜涓鸿偗瀹氭病鏈夋暟閲忔潯浠讹紝鑷繁鎷兼帴
+ if rule.SdkId == am.sdkId && rule.PolygonId == am.areaId { // 绠楁硶鍜屽尯鍩熼兘寰楀鐨勪笂
- for j := 0; j < len(groupRule.Rules); j++ {
- // 鏈�鍚庤繃鎸佺画鏃堕棿绛夋椂闂寸淮搴︾殑鏉′欢
- duration(groupRule.Rules[j], &areaMap)
- }
-
- }
- fmt.Println("鎷煎嚭鐨勬暟瀛﹀叕寮忎负:==== ", completeFormula)
- if completeFormula != "" {
- expression, _ := govaluate.NewEvaluableExpression(completeFormula)
- result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
- //fmt.Println("杩欏抚鍥惧儚鍦ㄤ换鍔′笅鐨勯櫎浜嗘寔缁椂闂村鐨勪竴鏁存潯瑙勫垯涓嬬殑鍒ゆ柇缁撴灉", result)
- // 鐢变簬澶╃劧鎴栫殑鍏崇郴锛屾弧瓒充竴涓氨璇ユ姤璀�,鍗宠甯ф暟鎹浜庢煇涓换鍔＄殑鏌愪釜瑙勫垯缁勫簲璇ユ姤璀�
- if !result.(bool) { // 濡傛灉涓嶇鍚堟潯浠讹紝搴旇閲嶇疆瀹氭椂鍣ㄥ厓绱狅紝绛夌鍚堟椂鍐嶅紑鍚�,鎶妅ey涓寘鍚换鍔d鐨則imeEle閮介噸缃�
- for k, timeEle := range TimeEleList {
- if strings.Index(k, taskId) != -1 {
- timeEle.N = timeEle.InitN // 閲嶇疆瀹氭椂鍣�
+ if rule.SdkId == "FaceCompare" {
+ // 鍙渶瑕佽繃婊ら槇鍊硷紝杩囨护瀹屽悗鏁扮粍闀垮害澶т簬0鍗充负鎶ヨ锛屼絾瑕佽�冭檻濡備綍瀵规瘡涓�寮犻兘鎶ヨ鍛�
+ argValue, err := strconv.ParseFloat(rule.SdkArgValue, 64)
+ if err != nil {
+ log.Println("瑙勫垯閰嶇疆鐨勯槇鍊奸潪娉�")
+ return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
}
- }
- return false
- } else {
- // 鍘荤湅姹犲瓙閲屾槸鍚︽湁涓庢湰甯ф暟鎹湁鍏崇殑瀹氭椂鍣紝濡傛灉鏈夛紝鐪嬫鏃舵槸鍚﹁蛋鍒�0锛屾病鏈夋瀹氭椂鍣ㄦ垨鏈夊畾鏃跺櫒璧板埌0鐨勮瘽杩斿洖鎴愬姛鎶ヨ
- var flag bool = true
- for k, timeEle := range TimeEleList {
- if strings.Index(k, taskId) != -1 {
- if timeEle.N != 0 { // 璺熻繖涓换鍔℃湁鍏崇殑瀹氭椂鍣ㄨ鍏ㄩ儴绛変簬0
- flag = false
- }
- }
- }
- if flag {
- fmt.Println("鏈抚鏁版嵁绗﹀悎瑙勫垯")
- // 鍙栧嚭鎵�鏈夊尯鍩熷唴缁忚繃杩囨护鍚庤繕鍓╀笅鐨勪汉鑴革紝鏀捐繘缁撴灉涓�
- faces := []Face{}
- for _, areaMap := range aml.areaMapList {
- if len(areaMap.filterData) > 0 {
- for _, arg := range areaMap.filterData {
- faces = append(faces,Face{arg.location,arg.liker})
+ flag := "false"
+ for _, obj := range am.filterData {
+ for index := 0; index < len(obj.Liker); {
+ // 灏嗚揪涓嶅埌闃堝�肩殑鐩镐技鑰呬粠鐩镐技鑰呮暟缁勪腑鍒犻櫎
+ if obj.Liker[index].Score < argValue {
+ // Go 璇█涓垏鐗囧垹闄ゅ厓绱犵殑鏈川鏄細浠ヨ鍒犻櫎鍏冪礌涓哄垎鐣岀偣锛屽皢鍓嶅悗涓や釜閮ㄥ垎鐨勫唴瀛橀噸鏂拌繛鎺ヨ捣鏉ャ�備笉鐢ㄦ��鐤戯紝鏁扮粍鍒犻櫎鍏冪礌灏辫繖涔堝潙鐖�
+ obj.Liker = append(obj.Liker[:index], obj.Liker[index+1:]...)
+ } else {
+ index++
}
}
}
- // 濡傛灉瀵箉olo鍜屼汉鑴搁兘鎶ヨ锛岄偅灏辨墦涓ら亶鏍囩
- if strings.Contains(okSdks,"yolo") {
- // 杩囧畬瑙勫垯鍚庢墦涓爣绛撅紝鍛婅瘔璋冪敤鑰呮湰甯ф暟鎹拡瀵瑰摢涓换鍔″摢缁勮鍒欐姤璀︿簡 鍚庡姞锛氬彲鑳借繕涓嶅锛岃繕闇�瑕佸尯鍒嗚Е鍙戞姤璀︾殑瀵硅薄锛屽悗闈㈠線es鏁版嵁搴撴彃鏁版嵁鏃惰鐢�
- arg.RuleResult = append(arg.RuleResult, Result{taskId, true,groupRule.GroupId, groupRule.AlarmLevel, groupRule.GroupText, faces})
- }
- if strings.Contains(okSdks,"face") {
- arg.RuleResult = append(arg.RuleResult, Result{taskId, false,groupRule.GroupId, groupRule.AlarmLevel, groupRule.GroupText, faces})
- }
- return true
- } else {
- return false
- }
- }
- } else {
- return false
- }
-}
-
-// 瀵瑰崟甯у浘鍍忕殑鍒ゆ柇 鏄垗寮冿紙鎴栬�呰瀵逛簬鏌愪簺闇�姹傚彲浠ユ斁ES鏁版嵁搴撲竴浠斤級杩樻槸杩斿洖
-func judge(aml *AreaMapList, arg *ArgsFromSdk) {
- // 寰楀埌灞炰簬璇ユ憚鍍忔満鐨勮嫢骞茬粍浠诲姟鐨勫畬鏁磋鍒欙紙璺熸瘡涓�鏉″畬鏁磋鍒欐瘮杈冧箣鍚庡緱鍑烘湰寮犲浘鍍忓浜庢煇涓鍒欐槸鍚︽姤璀︾殑缁撴灉銆傛斁杩沵ap锛屾瘮濡傛湰甯у浘鍍忕殑id锛屾墍纰版挒鎴愬姛鐨勮鍒檌d锛�
- taskRuleList := GetRuleGroup(arg.CameraId)
- if len(taskRuleList) > 0 {
- for _, taskRule := range taskRuleList {
- ruleList := taskRule.GroupRules // 鑾峰彇鐨勬槸task涓嬮潰鐨勪换鍔＄粍
- taskId := taskRule.TaskId
- for i := 0; i < len(ruleList); i++ {
- temp := ruleList[i].Rules // temp涓轰竴缁勫畬鏁磋鍒� 鍦ㄦ闇�瑕佸垽鏂鍒欐槸鍚︽槸鑱斿姩瑙勫垯
- if len(temp) > 0 {
- if strings.Contains(ruleList[i].GroupId, "link") {
- // groupId涓惈鏈塴ink鍒欎负鑱斿姩浠诲姟
- linkTask(aml, arg, ruleList[i], taskId)
+ // 鎶婃病鏈夌浉浼艰�呯殑浜鸿劯浠巉ilterData涓垹闄�
+ for index := 0; index < len(am.filterData); {
+ // 灏嗚揪涓嶅埌闃堝�肩殑鐩镐技鑰呬粠鐩镐技鑰呮暟缁勪腑鍒犻櫎
+ if len(am.filterData[index].Liker) == 0 {
+ // Go 璇█涓垏鐗囧垹闄ゅ厓绱犵殑鏈川鏄細浠ヨ鍒犻櫎鍏冪礌涓哄垎鐣岀偣锛屽皢鍓嶅悗涓や釜閮ㄥ垎鐨勫唴瀛橀噸鏂拌繛鎺ヨ捣鏉ャ�備笉鐢ㄦ��鐤戯紝鏁扮粍鍒犻櫎鍏冪礌灏辫繖涔堝潙鐖�
+ am.filterData = append(am.filterData[:index], am.filterData[index+1:]...)
} else {
- // 鐙珛浠诲姟鐨勫鐞�
- singleTask(aml, arg, ruleList[i], taskId)
+ index++
}
}
+ if len(am.filterData) > 0 {
+ flag = "true"
+ }
+ return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + flag, rule.Sort}
}
- }
- }
-}
-
-// 杩囨护瑙勫垯鍏堢瓫閫夊嚭绗﹀悎鏉′欢鐨勭洰鏍囨暟閲�
-func filterRule(rule *protomsg.Rule, am *AreaMap) {
- if rule.PolygonId == am.areaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
- if rule.SdkArgAlias == "score" || rule.SdkArgAlias == "proportion" || rule.SdkArgAlias == "size" { // 鍒ゆ柇鐨勬槸鐩镐技鍊硷紝鍗犳瘮锛屽昂瀵哥瓑杩囨护鏉′欢锛屽鏋滃啀鏈夛紝杩樺彲浠ュ啀鍔�
- //fmt.Println("绛涢�変汉鏁伴樁娈�", "姣旇緝鐨勮鍒欐槸锛�", rule)
- var args []Arg
- if rule.RuleWithPre == "&&" {
- args = am.filterData
- } else {
- args = am.args
- }
- // 鍏堟竻绌鸿繃婊ゅ悗鐨勬暟鎹紝鍐嶅線閲屽鏈杩囨护鍚庣殑鏁版嵁
- am.filterData = am.filterData[0:0]
- for _, arg := range args {
- var formula string
- if rule.SdkArgAlias == "score" {
- formula = strconv.FormatFloat(arg.score, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
- } else if rule.SdkArgAlias == "proportion" {
- formula = strconv.FormatFloat(arg.proportion, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
+ if rule.SdkId == "FaceDetect" { // 浜鸿劯妫�娴�
+ if rule.Operator == "==" || rule.Operator == ">=" || rule.Operator == "<=" || rule.Operator == "<" || rule.Operator == ">" || rule.Operator == "!=" {
+ // 濡傛灉鏄笉瑙勭煩鐨勮繛鎺ョ缁熺粺杩斿洖false 瑙勫垯涔熷彧鑳藉垽鏂汉鑴哥殑鐩镐技搴︼紝鎵�浠ヤ笉瀛樺湪鍒殑杩炴帴绗�
+ if rule.SdkArgAlias == "score" || rule.SdkArgAlias == "proportion" || rule.SdkArgAlias == "size" { // 鍒ゆ柇鐨勬槸鐩镐技鍊硷紝鍗犳瘮锛屽昂瀵哥瓑杩囨护鏉′欢锛屽鏋滃啀鏈夛紝杩樺彲浠ュ啀鍔�
+ var args []Arg
+ if rule.RuleWithPre == "&&" {
+ args = am.filterData
+ } else {
+ args = am.args
+ }
+ // 鍏堟竻绌鸿繃婊ゅ悗鐨勬暟鎹紝鍐嶅線閲屽鏈杩囨护鍚庣殑鏁版嵁
+ am.filterData = am.filterData[0:0]
+ for _, arg := range args {
+ var formula string
+ if rule.SdkArgAlias == "score" {
+ formula = strconv.FormatFloat(arg.Score, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
+ } else if rule.SdkArgAlias == "proportion" {
+ formula = strconv.FormatFloat(arg.Proportion, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
+ } else {
+ formula = strconv.FormatFloat(arg.Size, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
+ }
+ expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
+ result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
+ if result.(bool) {
+ 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}
+ } else {
+ return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+ }
} else {
- formula = strconv.FormatFloat(arg.size, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
+ return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
}
- expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
- result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
- if result.(bool) {
- am.filterData = append(am.filterData, arg) // 寰楀埌绗﹀悎鏉′欢鐨勮繃婊ゆ暟鎹�
- }
+ } else {
+ return LittleRuleResult{}
}
- am.targetNum = len(am.filterData) // 鎶婄鍚堟潯浠剁殑鐩爣鏁伴噺鏇存柊鍒皌argetNum瀛楁
+ } else {
+ return LittleRuleResult{}
+ }
+ } else {
+ // 澶勭悊鐨勯兘鏄痽olo鏁版嵁
+ if rule.SdkId == am.sdkId && rule.PolygonId == am.areaId { // 棣栧厛杩欐潯瑙勫垯寰楁槸杩欎釜绠楁硶鐨勮鍒欙紝鍏舵瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
+ if rule.SdkArgAlias == "score" || rule.SdkArgAlias == "proportion" || rule.SdkArgAlias == "size" { // 鍒ゆ柇鐨勬槸鐩镐技鍊硷紝鍗犳瘮锛屽昂瀵哥瓑杩囨护鏉′欢锛屽鏋滃啀鏈夛紝杩樺彲浠ュ啀鍔�
+ var args []Arg
+ if rule.RuleWithPre == "&&" {
+ args = am.filterData
+ } else {
+ args = am.args
+ }
+ // 鍏堟竻绌鸿繃婊ゅ悗鐨勬暟鎹紝鍐嶅線閲屽鏈杩囨护鍚庣殑鏁版嵁
+ am.filterData = am.filterData[0:0]
+ for _, arg := range args {
+ var formula string
+ if rule.SdkArgAlias == "score" {
+ formula = strconv.FormatFloat(arg.Score, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
+ } else if rule.SdkArgAlias == "proportion" {
+ formula = strconv.FormatFloat(arg.Proportion, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
+ } else {
+ formula = strconv.FormatFloat(arg.Size, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
+ }
+ expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
+ result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
+ if result.(bool) {
+ 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}
+ } else {
+ return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+ }
+
+ } else {
+ return LittleRuleResult{}
+ }
+
+ } else {
+ return LittleRuleResult{}
}
}
}
// 閮借繃婊ゅ畬鏉′欢涔嬪悗鐪嬬湅鏄惁瑕佸垱寤轰竴涓畾鏃跺櫒鍏冪礌 鍒涘缓瀹氭椂鍣ㄧ殑鏉′欢锛氭槸鍚︽湁闈犲彸琛岋紝涓綋闈欐绛夎嚜甯﹀畾鏃跺櫒鍚箟鐨勭畻娉曚互鍙婃槸鍚︽湁鎸佺画鏃堕棿
func duration(rule *protomsg.Rule, am *AreaMap) {
- if rule.PolygonId == am.areaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
+ if rule.SdkId == am.sdkId && rule.PolygonId == am.areaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓� 閰嶇疆鐨勭畻娉曡瀵圭殑涓�
if rule.SdkArgAlias == "duration" { //
// 鍏堢湅鐪嬪畾鏃跺櫒鍏冪礌闃熷垪涓槸鍚︽湁杩欎釜鎽勫儚鏈鸿繖涓尯鍩熺殑瀹氭椂鍣�,濡傛灉鏈夊氨涓嶈兘鍐嶆鍒涘缓浜�
var flag bool = true
for k, _ := range TimeEleList {
- if k == am.taskId+" "+am.areaId {
+ if k == am.taskId+" "+am.sdkId+" "+am.areaId {
flag = false // 鏈夊氨缃负false
fmt.Println("鏈夎繖涓畾鏃跺櫒锛屼笉鍐嶅垱寤轰簡锛�")
}
@@ -486,101 +650,65 @@
timeLength, _ := strconv.Atoi(rule.SdkArgValue)
timeEle := TimeElement{N: timeLength, InitN: timeLength} // 鎵旇繘鍘讳竴涓畾鏃跺櫒鍏冪礌
//TimeEleList = make(map[string]timeElement)
- TimeEleList[am.taskId+" "+am.areaId] = &timeEle // 瀹氭椂鍣ㄥ厓绱犱互鎽勫儚鏈篿d鎷兼帴鍖哄煙id涓洪敭
+ TimeEleList[am.taskId+" "+am.sdkId+" "+am.areaId] = &timeEle // 瀹氭椂鍣ㄥ厓绱犱互鎽勫儚鏈篿d鎷兼帴鍖哄煙id涓洪敭
fmt.Println("鍒涘缓浜嗚鏁板櫒骞朵笖璁℃暟鍣ㄩ泦鍚堜负锛�", TimeEleList)
}
}
}
}
-// 鍐椾綑鎷兼帴涓�涓洰鏍囨暟閲忓ぇ浜�0
-func splice1(am *AreaMap) string {
- var num int = 0
- for _,data := range am.filterData{
- if data.isYolo {
- num++
- }
- }
- log.Println("鐪嬬湅鍖哄煙鍐呯鍚堟潯浠剁殑鐩爣鏁伴噺锛�----------", num)
- formula := strconv.Itoa(num) + " " + ">" + "0"
- expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
- result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
- return strconv.FormatBool(result.(bool))
-}
+//// 鍐椾綑鎷兼帴涓�涓洰鏍囨暟閲忓ぇ浜�0
+//func splice1(am *AreaMap) string {
+// var num int = 0
+// for _, data := range am.filterData {
+// if data.isYolo {
+// num++
+// }
+// }
+// log.Println("鐪嬬湅鍖哄煙鍐呯鍚堟潯浠剁殑鐩爣鏁伴噺锛�----------", num)
+// formula := strconv.Itoa(num) + " " + ">" + "0"
+// expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
+// result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
+// return strconv.FormatBool(result.(bool))
+//}
// 缁欐暟鎹簱鐨勮鍒欒〃杈惧紡浠ｅ弬 args: 涓�鏉″瓙瑙勫垯锛屽尯鍩熸暟鎹�
-func transferParameters(rule *protomsg.Rule, am *AreaMap) (string,string) {
- if rule.PolygonId == am.areaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
+func transferParameters(rule *protomsg.Rule, am *AreaMap) LittleRuleResult {
+ if rule.SdkId == am.sdkId && rule.PolygonId == am.areaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
if rule.SdkArgAlias == "targetNum" { // 濡傛灉鍙傛暟鏄鍖哄煙鍐呯洰鏍囨暟閲� 鍗硑olo 浜鸿劯涓嶄細鏈夋暟閲�
//fmt.Println("寰楀嚭缁撴灉闃舵", "姣旇緝鐨勮鍒欐槸锛�", rule)
if rule.Operator == "" {
- return strconv.Itoa(am.targetNum),"" // 濡傛灉鍚庨潰涓嶈窡鎿嶄綔绗﹀氨鐩存帴杩斿洖鏁伴噺 姣斿瑕佽窡涓嬩竴涓尯鍩熸瘮杈冩暟閲忕殑灏辩洿鎺ヨ繑鍥炴湰鍖哄煙鐨勬暟閲�
+ return 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{
- if data.isYolo {
+ for _, data := range am.filterData {
+ if data.IsYolo {
num++
}
}
formula := strconv.Itoa(num) + " " + rule.Operator + " " + rule.SdkArgValue
expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
- return strconv.FormatBool(result.(bool)),""
+ return LittleRuleResult{am.sdkName, strconv.FormatBool(result.(bool)) + "" + rule.RuleWithPre, rule.Sort}
// 鍔犱笂鍏充簬绠楁硶鐨勫垽鏂潯浠讹紝涓嶈兘鍙湁鍏充簬瑙勫垯鐨勶紝鏈夌殑绠楁硶鏈韩灏辨槸涓�涓鍒欙紝濡備釜浣撻潤姝紝闈犲彸琛�,鎵�浠ワ紝鎷垮埌褰撳墠瀛愯鍒欑殑sdkid鏉ュ垽鏂槸鍚︽槸閭ｄ簺鐗规畩鐨勮鍒�
} else if rule.SdkId == "IsStatic" { // 闈欐绠楁硶
if am.isStatic {
- return "true","static"
+ return LittleRuleResult{}
} else {
- return "false","static"
+ return LittleRuleResult{}
}
} else if rule.SdkId == "KeepRight" { // 闈犲彸琛岀畻娉�
if am.keepRight {
- return "true","keepRight"
+ return LittleRuleResult{}
} else {
- return "false","keepRight"
+ return LittleRuleResult{}
}
- } else if rule.SdkId == "FaceDetect" { // 浜鸿劯妫�娴�
- if rule.Operator == "==" || rule.Operator == ">=" || rule.Operator == "<=" || rule.Operator == "<" || rule.Operator == ">" || rule.Operator == "!=" {
- // 濡傛灉鏄笉瑙勭煩鐨勮繛鎺ョ缁熺粺杩斿洖false 瑙勫垯涔熷彧鑳藉垽鏂汉鑴哥殑鐩镐技搴︼紝鎵�浠ヤ笉瀛樺湪鍒殑杩炴帴绗�
-
- return "false","face"
- } else {
- return "false","face"
- }
- } else if rule.SdkId == "FaceCompare" {
- // 鍙渶瑕佽繃婊ら槇鍊硷紝杩囨护瀹屽悗鏁扮粍闀垮害澶т簬0鍗充负鎶ヨ锛屼絾瑕佽�冭檻濡備綍瀵规瘡涓�寮犻兘鎶ヨ鍛�
- argValue, err := strconv.ParseFloat(rule.SdkArgValue, 64)
- if err != nil {
- log.Println("瑙勫垯閰嶇疆鐨勯槇鍊奸潪娉�")
- return "false","face"
- }
- flag := "false"
- for _, obj := range am.filterData {
- if !obj.isYolo { // 浜鸿劯鏁版嵁鎵嶈繃婊ょ浉浼艰��
- for index := 0; index < len(obj.liker); {
- // 灏嗚揪涓嶅埌闃堝�肩殑鐩镐技鑰呬粠鐩镐技鑰呮暟缁勪腑鍒犻櫎
- if obj.liker[index].Score < argValue {
- // Go 璇█涓垏鐗囧垹闄ゅ厓绱犵殑鏈川鏄細浠ヨ鍒犻櫎鍏冪礌涓哄垎鐣岀偣锛屽皢鍓嶅悗涓や釜閮ㄥ垎鐨勫唴瀛橀噸鏂拌繛鎺ヨ捣鏉ャ�備笉鐢ㄦ��鐤戯紝鏁扮粍鍒犻櫎鍏冪礌灏辫繖涔堝潙鐖�
- obj.liker = append(obj.liker[:index], obj.liker[index+1:]...)
- } else {
- index++
- }
- }
- }
- }
- for _,obj2 := range am.filterData {
- if !obj2.isYolo && len(obj2.liker) > 0 {
- flag = "true"
- }
- }
- return flag,"face"
}
-
}
- return "",""
+ return LittleRuleResult{}
}
-func timeRuleResult(rule *protomsg.Rule, am *AreaMap) string {
+func timeRuleResult(rule *protomsg.Rule, am *AreaMap) LittleRuleResult {
if rule.PolygonId == am.areaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
if rule.SdkArgAlias == "time" { // 鍒ゆ柇鏄惁绗﹀悎鏃堕棿瑙勫垯
// 鏍规嵁鏀惧�煎瓧娈甸噷瀛樼殑鏃堕棿瑙勫垯鐨刬d鍘诲彟涓�涓〃閲屾煡闇�瑕佹瘮瀵圭殑鏃堕棿娈碉紙姣斿褰撳墠鏃堕棿鏄懆涓夛紝搴旀牴鎹尯鍩焛d鏌ュ嚭鍏跺懆涓夌殑鍑犱釜甯冮槻鏃堕棿娈碉紝鏁扮粍锛�
@@ -620,10 +748,10 @@
}
}
}
- return flag
+ return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + flag, rule.Sort}
}
}
- return ""
+ return LittleRuleResult{}
}
// 鏍规嵁浼犲叆鐨勫瓧绗︿覆寰楀埌鍏跺湪涓�鍛ㄥ唴鐨勭储寮� 鍛ㄤ竴鍒板懆鏃ュ垎鍒搴�1鍒�7
diff --git a/ruleserver/timeTicker.go b/ruleserver/timeTicker.go
index 6cecea4..4a674ca 100644
--- a/ruleserver/timeTicker.go
+++ b/ruleserver/timeTicker.go
@@ -91,3 +91,11 @@
func (p SubList) Swap(i, j int) { p[i], p[j] = p[j], p[i] }
func (p SubList) Len() int { return len(p) }
func (p SubList) Less(i, j int) bool { return p[i].Sort < p[j].Sort }
+
+// 缁撴瀯浣撴牴鎹煇瀛楁鎺掑簭
+type resultList []*LittleRuleResult
+
+func (p resultList) Swap(i, j int) { p[i], p[j] = p[j], p[i] }
+func (p resultList) Len() int { return len(p) }
+func (p resultList) Less(i, j int) bool { return p[i].Sort < p[j].Sort }
+
diff --git a/util/image.go b/util/image.go
index ba4ede8..a00e3b7 100644
--- a/util/image.go
+++ b/util/image.go
@@ -1,14 +1,16 @@
package util
import (
+ "basic.com/pubsub/protomsg.git"
"bytes"
"fmt"
+ "github.com/gogo/protobuf/proto"
"image"
"image/jpeg"
"reflect"
)
// 鎸夊昂瀵稿幓鍒囧浘
-func subimg(dbyte []byte,x0,y0,x1,y1 int,) []byte{
+func Subimg(dbyte []byte,x0,y0,x1,y1 int,) protomsg.Image{
bbb := bytes.NewBuffer(dbyte) // 蹇呴』鍔犱竴涓猙uffer 涓嶇劧娌℃湁read鏂规硶灏变細鎶ラ敊
m, _, _ := image.Decode(bbb) // 鍥剧墖鏂囦欢瑙ｇ爜
@@ -20,7 +22,9 @@
emptyBuff := bytes.NewBuffer(nil) //寮�杈熶竴涓柊鐨勭┖buff
jpeg.Encode(emptyBuff, subImg, nil) //img鍐欏叆鍒癰uff
bytes := emptyBuff.Bytes()
- return bytes
+ i := protomsg.Image{}
+ proto.Unmarshal(bytes,&i)
+ return i
//f, _ := os.Create("./test.jpg") //鍒涘缓鏂囦欢
//defer f.Close() //鍏抽棴鏂囦欢
//jpeg.Encode(f, subImg, nil) //鍐欏叆鏂囦欢
diff --git a/util/upload.go b/util/upload.go
index 00aa0f9..9286695 100644
--- a/util/upload.go
+++ b/util/upload.go
@@ -15,6 +15,7 @@
)
// 涓婁紶鍥剧墖锛堜簩杩涘埗娴侊級
func PostFormBufferData(uri string, img protomsg.Image, fileName string,) (maps map[string]interface{}, err0 error) {
+ // 瑕佹寚瀹氳浆byte鐨勬牸寮�
imgs := gocv.NewMat()
imgs, _ = gocv.NewMatFromBytes(int(img.Height), int(img.Width), gocv.MatTypeCV8UC3, img.Data)
fdata,_ := gocv.IMEncode(".jpg",imgs)
@@ -72,4 +73,66 @@
}
return decoder, nil
}
+}
+
+// 涓婁紶鍥剧墖锛堜簩杩涘埗娴侊級
+func PostFormBufferData1(uri string, fbada []byte, fileName string,) (maps map[string]interface{}, err0 error) {
+ // 瑕佹寚瀹氳浆byte鐨勬牸寮�
+ imgs := gocv.NewMat()
+ imgs, _ = gocv.NewMatFromBytes(1000, 1000, gocv.MatTypeCV8UC3, fbada)
+ fdata,_ := gocv.IMEncode(".jpg",imgs)
+ body := &bytes.Buffer{}
+ writer := multipart.NewWriter(body)
+ _, err := writer.CreateFormFile("file", fileName)
+ if err != nil {
+ return nil, err
+ }
+ boundary := writer.Boundary()
+ //close_string := fmt.Sprintf("\r\n--%s--\r\n", boundary)
+ close_buf := bytes.NewBufferString(fmt.Sprintf("\r\n--%s--\r\n", boundary))
+ file := bytes.NewBuffer(fdata)
+ request_reader := io.MultiReader(body, file, close_buf)
+ //_, err = io.Copy(part, file)
+ //writer.WriteField(key, val)
+ request, err := http.NewRequest("POST", uri, request_reader)
+ request.Header.Add("Content-Type", writer.FormDataContentType())
+ timeout := time.Duration(5 * time.Second) //瓒呮椂鏃堕棿50ms
+ client := &http.Client{Timeout: timeout}
+ resp, err := client.Do(request)
+ if err != nil {
+ log.Fatal(err)
+ return nil, err
+ }
+ defer func() {
+ if r := recover(); r != nil {
+ fmt.Printf("panic鐨勫唴瀹�%v\n", r)
+ msg := "涓婁紶鍥剧墖鏈嶅姟鍣ㄥ紓甯�"
+ if _, ok := r.(error); ok {
+ msg = r.(error).Error()
+ fmt.Println("panic--recover()寰楀埌鐨勬槸error绫诲瀷")
+ }
+ if _, ok := r.(string); ok {
+ msg = r.(string)
+ fmt.Println("panic--recover()寰楀埌鐨勬槸string绫诲瀷")
+ }
+ err0 = errors.New(msg)
+ }
+ }()
+ defer resp.Body.Close()
+ {
+ body := &bytes.Buffer{}
+ _, err := body.ReadFrom(resp.Body)
+ if err != nil {
+ log.Fatal(err)
+ }
+ fmt.Println(resp.StatusCode)
+ //fmt.Println(resp.Header)
+ fmt.Println(body)
+ //decoder := json.NewDecoder(strings.NewReader(body.String()))
+ decoder := make(map[string]interface{})
+ if err := json.Unmarshal([]byte(body.String()), &decoder); err != nil {
+ return nil, err
+ }
+ return decoder, nil
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0