From d5c0324b630cc019c1b3faed8ab195f7d772addf Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 29 七月 2019 15:32:30 +0800
Subject: [PATCH] fix comp bug
---
controllers/camera.go | 1 +
service/FaceCompareService.go | 11 +++++++++--
controllers/es.go | 2 ++
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/controllers/camera.go b/controllers/camera.go
index 6c0611b..b800bb7 100644
--- a/controllers/camera.go
+++ b/controllers/camera.go
@@ -269,6 +269,7 @@
//filename, err := service.UpdateSnapshotUrl(cid)
filename, err := service.UpdateCapture(cid)
if err != nil {
+ logger.Debug("UpdateSnapshotUrl.err:",err)
util.ResponseFormat(c, code.ComError, "鏇存柊澶辫触")
return
}
diff --git a/controllers/es.go b/controllers/es.go
index 46cb2f5..7e0cc8e 100644
--- a/controllers/es.go
+++ b/controllers/es.go
@@ -40,12 +40,14 @@
//浜屾鎼滅储鍜屾帓搴�
twiceM := GetCompareDataTwice(co,searchBody)
util.ResponseFormat(c,code.Success,twiceM)
+ return
} else {
m :=make(map[string]interface{},0)
m["compareNum"] = searchBody.CompareNum
m["total"] = 0
m["totalList"] = []service.CompareResult{}
util.ResponseFormat(c,code.CompareResultGone,m)
+ return
}
}
m :=make(map[string]interface{},0)
diff --git a/service/FaceCompareService.go b/service/FaceCompareService.go
index 95d2e04..83b9b58 100644
--- a/service/FaceCompareService.go
+++ b/service/FaceCompareService.go
@@ -229,7 +229,7 @@
}
var capturePersons []protomsg.Videopersons
if len(captureIds) >0 {
- logger.Debug("comp capturePersons:", capturePersons)
+ logger.Debug("comp capturePersons.len:", len(capturePersons))
videopersons, _ := esApi.Videopersonsinfosbyid(captureIds, config.EsInfo.EsIndex.VideoPersons.IndexName, config.EsInfo.Masterip, config.EsInfo.Httpport)
logger.Debug("comp videoPersons.len:",len(videopersons))
for _,vp :=range videopersons {
@@ -255,7 +255,7 @@
CameraAddr: vp.CameraAddr,
PicDate: vp.PicDate,
PicMaxUrl: vp.PicMaxUrl,
- PicSmUrl: []string{ vp.PicSmUrl },
+ PicSmUrl: parsePicSmUrl(vp.PicSmUrl),
IsAlarm: isAlarmInt,
Sex: vp.Sex,
AgeDescription: vp.AgeDescription,
@@ -272,6 +272,13 @@
return resultList
}
+func parsePicSmUrl(picSmUrl string) []string {
+ if picSmUrl != ""{
+ return []string{ picSmUrl }
+ }
+ return []string{}
+}
+
func parseMonitorLevel(level string) string {
if level == "1" {
return "涓�绾�"
--
Gitblit v1.8.0