From d42b09cda8b2bc58c43c200f3aabdb0b2a7e9211 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期五, 12 七月 2019 12:02:14 +0800
Subject: [PATCH] fix search controllers
---
controllers/fileController.go | 161 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 116 insertions(+), 45 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index e175f30..3b641e0 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -1,20 +1,26 @@
package controllers
import (
+ "basic.com/pubsub/protomsg.git"
"bytes"
"encoding/base64"
+ "errors"
"fmt"
"github.com/gin-gonic/gin"
"github.com/satori/go.uuid"
"image"
"image/jpeg"
+ "io/ioutil"
"log"
"mime/multipart"
"net/http"
+ "strings"
"webserver/extend/code"
"webserver/extend/esutil"
"webserver/extend/util"
"webserver/models"
+ "webserver/service"
+
)
type FileController struct {
@@ -28,9 +34,9 @@
//var picUrlField = "fid"
/**涓婁紶鏂规硶**/
-//var weedfsUri = "http://192.168.1.182:6333/submit"
+var weedfsUri = "http://192.168.1.182:6333/submit"
-var weedfsUri = "http://192.168.1.182:9500/submit"
+//var weedfsUri = "http://192.168.1.182:9500/submit"
// @Summary 渚濇嵁鍥剧墖娣诲姞搴曞簱浜哄憳
// @Description 渚濇嵁鍥剧墖娣诲姞搴曞簱杩斿洖鏁版嵁浜哄憳
@@ -88,19 +94,43 @@
// @Description 浜哄憳鐓х墖涓婁紶骞惰幏鍙栫壒寰佸��
// @Router /data/api-v/dbperson/fileUploadTest [POST]
func (controller FileController) UploadPersonTest(c *gin.Context) {
- file, header, err := c.Request.FormFile("file") //image杩欎釜鏄痷plaodify鍙傛暟瀹氫箟涓殑 'fileObjName':'image'
+ file, _, err := c.Request.FormFile("file") //image杩欎釜鏄痷plaodify鍙傛暟瀹氫箟涓殑 'fileObjName':'image'
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
return
}
- //鏂囦欢鐨勫悕绉�
- filename := header.Filename
- fmt.Println(file, err, filename)
- if err != nil {
- log.Fatal(err)
- filename = uuid.NewV4().String()
- }
+
+ //灏嗕笂浼犵殑鍥剧墖浜や汉鑴告娴嬪拰浜鸿劯鎻愬彇锛岃幏寰楃壒寰�
+ fileBytes, _ := ioutil.ReadAll(file)
+ faceArr, err, pI := service.GetFaceFeaFromSdk(fileBytes)
+ if err ==nil && len(faceArr) >0 {
+ var faceBase64= ""
+ var field = ""
+ var rcFace *protomsg.Rect
+ for _,r := range faceArr {
+ rcFace = r.Pos.RcFace
+ faceBase64 = base64.StdEncoding.EncodeToString(r.Feats)//鑾峰彇鎻愬彇鍒扮殑绗竴寮犱汉鑴哥壒寰�
+ break
+ }
+ //鏍规嵁浜鸿劯鍧愭爣鎵ｅ嚭浜鸿劯灏忓浘
+ cutFaceImgData := util.SubImg(*pI, int(rcFace.Left), int(rcFace.Top), int(rcFace.Right), int(rcFace.Bottom))
+ fileInfo, e := esutil.PostFormData(weedfsUri, "娴嬭瘯浜鸿劯鍒囧浘", "file", cutFaceImgData)
+ if e != nil {
+ fmt.Println(e.Error())
+
+ } else {
+ field = fileInfo[picUrlField].(string) // 鏂囦欢璺緞
+ }
+ if strings.Contains(field,"/"){
+ idx := strings.Index(field, "/")
+ field = field[idx+1:]
+ }
+ fmt.Println("field:",field)
+ util.ResponseFormat(c,code.Success,field + ";" + faceBase64)
+ } else {
+ util.ResponseFormat(c,code.ComError,"鏈彁鍙栧埌浜鸿劯")
+ }
}
/*// 瀵逛笂闈㈢殑缂栫爜缁撴灉杩涜base64瑙ｇ爜
@@ -110,45 +140,78 @@
}*/
func uploadFileReturnAddr(file multipart.File, filename string, tableId string) (string, map[string]interface{}, error) {
-
defer file.Close()
field := ""
// weedfs 涓婁紶
- {
- fileInfo, e := esutil.PostFormData(weedfsUri, filename, "file", file)
- if e != nil {
- fmt.Println(e.Error())
- return "", nil, e
- } else {
- field = fileInfo[picUrlField].(string) // 鏂囦欢璺緞
+ fileBytes, err := ioutil.ReadAll(file)
+ if err !=nil {
+ return "",nil,err
+ }
+
+ //灏嗕笂浼犵殑鍥剧墖浜や汉鑴告娴嬪拰浜鸿劯鎻愬彇锛岃幏寰楃壒寰�
+ var faceBase64=""
+ faceArr, err,pI := service.GetFaceFeaFromSdk(fileBytes)
+ if faceArr ==nil {
+ return "",nil,errors.New("NotFeatureFindError")
+ }
+ var rcFace *protomsg.Rect
+ if err ==nil && len(faceArr) >0 {
+ for _,r := range faceArr {
+ //鎷垮埌浜鸿劯鐨勫潗鏍�
+ rcFace = r.Pos.RcFace
+
+ faceBase64 = base64.StdEncoding.EncodeToString(r.Feats)//鑾峰彇鎻愬彇鍒扮殑绗竴寮犱汉鑴哥壒寰�
+ break
}
}
- if tableId != "" && field != "" {
- // 杩斿洖鐗瑰緛鍊� fileInfo["point"] = v.RcFace fileInfo["feature"] = feat
- /*features := gorun.GetSimpleFaceDetect(picIp+field) // 鐗瑰緛鍊� // linux
- if len(features) == 0 { // linux
- return field,nil,errors.New("NotFeatureFindError") // linux
- }else if len(features) > 1 { // linux
- return field,nil,errors.New("TooManyFeatureFindError") // linux
- } // linux
- feat := features[0]["feature"].([]byte) // linux
- if len(feat) != 2560 { // linux
- return field,nil,errors.New("NotFeatureFindError")
- } */ // linux
- feat := []byte("hello world") // windows 娴嬭瘯鏀惧紑
- dbperson := new(models.Dbtablepersons)
- dbperson.FaceFeature = picIp + field // 鍥剧墖璺粡
- dbperson.TableId = tableId //
- dbperson.PersonName = filename // 鍥剧墖鍚�
- // 婕旂ずbase64缂栫爜
- encodeString := base64.StdEncoding.EncodeToString(feat)
- dbperson.FaceFeature = encodeString // 鐗瑰緛鍊糱ase64 鐮�
- result := addDbPerson(dbperson)
- return field, result, nil
+ //鏍规嵁浜鸿劯鍧愭爣鎵ｅ嚭浜鸿劯灏忓浘
+ cutFaceImgData := util.SubImg(*pI, int(rcFace.Left), int(rcFace.Top), int(rcFace.Right), int(rcFace.Bottom))
+ fileInfo, e := esutil.PostFormData(weedfsUri, filename, "file", cutFaceImgData)
+ if e != nil {
+ fmt.Println(e.Error())
+ return "", nil, e
} else {
- return field, nil, nil
+ field = fileInfo[picUrlField].(string) // 鏂囦欢璺緞
}
+ if strings.Contains(field,"/"){
+ idx := strings.Index(field, "/")
+ field = field[idx+1:]
+ }
+ fmt.Println("field:",field)
+
+ dbperson := new(models.Dbtablepersons)
+ dbperson.PersonPicUrl = field // 鍥剧墖璺粡
+ dbperson.TableId = tableId //
+ dbperson.PersonName = filename // 鍥剧墖鍚�
+ // 婕旂ずbase64缂栫爜
+
+ dbperson.FaceFeature = faceBase64 // 鐗瑰緛鍊糱ase64 鐮�
+
+ result := addDbPerson(dbperson)
+ return field, result, nil
+
}
+
+//func getFaceFeaFromSdk(fileBytes []byte) ([]*protomsg.ResultFaceExtCom,error,*protomsg.Image){
+// s := service.NewFaceSdkService(fileBytes)
+// i, err := s.ReadFromUploadImg()
+// if err !=nil{
+// fmt.Println("readFromUploadImg err:",err)
+// return nil,err,i
+// }
+// bc, err := service.ImgCompress(i)
+// if err !=nil {
+// fmt.Println("ImgCompress err:",err)
+// return nil,err,i
+// }
+// s.PushImgMsg(bc)
+// s.GetFaceFea()
+// if s.Result == nil{
+// return nil,errors.New("no fea"),i
+// } else {
+// return s.Result,nil,i
+// }
+//}
/**涓婁紶鏂规硶**/
@@ -210,6 +273,14 @@
}
}
+type EsPersonSave struct {
+ FaceFeature string `json:"faceFeature"`
+ TableId string `json:"tableId"`
+ Id string `json:"id"`
+ PersonPicUrl string `json:"personPicUrl"`
+ IdCard string `json:"idCard"`
+}
+
// @Summary 涓婁紶鍥剧墖 骞跺垏鍥�
// @Description 涓婁紶鍥剧墖 骞跺垏鍥�
// @Accept mpfd
@@ -217,8 +288,8 @@
// @Tags dbperson 搴曞簱浜哄憳
// @Param file formData file true "搴曞簱浜哄憳鍥剧墖"
// @Param tableId formData string false "搴曞簱id,鏈塱d 鍒欏姞鍏ュ簳搴擄紝鏃犲垯鍙笂浼犲浘鐗�"
-// @Success 200 {string} json "{"code":200, msg:"鐩綍缁撴瀯鏁版嵁", success:true}"
-// @Failure 500 {string} json "{"code":500, msg:"杩斿洖閿欒淇℃伅", success:false}"
+// @Success 200 {string} json "{"code":200, msg:"鐩綍缁撴瀯鏁版嵁", success:true, data:""}"
+// @Failure 500 {string} json "{"code":500, msg:"杩斿洖閿欒淇℃伅", success:false, data:""}"
// @Router /data/api-v/es/ImageUploadReturnPics [POST]
func (fc FileController) ImageUploadReturnPics(c *gin.Context) {
//寰楀埌涓婁紶鐨勬枃浠�
@@ -230,9 +301,9 @@
}
//鏂囦欢鐨勫悕绉�
filename := header.Filename
- fmt.Println(file, err, filename)
defer file.Close()
field := ""
+
// weedfs 涓婁紶
uploadData := make([]byte, header.Size)
i, err2 := file.ReadAt(uploadData, 0)
@@ -255,7 +326,7 @@
// fileInfo["point"] = v.RcFace // 杩斿洖鐗瑰緛鍊�
// fileInfo["feature"] = feat
//features := gorun.GetSimpleFaceDetect(picIp + "/" + field) // 鐗瑰緛鍊� 鍙湪linux 涓�
- //feat := []byte("hello world") // windows 娴嬭瘯鏀惧紑
+
result := make(map[string]interface{}, 0)
result["uploadImage"] = picIp + field
smUrl := make([]string, 0)
--
Gitblit v1.8.0