From 65eb96ecee8551a9328af7c6738769246b3f34f8 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 24 七月 2019 15:43:51 +0800
Subject: [PATCH] fix alarmLevelId
---
controllers/fileController.go | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index 8ca674f..8aa82b6 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -2,6 +2,7 @@
import (
"basic.com/pubsub/protomsg.git"
+ "basic.com/fileServer/WeedFSClient.git"
"bytes"
"encoding/base64"
"errors"
@@ -108,7 +109,6 @@
faceArr, err, pI := service.GetFaceFeaFromSdk(fileBytes, time.Second*5)
if err ==nil && len(faceArr) >0 {
var faceBase64= ""
- var field = ""
var rcFace *protomsg.Rect
for _,r := range faceArr {
rcFace = r.Pos.RcFace
@@ -117,19 +117,12 @@
}
//鏍规嵁浜鸿劯鍧愭爣鎵ｅ嚭浜鸿劯灏忓浘
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())
-
+ weedFilePath, e := WeedFSClient.UploadFile(weedfsUri, "testCutFace", cutFaceImgData)
+ if e !=nil{
+ util.ResponseFormat(c,code.ComError,"鏂囦欢涓婁紶澶辫触")
} else {
- field = fileInfo[picUrlField].(string) // 鏂囦欢璺緞
+ util.ResponseFormat(c,code.Success,weedFilePath + ";" + faceBase64)
}
- 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,"鏈彁鍙栧埌浜鸿劯")
}
@@ -256,12 +249,10 @@
field, _, err1 := uploadFileReturnAddr(file, filename, tableId)
//extNames = append(extNames, field)
- if err1 != nil {
- if field == "" {
- failList = append(failList, filename+"涓婁紶澶辫触,"+err1.Error())
- } else {
- successList = append(successList, filename+"鍔犲叆搴曞簱澶辫触,"+err1.Error())
- }
+ if err1 != nil || field == "" {
+ failList = append(failList, filename)
+ } else {
+ successList = append(successList, filename)
}
}
addResult["successList"] = successList
--
Gitblit v1.8.0