From 9303b69ea569bcb5e581147543a3fd58e90d0d25 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期四, 20 八月 2020 20:05:23 +0800
Subject: [PATCH] add get buckets contrl

---
 controllers/fileController.go |   43 +++++++++++++++++++++++++++----------------
 1 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/controllers/fileController.go b/controllers/fileController.go
index 7b6daef..1f591af 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -5,6 +5,7 @@
 	"basic.com/fileServer/WeedFSClient.git"
 	esApi "basic.com/pubsub/esutil.git"
 	"basic.com/pubsub/protomsg.git"
+	"basic.com/valib/godraw.git"
 	"basic.com/valib/logger.git"
 	"bytes"
 	"encoding/base64"
@@ -12,7 +13,6 @@
 	"errors"
 	"fmt"
 	"github.com/gin-gonic/gin"
-	"gocv.io/x/gocv"
 	"image"
 	"image/color"
 	"image/jpeg"
@@ -148,7 +148,11 @@
 		urlArr := make([]string,0)
 		for _,r := range faceArr {
 			rcFace := r.Pos.RcFace
-			cutFaceImgData := util.SubImg(*pI, int(rcFace.Left), int(rcFace.Top), int(rcFace.Right), int(rcFace.Bottom))
+			cutFaceImgData,cutErr := util.SubCutImg(pI, rcFace, 20)
+			if cutErr != nil {
+				logger.Debug("util.SubCutImg err:", cutErr)
+				continue
+			}
 			weedFilePath, e := WeedFSClient.UploadFile(weedfsUri, "FaceUrl", cutFaceImgData)
 			if e == nil{
 				faceExtractedMap[weedFilePath] = FaceExtract{
@@ -171,19 +175,19 @@
 }
 
 func drawPolygonOnImg(i *protomsg.Image,faceArr *[]*protomsg.ResultFaceDetect) (*[]byte,error) {
-	rook, _ := gocv.NewMatFromBytes(int(i.Height), int(i.Width), gocv.MatTypeCV8UC3, i.Data)
-	defer rook.Close()
-	//yellow := color.RGBA{255, 255, 0, 0}
+	img,err := godraw.ToImage(i.Data, int(i.Width), int(i.Height))
+	if err != nil {
+		return nil,err
+	}
 	red := color.RGBA{255, 0, 0, 0}
 	for _,faceResult := range *faceArr {
-		left := int(faceResult.Pos.RcFace.Left)
-		top := int(faceResult.Pos.RcFace.Top)
-		right := int(faceResult.Pos.RcFace.Right)
-		bottom := int(faceResult.Pos.RcFace.Bottom)
-		gocv.Rectangle(&rook, image.Rect(left,top,right,bottom), red, 1)
+		util.DrawRect(img.(*image.RGBA),int(faceResult.Pos.RcFace.Left),int(faceResult.Pos.RcFace.Top),int(faceResult.Pos.RcFace.Right),
+			int(faceResult.Pos.RcFace.Bottom), red)
 	}
-	fData,err := gocv.IMEncode(".jpg", rook)
-	return &fData,err
+
+	quantity := 100
+	jpgData, err := godraw.ImageToJpeg(img, &quantity)
+	return &jpgData,err
 }
 
 type CompareResult struct {
@@ -413,7 +417,7 @@
 	faceArr, err, pI := service.GetFaceFeaFromSdk(fileBytes, time.Second*60)
 	if err ==nil && len(faceArr) ==1 {
 		rcFace := faceArr[0].Pos.RcFace
-		cutFaceImgData := util.SubImg(*pI, int(rcFace.Left), int(rcFace.Top), int(rcFace.Right), int(rcFace.Bottom))
+		cutFaceImgData,_ := util.SubCutImg(pI, rcFace, 20)
 		weedFilePath, e := WeedFSClient.UploadFile(weedfsUri, "FaceUrl", cutFaceImgData)
 		if e == nil{
 			faceExtractedMap[weedFilePath] = FaceExtract{
@@ -492,6 +496,9 @@
 					return
 				}
 				faceB = decodeF
+			} else {
+				util.ResponseFormat(c, code.ComError, "鏈潯浜鸿劯鎶撴媿鐗瑰緛涓虹┖锛岃妫�鏌�")
+				return
 			}
 		}
 
@@ -761,7 +768,7 @@
 			break
 		}
 		//鏍规嵁浜鸿劯鍧愭爣鎵e嚭浜鸿劯灏忓浘
-		cutFaceImgData := util.SubImg(*pI, int(rcFace.Left), int(rcFace.Top), int(rcFace.Right), int(rcFace.Bottom))
+		cutFaceImgData,_ := util.SubCutImg(pI, rcFace, 20)
 		weedFilePath, e := WeedFSClient.UploadFile(weedfsUri, "testCutFace", cutFaceImgData)
 		if e !=nil{
 			util.ResponseFormat(c,code.ComError,"鏂囦欢涓婁紶澶辫触")
@@ -814,7 +821,11 @@
 	var weedfsUri = "http://"+localConf.WebPicIp+":"+strconv.Itoa(int(localConf.WebPicPort))+"/submit?collection=persistent"
 	//鏍规嵁浜鸿劯鍧愭爣鎵e嚭浜鸿劯灏忓浘
 	t1 := time.Now()
-	cutFaceImgData := util.SubImg(*pI, int(rcFace.Left), int(rcFace.Top), int(rcFace.Right), int(rcFace.Bottom))
+	cutFaceImgData,cutErr := util.SubCutImg(pI, rcFace, 20)
+	if cutErr != nil {
+		logger.Debug("util.SubCutImg err:", cutErr)
+		return "", nil, cutErr,"",""
+	}
 	logger.Debug("SubImg鐢ㄦ椂锛�", time.Since(t1))
 	t1 = time.Now()
 	weedFilePath, e := WeedFSClient.UploadFile(weedfsUri, filename, cutFaceImgData)
@@ -840,7 +851,7 @@
 		result = addDbPerson(dbperson)
 	}
 
-	logger.Debug("addDbPerson鐢ㄦ椂锛�", time.Since(t1))
+	logger.Debug("addDbPerson鐢ㄦ椂锛�", time.Since(t1), "result:", result)
 	return fileNameOnly, result, nil,faceBase64, weedFilePath
 
 }

--
Gitblit v1.8.0