From 6778d033d1659069119cd0fb7fc5947b29c1cd5e Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 15 七月 2019 14:23:45 +0800
Subject: [PATCH] 扩大全部区域判断范围
---
/dev/null | 0
labelFilter/labelFilter.go | 39 +++++++++++++++++++++++++++++++++++++++
ruleserver/ruleToformula.go | 2 +-
3 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/labelFilter/labelFilter.go b/labelFilter/labelFilter.go
new file mode 100644
index 0000000..850fb97
--- /dev/null
+++ b/labelFilter/labelFilter.go
@@ -0,0 +1,39 @@
+package labelFilter
+
+import (
+ "basic.com/pubsub/protomsg.git"
+ "ruleprocess/cache"
+ "ruleprocess/logger"
+ "ruleprocess/ruleserver"
+)
+
+type Label struct {
+ CameraId string
+ CameraName string
+ CameraAddr string
+ TaskId string
+ Persons []*Person
+ DefenceLevel string
+}
+
+type Person struct {
+ Id string
+ Level string
+ Gender string
+ Age int
+ Race string
+ Likers []*protomsg.Baseinfo
+}
+
+func DataFormatToLabel(result ruleserver.ResultMsg) Label {
+ labelData := Label{}
+ labelData.CameraId = result.Cid
+ camera, err := cache.GetCameraById(result.Cid)
+ if err != nil {
+ logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭嚭閿�")
+ }
+ labelData.CameraName = camera.Name
+ labelData.CameraAddr = camera.Addr
+ labelData.TaskId = result.Tasklab.Taskid
+ return Label{}
+}
diff --git a/ruleprocess b/ruleprocess
deleted file mode 100755
index a9a7501..0000000
--- a/ruleprocess
+++ /dev/null
Binary files differ
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 6936787..00b3f3d 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -628,7 +628,7 @@
// 灏嗗瓧绗︿覆鏍煎紡鐨勫潗鏍囧簭鍒楀寲涓篜oint鏍煎紡
func Json2points(areaPoints string) []Point {
var pts []Point
- if areaPoints == "[]" {
+ if areaPoints == "[]" || areaPoints == ""{
logger.Error("=====================姝ゅ尯鍩熶负鍏ㄩ儴鍖哄煙")
pts = append(pts, Point{0, 0})
pts = append(pts, Point{0, 540})
--
Gitblit v1.8.0