From cc227efa2c3c0fc333bf0f3db2327df5c36f7c17 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期四, 07 十一月 2019 19:58:16 +0800
Subject: [PATCH] add route

---
 controllers/fileController.go |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/controllers/fileController.go b/controllers/fileController.go
index aba0b1f..2594c86 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -298,7 +298,7 @@
 		logger.Debug("comp videoPersons.len:",len(videopersons))
 		for _,vp :=range videopersons {
 			isAlarmInt, _ := strconv.Atoi(vp.IsAlarm)
-			bi := make([]DbPersonVo,0)
+			var bi []DbPersonVo
 			for _,p :=range vp.BaseInfo {
 				bi = append(bi, DbPersonVo{
 					PersonId: p.PersonId,
@@ -310,7 +310,7 @@
 					PhoneNum: p.PhoneNum,
 					Sex: p.Sex,
 					TableId: p.TableId,
-					BwType: strconv.Itoa(int(p.BwType)),
+					BwType: p.BwType,
 					TableName: p.TableName,
 				})
 			}
@@ -827,8 +827,10 @@
 	}
 	extNames := make([]string, 0)
 	addResult := make(map[string]interface{}, 0)
-	successList := make([]string, 0)
+	successList := make([]string,0)
 	failList := make([]string,0)
+	noFaceList := make([]string,0)
+	multiFaceList := make([]string,0)
 	tAllStart := time.Now()
 	var wg sync.WaitGroup
 	var lock sync.Mutex
@@ -856,7 +858,13 @@
 			field, _, err1 := uploadFileReturnAddr(file, filename, tableId)
 			lock.Lock()
 			if err1 != nil || field == "" {
-				failList = append(failList, filename)
+				if err1 !=nil && err1.Error() == "NotFeatureFindError" {
+					noFaceList = append(noFaceList, filename)
+				} else if err1 !=nil && err1.Error() == "TooManyFaces" {
+					multiFaceList = append(multiFaceList, filename)
+				} else {
+					failList = append(failList, filename)
+				}
 			} else {
 				successList = append(successList, filename)
 			}
@@ -868,13 +876,15 @@
 	logger.Debug("鍒�",len(fileHeaders),"寮犱汉鑴哥敤鏃讹細", time.Since(tAllStart))
 	addResult["successList"] = successList
 	addResult["failList"] = failList
+	addResult["noFaceList"] = noFaceList
+	addResult["multiFaceList"] = multiFaceList
 	addResult["fields"] = extNames
 
-	//if len(successList)>0 {
+	if len(successList)>0 {
 		util.ResponseFormat(c, code.DbPersonUploadSuccess, addResult)
-	//} else {
-	//	util.ResponseFormat(c, code.DbPersonUploadFail, addResult)
-	//}
+	} else {
+		util.ResponseFormat(c, code.DbPersonUploadFail, addResult)
+	}
 }
 
 type EsPersonSave struct {

--
Gitblit v1.8.0