From aa1b946f4ba9b62dee9b9464ff4450ebbc48c4ec Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 25 七月 2019 16:32:13 +0800
Subject: [PATCH] fix score to %.2f
---
controllers/fileController.go | 128 +++++++++++++++++++++++++++++++++++-------
1 files changed, 105 insertions(+), 23 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index fd631e1..74d1b25 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -25,6 +25,7 @@
"webserver/extend/code"
"webserver/extend/config"
"webserver/extend/esutil"
+ "webserver/extend/logger"
"webserver/extend/util"
"webserver/models"
"webserver/service"
@@ -149,35 +150,74 @@
}
}
+type CompareResult struct {
+ Id string `json:"id"`
+ CameraId string `json:"cameraId"`
+ CameraAddr string `json:"cameraAddr"`
+ PicDate string `json:"picDate"`
+ Content string `json:"content"`
+ IsAlarm int `json:"isAlarm"`
+ PicMaxUrl string `json:"picMaxUrl"`
+ PicSmUrl []string `json:"picSmUrl"`
+ Sex string `json:"sex"`
+ AgeDescription string `json:"ageDescription"`
+ Race string `json:"race"`
+ TaskName string `json:"taskName"`
+ BaseInfo []DbPersonVo `json:"baseInfo"`
+ VideoUrl string `json:"videoUrl"`
+}
+type DbPersonVo struct {
+ BwType string `json:"bwType"`
+ CompareScore float32 `json:"compareScore"`
+ IdCard string `json:"idCard"`
+ MonitorLevel string `json:"monitorLevel"`
+ PersonId string `json:"personId"`
+ PersonName string `json:"personName"`
+ PersonPicUrl string `json:"personPicUrl"`
+ PhoneNum string `json:"phoneNum"`
+ Sex string `json:"sex"`
+ TableId string `json:"tableId"`
+ TableName string `json:"tableName"`
+}
+
+var captureTable = "capturetable" // 鎶撴媿搴�
+type SearchCondition struct {
+ PicUrl string `json:"picUrl"`
+ Databases []string `json:"databases"`
+ Threshold string `json:"threshold"`
+}
// @Summary 浠ュ浘鎼滃浘
// @Description 浠ュ浘鎼滃浘
+// @Accept json
// @Produce json
// @Tags 浠ュ浘鎼滃浘
-// @Param url formData string true "url"
-// @Param tableId formData string true "搴曞簱id"
-// @Param compThreshold formData string true "姣斿闃堝��"
+// @Param condition body controllers.SearchCondition true "鎼滅储鍙傛暟"
// @Success 200 {string} json "{"code":200, msg:"", data:"", success:true}"
// @Failure 500 {string} json "{"code":500, msg:"", data:"", success:false}"
// @Router /data/api-v/dbperson/searchByPhoto [POST]
func (controller FileController) SearchByPhoto(c *gin.Context) {
- photoUrl := c.Request.FormValue("url")
- tableId := c.Request.FormValue("tableId")//搴曞簱id
- compThresholdStr := c.Request.FormValue("compThreshold")//姣斿闃堝��
- compThreshold, err := strconv.ParseFloat(compThresholdStr,32)
- if photoUrl == "" || err != nil {
+ var condition SearchCondition
+ err := c.BindJSON(&condition)
+ if err !=nil || condition.PicUrl == "" || len(condition.Databases) == 0 {
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
return
}
- if face,ok := faceExtractedMap[photoUrl];!ok{
+ compThreshold, err := strconv.ParseFloat(condition.Threshold,32)
+ if condition.PicUrl == "" || err != nil {
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
+ return
+ }
+ if face,ok := faceExtractedMap[condition.PicUrl];!ok{
+ util.ResponseFormat(c, code.RequestParamError, "璇烽噸鏂颁笂浼犲浘鐗�")
return
} else {
arg := protomsg.CompareArgs{
- FaceFeature:face.FaceBytes,
- CompareThreshold:float32(compThreshold),
+ TableIds: condition.Databases,
+ FaceFeature: face.FaceBytes,
+ CompareThreshold: float32(compThreshold),
}
- if tableId !=""{
- arg.TableIds = []string{ tableId }
+ if condition.Databases !=nil {
+ arg.TableIds = append(arg.TableIds, condition.Databases...)
}
b, err := proto.Marshal(&arg)
if err !=nil{
@@ -185,35 +225,77 @@
return
}
compServerList := config.CompServerInfo.Url
- fmt.Println("compServerList:", compServerList)
- resultList :=make([]protomsg.Dbperson,0)
+ logger.Debug("compServerList:", compServerList)
+ resultList :=make([]CompareResult,0)
for _,str :=range compServerList{
reqUrl := "tcp://"+str
reqClient := deliver.NewClient(deliver.ReqRep, reqUrl)
err = reqClient.Send(b)
if err !=nil{
+ logger.Debug("reqClient.Send err:",err)
continue
}
resultB, err := reqClient.Recv()
if err !=nil{
+ logger.Debug("reqClient.Recv err:",err)
continue
}
- m :=make(map[string]float32,0)
- err = json.Unmarshal(resultB, &m)
+ rList :=make([]protomsg.Esinfo,0)
+ err = json.Unmarshal(resultB, &rList)
if err !=nil{
+ logger.Debug("recv result Unmarshal err:", err)
continue
}
- personIds := make([]string,len(m))
- for k,_ :=range m{
- personIds = append(personIds,k)
+ logger.Debug("rList:", rList)
+
+ dbPersonM := make(map[string]*protomsg.Esinfo,0)
+ captureM := make(map[string]*protomsg.Esinfo,0)
+ personIds :=make([]string,0)
+ captureIds := make([]string,0)
+ for _,v :=range rList{
+ if v.Tableid == captureTable {
+ captureM[v.Id] = &v
+ captureIds = append(captureIds,v.Id)
+ } else {
+ dbPersonM[v.Id] = &v
+ personIds = append(personIds,v.Id)
+ }
}
+ logger.Debug("personIds:", personIds)
+ logger.Debug("captureIds:",captureIds)
esServerIp := config.EsInfo.Masterip
esServerPort := config.EsInfo.Httpport
index := config.EsInfo.EsIndex.Dbtablepersons.IndexName
- dbpeople, e := esApi.Dbpersoninfosbyid(personIds, index, esServerIp, esServerPort)
- if e ==nil{
- resultList = append(resultList,dbpeople...)
+ dbpersons, e := esApi.Dbpersoninfosbyid(personIds, index, esServerIp, esServerPort)
+ if e !=nil {
+ logger.Debug("Dbpersoninfosbyid.err:",e)
}
+ logger.Debug("dbpersons:", dbpersons)
+ if e ==nil && dbpersons !=nil {
+ for _,p :=range dbpersons {
+ var dbP = DbPersonVo {
+ PersonId: p.Id,
+ IdCard: p.IdCard,
+ CompareScore: util.ParseScore(dbPersonM[p.Id].CompareScore),
+ MonitorLevel: p.MonitorLevel,
+ PersonName: p.PersonName,
+ PersonPicUrl: p.PersonPicUrl,
+ PhoneNum: p.PhoneNum,
+ Sex: p.Sex,
+ TableId: p.TableId,
+ }
+ dbTableInfos, _ := esApi.Dbtablefosbyid([]string{p.TableId}, config.EsInfo.EsIndex.DbTables.IndexName, esServerIp, esServerPort)
+ if dbTableInfos !=nil{
+ dbP.BwType = dbTableInfos[0].BwType
+ dbP.TableName = dbTableInfos[0].TableName
+ }
+ var cr = CompareResult{
+ BaseInfo:[]DbPersonVo{ dbP },
+ }
+ resultList = append(resultList,cr)
+ }
+ }
+ logger.Debug("resultList:",resultList)
}
util.ResponseFormat(c,code.Success,resultList)
}
--
Gitblit v1.8.0