From cb12e2fbf196a2184af4a3d269e3283c41a1eb34 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 17 七月 2019 13:24:34 +0800
Subject: [PATCH] ---
---
main.go | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/main.go b/main.go
index 7c6019f..e433cbc 100644
--- a/main.go
+++ b/main.go
@@ -69,9 +69,9 @@
arg := ruleserver.SdkDatas{}
m := paramFormat(msg, &arg)
//logger.Info("瑙ｆ瀽鍑烘潵鐨勬暟鎹細", arg)
- ruleserver.Judge(&arg)
+ ruleserver.Judge(&arg,&m) // 鎶妔dkMessage浼犺繘鍘伙紝鏂逛究缂撳瓨鏁版嵁鏃舵嫾鍑轰竴涓猺esultMag
// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
- resultMag := ruleserver.ResultMsg{SdkMessage: m, RuleResult: arg.RuleResult}
+ resultMag := ruleserver.ResultMsg{SdkMessage: &m, RuleResult: arg.RuleResult}
//logger.Info("鎵撳畬鏍囩鍚庣殑缁撴灉锛�",resultMag)
// 灏嗘墦瀹屾爣绛剧殑鏁版嵁鎻掑叆鍒癊S
@@ -106,6 +106,7 @@
panic("瑙ｆ瀽msg鏃跺嚭鐜伴敊璇�")
}
args.CameraId = m.Cid
+ args.TaskId = m.Tasklab.Taskid
// 鎶婂浘鐗囩殑浜岃繘鍒惰В鍘嬬缉杩涜鐢绘鍦ㄥ帇缂╁洖鍘�
bdata, err := util.UnCompress(m.Data)
if err != nil {
@@ -142,6 +143,7 @@
//logger.Info("--------------鐪嬬湅yolo涓湁鍑犱釜鐩爣锛�",len(yoloParam.Infos))
for _, info := range yoloParam.Infos {
if info.Typ == 0 {
+ //logger.Debug("-------------yolo鐨勫潗鏍囨湁鍑犱釜",info.RcObj)
photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)*100,IsYolo:true}
arg.Photo = append(arg.Photo, photoMap)
}
--
Gitblit v1.8.0