From a6c7dc63c5a69111b23e5748b6aab56e94c3b331 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 25 七月 2019 14:52:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.14:10010/r/webserver
---
controllers/fileController.go | 116 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 99 insertions(+), 17 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index 2123a1b..29839f6 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -120,11 +120,12 @@
return
}
var weedfsUri = "http://"+config.WeedFs.Ip+":"+strconv.Itoa(config.WeedFs.UploadPort)+"/submit"
-
+ resultMap :=make(map[string]interface{},0)
//灏嗕笂浼犵殑鍥剧墖浜や汉鑴告娴嬪拰浜鸿劯鎻愬彇锛岃幏寰楃壒寰�
fileBytes, _ := ioutil.ReadAll(file)
faceArr, err, pI := service.GetFaceFeaFromSdk(fileBytes, time.Second*60)
if err ==nil && len(faceArr) >0 {
+ //1.鎻愬彇姣忎竴寮犱汉鑴稿皬鍥�
urlArr := make([]string,0)
for _,r := range faceArr {
rcFace := r.Pos.RcFace
@@ -138,34 +139,84 @@
urlArr = append(urlArr, weedFilePath)
}
}
-
- util.ResponseFormat(c,code.Success,urlArr)
+ //2.澶у浘鐢绘,鏍囪瘑浜鸿劯浣嶇疆
+ originFilePath, _ := WeedFSClient.UploadFile(weedfsUri, "FaceUrl", fileBytes)
+ resultMap["uploadImage"] = originFilePath
+ resultMap["smImage"] = urlArr
+ util.ResponseFormat(c,code.Success, resultMap)
} else {
util.ResponseFormat(c,code.ComError,"鏈彁鍙栧埌浜鸿劯")
}
}
+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 {
+ Url string `json:"url"`
+ TableIds []string `json:"tableIds"`
+ CompThreshold string `json:"compThreshold"`
+}
// @Summary 浠ュ浘鎼滃浘
// @Description 浠ュ浘鎼滃浘
+// @Accept json
// @Produce json
// @Tags 浠ュ浘鎼滃浘
-// @Param url formData string true "url"
+// @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")
- if photoUrl == "" {
+ var condition SearchCondition
+ err := c.BindJSON(&condition)
+ if err !=nil || condition.Url == "" {
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
return
}
- if face,ok := faceExtractedMap[photoUrl];!ok{
+ compThreshold, err := strconv.ParseFloat(condition.CompThreshold,32)
+ if condition.Url == "" || err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
+ return
+ }
+ if face,ok := faceExtractedMap[condition.Url];!ok{
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
return
} else {
arg := protomsg.CompareArgs{
+ TableIds:[]string{ captureTable },
FaceFeature:face.FaceBytes,
- CompareThreshold:0.2,
+ CompareThreshold:float32(compThreshold),
+ }
+ if condition.TableIds !=nil {
+ arg.TableIds = append(arg.TableIds, condition.TableIds...)
}
b, err := proto.Marshal(&arg)
if err !=nil{
@@ -174,7 +225,7 @@
}
compServerList := config.CompServerInfo.Url
fmt.Println("compServerList:", compServerList)
- resultList :=make([]protomsg.Dbperson,0)
+ resultList :=make([]CompareResult,0)
for _,str :=range compServerList{
reqUrl := "tcp://"+str
reqClient := deliver.NewClient(deliver.ReqRep, reqUrl)
@@ -186,21 +237,52 @@
if err !=nil{
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{
continue
}
- personIds := make([]string,len(m))
- for k,_ :=range m{
- personIds = append(personIds,k)
+
+ var dbPersonM map[string]*protomsg.Esinfo
+ var captureM map[string]*protomsg.Esinfo
+ var personIds []string
+ var captureIds []string
+ for _,v :=range rList{
+ if v.Tableid == captureTable {
+ captureM[v.Id] = &v
+ personIds = append(personIds,v.Id)
+ } else {
+ dbPersonM[v.Id] = &v
+ captureIds = append(captureIds,v.Id)
+ }
}
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 && dbpersons !=nil {
+ for _,p :=range dbpersons {
+ var dbP = DbPersonVo {
+ PersonId: p.Id,
+ IdCard: p.IdCard,
+ CompareScore: 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)
+ }
}
}
util.ResponseFormat(c,code.Success,resultList)
--
Gitblit v1.8.0