From 7c952ec032baaeda70bfb9483cf7e7bf93d92811 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 20 十一月 2019 19:52:54 +0800
Subject: [PATCH] ---
---
insertdata/insertDataToEs.go | 4 ++--
ruleserver/server.go | 1 -
ruleserver/ruleToformula.go | 3 ---
labelFilter/readyDataForLabel.go | 6 ++----
4 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 8196a51..af570d2 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -189,9 +189,7 @@
target.TargetId = face.Id
target.TargetScore = face.Score
target.TargetType = face.Type
- logger.Info("浜鸿劯鐨勭壒寰佸�兼槸锛�",face.Feature)
target.Feature = base64.StdEncoding.EncodeToString(face.Feature)
- logger.Info("base64鐗堟湰锛�",target.Feature)
target.PicSmUrl = resp["fileUrl"].(string)
target.TargetLocation = Points{TopLeft: Point{face.Location.X, face.Location.Y}, BottomRight: Point{face.Location.X + face.Location.Width, face.Location.Y + face.Location.Height}}
var targetInfos []Target
@@ -363,6 +361,7 @@
var target1 = new(Target)
target1.TargetId = target.Id
target1.TargetScore = target.Score
+ target1.TargetType = target.Type
target1.TargetLocation = Points{TopLeft: Point{target.Location.X, target.Location.Y}, BottomRight: Point{target.Location.X + target.Location.Width, target.Location.Y + target.Location.Height}}
targetInfos = append(targetInfos, *target1)
}
@@ -563,6 +562,7 @@
var target1 = new(Target)
target1.TargetId = target.Id
target1.TargetScore = target.Score
+ target1.TargetType = target.Type
target1.TargetLocation = Points{TopLeft: Point{target.Location.X, target.Location.Y}, BottomRight: Point{target.Location.X + target.Location.Width, target.Location.Y + target.Location.Height}}
targetInfos = append(targetInfos, *target1)
}
diff --git a/labelFilter/readyDataForLabel.go b/labelFilter/readyDataForLabel.go
index 481478f..2ebad26 100644
--- a/labelFilter/readyDataForLabel.go
+++ b/labelFilter/readyDataForLabel.go
@@ -28,7 +28,7 @@
}
}
}
- if flag1{
+ if flag1{ // 鏈夊彲鎺ㄩ�佺殑鏁版嵁
logger.Info("---------------鏍囩杩囨护鍣ㄨ祴鍊�")
label.CameraId = result.Cid
camera, err := cache.GetCameraById(result.Cid)
@@ -54,6 +54,4 @@
}
logger.Info("------------鏍囩杩囨护鍣ㄨ祴鍊煎畬姣�")
}
-}
-
-// 浠庣紦瀛樹腑鏌ュ嚭鎵�鏈夌殑瑙勫垯鏁版嵁
+}
\ No newline at end of file
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index aa47c69..3ca771d 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -274,7 +274,6 @@
}
}
}
- //logger.Println("-----------------------------------------------鍚浣犳槸绌虹殑锛�",faces)
return faces
}
@@ -283,7 +282,6 @@
if len(am.FilterData) > 0 {
locations = am.FilterData
}
- //logger.Println("-----------------------------------------------鍚浣犳槸绌虹殑锛�",faces)
return locations
}
func putTargetsToResult(am *structure.AreaMap) []*structure.Arg {
@@ -291,7 +289,6 @@
if len(am.AlarmObj) > 0 {
locations = am.AlarmObj
}
- //logger.Println("-----------------------------------------------鍚浣犳槸绌虹殑锛�",faces)
return locations
}
// 鑱斿姩浠诲姟鐨勫鐞�
diff --git a/ruleserver/server.go b/ruleserver/server.go
index 37bd0ac..2ba38db 100644
--- a/ruleserver/server.go
+++ b/ruleserver/server.go
@@ -51,7 +51,6 @@
func publishMessage(msg *protomsg.VideotapeInfo) {
sendBytes,err := proto.Marshal(msg)
if err ==nil{
- logger.Debug("鐪嬬湅杩欎釜鐤戜技绌烘寚閽堢殑涓滆タ",discoveryServer)
discoveryServer.PublishMsg(string(sendBytes))
}
}
--
Gitblit v1.8.0