From b5df418bd3a9a332caa1559e96136c149b6f0e44 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 06 八月 2019 13:57:05 +0800
Subject: [PATCH] log
---
controllers/fileController.go | 266 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 164 insertions(+), 102 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index 9284697..4640286 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -20,6 +20,7 @@
"sort"
"strconv"
"strings"
+ "sync"
"time"
"webserver/extend/code"
"webserver/extend/config"
@@ -180,11 +181,25 @@
Sex string `json:"sex"`
TableId string `json:"tableId"`
TableName string `json:"tableName"`
+ Enable int32 `json:"enable"`
+}
+
+type CompareSortResult []CompareResult
+
+func (s CompareSortResult) Len() int{
+ return len(s)
+}
+func (s CompareSortResult) Swap(i,j int){
+ s[i],s[j] = s[j],s[i]
+}
+func (s CompareSortResult) Less(i,j int) bool{
+ return s[i].CompareScore > s[j].CompareScore
}
//濉厖鍚戝墠绔繑鍥炵殑鏁版嵁
-func FillDataToCompareResult(compResult *protomsg.SdkCompareResult) []CompareResult {
- resultList :=make([]CompareResult,0)
+func FillDataToCompareResult(compResult *protomsg.SdkCompareResult) CompareSortResult {
+ //resultList :=make([]CompareResult,0)
+ var resultList = CompareSortResult{}
dbPersonM := make(map[string]*protomsg.SdkCompareEach, 0)
captureM := make(map[string]*protomsg.SdkCompareEach, 0)
@@ -222,6 +237,7 @@
PhoneNum: p.PhoneNum,
Sex: p.Sex,
TableId: p.TableId,
+ Enable: p.Enable,
}
dbTableInfos, _ := esApi.Dbtablefosbyid([]string{p.TableId}, config.EsInfo.EsIndex.DbTables.IndexName, esServerIp, esServerPort)
if dbTableInfos !=nil{
@@ -251,6 +267,8 @@
PhoneNum: p.PhoneNum,
Sex: p.Sex,
TableId: p.TableId,
+ BwType: strconv.Itoa(int(p.BwType)),
+ TableName: p.TableName,
})
}
vpE := CompareResult{
@@ -274,6 +292,7 @@
resultList = append(resultList,vpE)
}
}
+ sort.Sort(resultList)
return resultList
}
@@ -306,21 +325,37 @@
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
return
}
- if searchBody.CompareNum !="" {
- //浜屾鎼滅储锛屼笉闇�瑕佸啀姣斿浜�
- co := service.GetCompResultByNum(searchBody.CompareNum)
- if co != nil {
- //浜屾鎼滅储鍜屾帓搴�
- twiceM := GetCompareDataTwice(co,&searchBody)
- util.ResponseFormat(c,code.Success,twiceM)
- } else {
- m :=make(map[string]interface{},0)
- m["compareNum"] = searchBody.CompareNum
- m["total"] = 0
- m["totalList"] = []CompareResult{}
- util.ResponseFormat(c,code.CompareResultGone,m)
+ var faceB []byte
+ if searchBody.CaptureId != "" {//鍋氭煡鎵炬浜�
+ searchPeople, err := esApi.Dbpersoninfosbyid([]string{searchBody.CaptureId}, config.EsInfo.EsIndex.VideoPersons.IndexName, config.EsInfo.Masterip, config.EsInfo.Httpport)
+ if err !=nil {
+ util.ResponseFormat(c, code.ComError, "鎶撴媿鏁版嵁涓嶅瓨鍦紝璇锋鏌�")
+ return
+ }
+ if searchPeople !=nil && len(searchPeople) == 1{
+ decodeF, err := base64.StdEncoding.DecodeString(searchPeople[0].FaceFeature)
+ if err !=nil {
+ util.ResponseFormat(c, code.ComError, "鏈潯鎶撴�曠壒寰佷笉鏄痓ase64锛岃妫�鏌�")
+ return
+ }
+ faceB = decodeF
}
}
+ //if searchBody.CompareNum !="" {
+ // //浜屾鎼滅储锛屼笉闇�瑕佸啀姣斿浜�
+ // co := service.GetCompResultByNum(searchBody.CompareNum)
+ // if co != nil {
+ // //浜屾鎼滅储鍜屾帓搴�
+ // twiceM := GetCompareDataTwice(co,&searchBody)
+ // util.ResponseFormat(c,code.Success,twiceM)
+ // } else {
+ // m :=make(map[string]interface{},0)
+ // m["compareNum"] = searchBody.CompareNum
+ // m["total"] = 0
+ // m["totalList"] = []CompareResult{}
+ // util.ResponseFormat(c,code.CompareResultGone,m)
+ // }
+ //}
var sysSetApi dbapi.SysSetApi
analyServerId := ""
flag, sysconf := sysSetApi.GetServerInfo()
@@ -330,79 +365,86 @@
util.ResponseFormat(c, code.ComError, "analyServerId涓虹┖锛岄厤缃湁璇�")
return
}
- if face,ok := faceExtractedMap[searchBody.PicUrl];!ok{
+ if searchBody.CaptureId == ""{
+ if face,ok := faceExtractedMap[searchBody.PicUrl];!ok{
+ util.ResponseFormat(c, code.RequestParamError, "璇烽噸鏂颁笂浼犲浘鐗�")
+ return
+ } else {
+ faceB = face.FaceBytes
+ }
+ }
+ if faceB == nil {
util.ResponseFormat(c, code.RequestParamError, "璇烽噸鏂颁笂浼犲浘鐗�")
return
- } else {
- arg := protomsg.CompareArgs{
- FaceFeature: face.FaceBytes,
- CompareThreshold: searchBody.Threshold,
- }
-
- if searchBody.DataBases !=nil {
- for idx,tableId :=range searchBody.DataBases {
- if tableId == "esData" {
- searchBody.DataBases = append(searchBody.DataBases[:idx], searchBody.DataBases[idx+1:]...)
- searchBody.DataBases = append(searchBody.DataBases,service.CaptureTable)
- break
- }
- }
- arg.TableIds = searchBody.DataBases
- }
- arg.Source = true // 鏍囪瘑鏉ユ簮鏄痺eb
- arg.AlarmLevel = searchBody.AlarmLevel
- arg.Tasks = searchBody.Tasks
- arg.TreeNodes = searchBody.TreeNodes
- arg.Tabs = searchBody.Tabs
- arg.SearchTime = searchBody.SearchTime
- arg.InputValue = searchBody.InputValue
- arg.Collection = searchBody.Collection
- arg.AnalyServerId = analyServerId
-
- 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()
- totalData := compareOnce.CompareData
-
- logger.Debug("comp 姣斿缁撴潫锛岀敤鏃讹細",time.Since(timeStart))
- m := make(map[string]interface{},3)
- if totalData != nil && totalData.Len() > 0{
- //鎸夊垎鍊兼帓搴�
- var scorePre []float32
- for _,f1 :=range *totalData {
- scorePre = append(scorePre, f1.CompareScore)
- }
- logger.Debug("comp 鎺掑簭鍓嶅垎鍊兼暟缁勶細",scorePre)
- sort.Sort(totalData)
- var scoreAf []float32
- for _,f2 :=range *totalData {
- scoreAf = append(scoreAf, f2.CompareScore)
- }
- logger.Debug("comp 鎺掑簭鍚庡垎鍊兼暟缁勶細",scoreAf)
- total := totalData.Len()
-
- m["compareNum"] = compareOnce.CompareNum
- m["total"] = total
- var sCompResult protomsg.SdkCompareResult
- if total <= searchBody.Size {
- sCompResult.CompareResult = *totalData
- } else {
- sCompResult.CompareResult = (*totalData)[0:searchBody.Size]
- }
- resultList := FillDataToCompareResult(&sCompResult)
- m["totalList"] = resultList
- logger.Debug("comp 姣斿鍔犳帓搴忚繑鍥炵敤鏃�:", time.Since(timeStart))
-
- } else {
- m["total"] = 0
- m["compareNum"] = searchBody.CompareNum
- m["totalList"] = []CompareResult{}
- }
- util.ResponseFormat(c,code.Success,m)
}
+ arg := protomsg.CompareArgs{
+ FaceFeature: faceB,
+ CompareThreshold: searchBody.Threshold,
+ }
+
+ if searchBody.DataBases !=nil {
+ for idx,tableId :=range searchBody.DataBases {
+ if tableId == "esData" {
+ searchBody.DataBases = append(searchBody.DataBases[:idx], searchBody.DataBases[idx+1:]...)
+ searchBody.DataBases = append(searchBody.DataBases,service.CaptureTable)
+ break
+ }
+ }
+ arg.TableIds = searchBody.DataBases
+ }
+ arg.Source = true // 鏍囪瘑鏉ユ簮鏄痺eb
+ arg.AlarmLevel = searchBody.AlarmLevel
+ arg.Tasks = searchBody.Tasks
+ arg.TreeNodes = searchBody.TreeNodes
+ arg.Tabs = searchBody.Tabs
+ arg.SearchTime = searchBody.SearchTime
+ arg.InputValue = searchBody.InputValue
+ arg.Collection = searchBody.Collection
+ arg.AnalyServerId = analyServerId
+
+ 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()
+ totalData := compareOnce.CompareData
+
+ logger.Debug("comp 姣斿缁撴潫锛岀敤鏃讹細",time.Since(timeStart))
+ m := make(map[string]interface{},3)
+ if totalData != nil && totalData.Len() > 0{
+ //鎸夊垎鍊兼帓搴�
+ var scorePre []float32
+ for _,f1 :=range *totalData {
+ scorePre = append(scorePre, f1.CompareScore)
+ }
+ //logger.Debug("comp 鎺掑簭鍓嶅垎鍊兼暟缁勶細",scorePre)
+ sort.Sort(totalData)
+ var scoreAf []float32
+ for _,f2 :=range *totalData {
+ scoreAf = append(scoreAf, f2.CompareScore)
+ }
+ //logger.Debug("comp 鎺掑簭鍚庡垎鍊兼暟缁勶細",scoreAf)
+ total := totalData.Len()
+
+ m["compareNum"] = compareOnce.CompareNum
+ m["total"] = total
+ var sCompResult protomsg.SdkCompareResult
+ if total <= searchBody.Size {
+ sCompResult.CompareResult = *totalData
+ } else {
+ sCompResult.CompareResult = (*totalData)[0:searchBody.Size]
+ }
+ resultList := FillDataToCompareResult(&sCompResult)
+ m["totalList"] = resultList
+ logger.Debug("comp 姣斿鍔犳帓搴忚繑鍥炵敤鏃�:", time.Since(timeStart))
+
+ } else {
+ m["total"] = 0
+ m["compareNum"] = searchBody.CompareNum
+ m["totalList"] = []CompareResult{}
+ }
+ util.ResponseFormat(c,code.Success,m)
}
func GetCompareDataTwice(co *service.CompareOnce,arg *models.EsSearch) map[string]interface{} {
@@ -544,6 +586,9 @@
}
var rcFace *protomsg.Rect
if err ==nil && len(faceArr) >0 {
+ if len(faceArr) >1 {
+ return "",nil, errors.New("TooManyFaces")
+ }
for _,r := range faceArr {
//鎷垮埌浜鸿劯鐨勫潗鏍�
rcFace = r.Pos.RcFace
@@ -554,8 +599,13 @@
}
var weedfsUri = "http://"+config.WeedFs.Ip+":"+strconv.Itoa(config.WeedFs.UploadPort)+"/submit"
//鏍规嵁浜鸿劯鍧愭爣鎵ｅ嚭浜鸿劯灏忓浘
+ t1 := time.Now()
cutFaceImgData := util.SubImg(*pI, int(rcFace.Left), int(rcFace.Top), int(rcFace.Right), int(rcFace.Bottom))
+ logger.Debug("SubImg鐢ㄦ椂锛�", time.Since(t1))
+ t1 = time.Now()
fileInfo, e := esutil.PostFormData(weedfsUri, filename, "file", cutFaceImgData)
+ logger.Debug("涓婁紶鍒皐eedfs鐢ㄦ椂:", time.Since(t1))
+ t1 = time.Now()
if e != nil {
fmt.Println(e.Error())
return "", nil, e
@@ -566,7 +616,6 @@
idx := strings.Index(field, "/")
field = field[idx+1:]
}
- fmt.Println("field:",field)
ext := path.Ext(filename)
fileNameOnly := strings.TrimSuffix(filename, ext)
@@ -580,6 +629,7 @@
dbperson.FaceFeature = faceBase64 // 鐗瑰緛鍊糱ase64 鐮�
result := addDbPerson(dbperson)
+ logger.Debug("addDbPerson鐢ㄦ椂锛�", time.Since(t1))
return fileNameOnly, result, nil
}
@@ -631,24 +681,36 @@
addResult := make(map[string]interface{}, 0)
successList := make([]string, 0)
failList := make([]string,0)
+ tAllStart := time.Now()
+ var wg sync.WaitGroup
+ var lock sync.Mutex
for _, head := range fileHeaders {
- //鏂囦欢鐨勫悕绉�
- filename := head.Filename
- file, err := head.Open()
- fmt.Println(file, err, filename)
- if err != nil {
- log.Fatal(err)
- }
-
- field, _, err1 := uploadFileReturnAddr(file, filename, tableId)
- //extNames = append(extNames, field)
-
- if err1 != nil || field == "" {
- failList = append(failList, filename)
- } else {
- successList = append(successList, filename)
- }
+ wg.Add(1)
+ go func(head *multipart.FileHeader,tableId string) {
+ defer wg.Done()
+ tIStart := time.Now()
+ filename := head.Filename
+ file, err := head.Open()
+ fmt.Println(file, err, filename)
+ if err != nil {
+ lock.Lock()
+ failList = append(failList, filename)
+ lock.Unlock()
+ return
+ }
+ field, _, err1 := uploadFileReturnAddr(file, filename, tableId)
+ lock.Lock()
+ if err1 != nil || field == "" {
+ failList = append(failList, filename)
+ } else {
+ successList = append(successList, filename)
+ }
+ lock.Unlock()
+ logger.Debug(filename,"鍒囧浘鐢ㄦ椂锛�",time.Since(tIStart))
+ }(head, tableId)
+ wg.Wait()
}
+ logger.Debug("鍒�",len(fileHeaders),"寮犱汉鑴哥敤鏃讹細", time.Since(tAllStart))
addResult["successList"] = successList
addResult["failList"] = failList
addResult["fields"] = extNames
--
Gitblit v1.8.0