From 11164b48c94572573b51c380894763008f6010f6 Mon Sep 17 00:00:00 2001
From: sunty <suntianyu0923@163.com>
Date: 星期二, 30 七月 2019 17:15:46 +0800
Subject: [PATCH] delete EndTime omitempty
---
service/FaceCompareService.go | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/service/FaceCompareService.go b/service/FaceCompareService.go
index 0583af5..bf1a322 100644
--- a/service/FaceCompareService.go
+++ b/service/FaceCompareService.go
@@ -13,7 +13,6 @@
"sort"
"strconv"
"sync"
- "time"
"webserver/extend/config"
"webserver/extend/logger"
"webserver/extend/util"
@@ -126,14 +125,15 @@
rList :=make([]protomsg.Esinfo,0)
err = json.Unmarshal(*resultB, &rList)
if err !=nil{
- logger.Debug("recv result Unmarshal err:", err)
+ logger.Debug("comp recv result Unmarshal err:", err)
continue
}
- logger.Debug("len(rList):", len(rList))
+ logger.Debug("comp len(rList):", len(rList))
if len(rList) >0 {
resultList = append(resultList, FillDataToCompareResult(&rList)...)
}
}
+ logger.Debug("comp totalList.len:", len(resultList))
//2.缂撳瓨姣斿缁撴灉
co := &CompareOnce{
@@ -146,29 +146,29 @@
}
func doCompareRequest(url string,args []byte) *[]byte{
- reqUrl := "tcp://"+url
- logger.Debug("reqUrl:",reqUrl)
+ logger.Debug("comp reqUrl:",url)
var sock mangos.Socket
var err error
var msg []byte
if sock,err = req.NewSocket();err !=nil {
- logger.Debug("can't new req socket:%s",err.Error())
+ logger.Debug("comp can't new req socket:%s",err.Error())
return nil
}
sock.AddTransport(ipc.NewTransport())
sock.AddTransport(tcp.NewTransport())
- sock.SetOption(mangos.OptionRecvDeadline, time.Second*10)
if err = sock.Dial(url);err !=nil {
- logger.Debug("can't dial on req socket:%s",err.Error())
+ logger.Debug("comp can't dial on req socket:%s",err.Error())
return nil
}
+ sock.SetOption(mangos.OptionMaxRecvSize, 1024*1024*100)
+ //sock.SetOption(mangos.OptionRecvDeadline, time.Second*10)
if err = sock.Send(args);err !=nil {
- logger.Debug("can't send message on push socket:%s",err.Error())
+ logger.Debug("comp can't send message on push socket:%s",err.Error())
return nil
}
if msg,err = sock.Recv();err !=nil {
- logger.Debug("sock.Recv receive err:%s",err.Error())
+ logger.Debug("comp sock.Recv receive err:%s",err.Error())
return nil
}
sock.Close()
@@ -192,8 +192,8 @@
personIds = append(personIds,v.Id)
}
}
- logger.Debug("personIds:", personIds)
- logger.Debug("captureIds:",captureIds)
+ logger.Debug("comp personIds:", personIds)
+ logger.Debug("comp captureIds:",captureIds)
esServerIp := config.EsInfo.Masterip
esServerPort := config.EsInfo.Httpport
index := config.EsInfo.EsIndex.Dbtablepersons.IndexName
@@ -202,7 +202,7 @@
dbpersons, _ = esApi.Dbpersoninfosbyid(personIds, index, esServerIp, esServerPort)
}
- logger.Debug("dbpersons.len:", len(dbpersons))
+ logger.Debug("comp dbpersons.len:", len(dbpersons))
if dbpersons !=nil {
for _,p :=range dbpersons {
var dbP = DbPersonVo {
@@ -229,9 +229,9 @@
}
var capturePersons []protomsg.Videopersons
if len(captureIds) >0 {
- logger.Debug("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("videoPersons.len:",len(videopersons))
+ logger.Debug("comp videoPersons.len:",len(videopersons))
for _,vp :=range videopersons {
isAlarmInt, _ := strconv.Atoi(vp.IsAlarm)
bi := make([]DbPersonVo,0)
@@ -255,7 +255,7 @@
CameraAddr: vp.CameraAddr,
PicDate: vp.PicDate,
PicMaxUrl: vp.PicMaxUrl,
- PicSmUrl: []string{ vp.PicSmUrl },
+ PicSmUrl: vp.PicSmUrl,
IsAlarm: isAlarmInt,
Sex: vp.Sex,
AgeDescription: vp.AgeDescription,
--
Gitblit v1.8.0