From d94f80d854d09e89715ca7c2361cd6057f98f396 Mon Sep 17 00:00:00 2001
From: sunty <suntianyu0923@163.com>
Date: 星期三, 31 七月 2019 17:21:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
controllers/fileController.go | 11 +++++++++--
service/FaceCompareService.go | 31 +++++++++++++++----------------
controllers/initForData.go | 11 +++++++----
3 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index 9ad7591..f0eb62f 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -218,10 +218,15 @@
logger.Debug("arg.TableIds:", arg.TableIds, ",alarmLevel:",arg.AlarmLevel,",treeNodes:",arg.TreeNodes,",searchTime:",arg.SearchTime,
",inputValue:",arg.InputValue,",tasks:",arg.Tasks,",compThreshold:",arg.CompareThreshold)
+ timeStart := time.Now()
+
compareService := service.NewFaceCompareService(arg)
compareOnce := compareService.Compare()
//logger.Debug("compareResult.len:",*compareOnce)
dataList := compareOnce.CompareData
+
+ logger.Debug("comp 姣斿缁撴潫锛岀敤鏃讹細",time.Since(timeStart))
+
service.SortByScore(dataList)
totalList := len(dataList)
m := make(map[string]interface{},3)
@@ -232,6 +237,7 @@
} else {
m["totalList"] = dataList[0:searchBody.Size]
}
+ logger.Debug("comp 姣斿鍔犳帓搴忚繑鍥炵敤鏃�:", time.Since(timeStart))
util.ResponseFormat(c,code.Success,m)
}
}
@@ -277,7 +283,7 @@
resultList = append(resultList,cr)
}
}
- logger.Debug("GetCompareDataTwice.data:",resultList)
+ //logger.Debug("GetCompareDataTwice.data:",resultList)
service.SortByScore(resultList)
from := (arg.Page-1)*arg.Size
to := from + arg.Size
@@ -290,7 +296,8 @@
if to <= len(resultList) {
m["totalList"] = resultList[from:to]
} else {
- m["totalList"] = resultList[from:len(resultList)]
+ lte := len(resultList)
+ m["totalList"] = resultList[from:lte]
}
} else {
m["totalList"] = []service.CompareResult{}
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 71543ef..addfce3 100644
--- a/service/FaceCompareService.go
+++ b/service/FaceCompareService.go
@@ -3,7 +3,6 @@
import (
esApi "basic.com/pubsub/esutil.git"
"basic.com/pubsub/protomsg.git"
- "encoding/json"
"github.com/gogo/protobuf/proto"
"github.com/satori/go.uuid"
"nanomsg.org/go-mangos"
@@ -122,15 +121,17 @@
if resultB == nil || len(*resultB) ==0 {
continue
}
- rList :=make([]protomsg.Esinfo,0)
- err = json.Unmarshal(*resultB, &rList)
- if err !=nil{
- logger.Debug("comp recv result Unmarshal err:", err)
+ var sdkCompResult protomsg.SdkCompareResult
+ //rList :=make([]protomsg.Esinfo,0)
+ err = proto.Unmarshal(*resultB, &sdkCompResult)
+ if err !=nil {
+ logger.Debug("comp sdkCompareResult unmarshal err:", err)
continue
}
- logger.Debug("comp len(rList):", len(rList))
- if len(rList) >0 {
- resultList = append(resultList, FillDataToCompareResult(&rList)...)
+
+ logger.Debug("comp len(rList):", len(sdkCompResult.CompareResult))
+ if len(sdkCompResult.CompareResult) >0 {
+ resultList = append(resultList, FillDataToCompareResult(&sdkCompResult)...)
}
}
logger.Debug("comp totalList.len:", len(resultList))
@@ -176,19 +177,19 @@
}
//濉厖鍚戝墠绔繑鍥炵殑鏁版嵁
-func FillDataToCompareResult(rList *[]protomsg.Esinfo) []CompareResult {
+func FillDataToCompareResult(compResult *protomsg.SdkCompareResult) []CompareResult {
resultList :=make([]CompareResult,0)
- dbPersonM := make(map[string]*protomsg.Esinfo,0)
- captureM := make(map[string]*protomsg.Esinfo,0)
+ dbPersonM := make(map[string]*protomsg.SdkCompareEach, 0)
+ captureM := make(map[string]*protomsg.SdkCompareEach, 0)
personIds :=make([]string,0)
captureIds := make([]string,0)
- for _,v :=range *rList{
+ for _,v :=range compResult.CompareResult{
if v.Tableid == CaptureTable {
- captureM[v.Id] = &v
+ captureM[v.Id] = v
captureIds = append(captureIds,v.Id)
} else {
- dbPersonM[v.Id] = &v
+ dbPersonM[v.Id] = v
personIds = append(personIds,v.Id)
}
}
@@ -227,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