From 4cbf188b1db677e5e5914afff3fa5312ff2dc587 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 31 七月 2019 15:44:01 +0800
Subject: [PATCH] fix initForData
---
controllers/fileController.go | 4 ++--
service/FaceCompareService.go | 2 --
controllers/initForData.go | 11 +++++++----
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index 0d85099..95c7146 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -225,7 +225,7 @@
//logger.Debug("compareResult.len:",*compareOnce)
dataList := compareOnce.CompareData
- logger.Debug("姣斿缁撴潫锛岀敤鏃讹細",time.Since(timeStart))
+ logger.Debug("comp 姣斿缁撴潫锛岀敤鏃讹細",time.Since(timeStart))
service.SortByScore(dataList)
totalList := len(dataList)
@@ -237,7 +237,7 @@
} else {
m["totalList"] = dataList[0:searchBody.Size]
}
- logger.Debug("姣斿鍔犳帓搴忚繑鍥炵敤鏃�:", time.Since(timeStart))
+ logger.Debug("comp 姣斿鍔犳帓搴忚繑鍥炵敤鏃�:", time.Since(timeStart))
util.ResponseFormat(c,code.Success,m)
}
}
diff --git a/controllers/initForData.go b/controllers/initForData.go
index 6838ddd..8999776 100644
--- a/controllers/initForData.go
+++ b/controllers/initForData.go
@@ -30,11 +30,14 @@
url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
"/" + index + "/_search"
cameraIdStr := ""
- cameraId := searchBody["treeNodes"].([]interface{})
- if cameraId != nil && len(cameraId) > 0 {
- esCameraId := strings.Replace(strings.Trim(fmt.Sprint(cameraId), "[]"), " ", "\",\"", -1)
- cameraIdStr = "{\"terms\":{\"cameraId\":[\"" + esCameraId + "\"]}},"
+ if searchBody["treeNodes"] !=nil {
+ cameraId := searchBody["treeNodes"].([]interface{})
+ if cameraId != nil && len(cameraId) > 0 {
+ esCameraId := strings.Replace(strings.Trim(fmt.Sprint(cameraId), "[]"), " ", "\",\"", -1)
+ cameraIdStr = "{\"terms\":{\"cameraId\":[\"" + esCameraId + "\"]}},"
+ }
}
+
var setApi dbapi.SysSetApi
_, sysconf := setApi.GetServerInfo()
analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + sysconf.ServerId + "\"}}"
diff --git a/service/FaceCompareService.go b/service/FaceCompareService.go
index 4c0de89..addfce3 100644
--- a/service/FaceCompareService.go
+++ b/service/FaceCompareService.go
@@ -228,9 +228,7 @@
resultList = append(resultList,cr)
}
}
- var capturePersons []protomsg.Videopersons
if len(captureIds) >0 {
- 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 {
--
Gitblit v1.8.0