From 8e732dbff0367329597fc95765bccf206b20e667 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 24 七月 2019 19:48:40 +0800
Subject: [PATCH] faceExtract return uploadImage and smImage
---
controllers/fileController.go | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index 2123a1b..e7e9381 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,8 +139,11 @@
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,"鏈彁鍙栧埌浜鸿劯")
}
@@ -150,12 +154,17 @@
// @Produce json
// @Tags 浠ュ浘鎼滃浘
// @Param url formData string true "url"
+// @Param tableId formData string true "搴曞簱id"
+// @Param compThreshold formData string 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 == "" {
+ tableId := c.Request.FormValue("tableId")//搴曞簱id
+ compThresholdStr := c.Request.FormValue("compThreshold")//姣斿闃堝��
+ compThreshold, err := strconv.Atoi(compThresholdStr)
+ if photoUrl == "" || err != nil {
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
return
}
@@ -164,8 +173,9 @@
return
} else {
arg := protomsg.CompareArgs{
+ TableIds:[]string{ tableId },
FaceFeature:face.FaceBytes,
- CompareThreshold:0.2,
+ CompareThreshold:float32(compThreshold),
}
b, err := proto.Marshal(&arg)
if err !=nil{
--
Gitblit v1.8.0