From 875d8c725cbc8e7ed47e763a3b13bc5d22760258 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 31 十月 2019 18:39:29 +0800
Subject: [PATCH] update swagger
---
controllers/fileController.go | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index aba0b1f..d692755 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -298,8 +298,12 @@
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 {
+ if p.TableName == "鍏徃浜哄憳鏂�" {
+ logger.Debug("FillData p.BwType:",p.BwType)
+ }
+
bi = append(bi, DbPersonVo{
PersonId: p.PersonId,
IdCard: p.IdCard,
@@ -827,8 +831,10 @@
}
extNames := make([]string, 0)
addResult := make(map[string]interface{}, 0)
- successList := make([]string, 0)
- failList := make([]string,0)
+ var successList []string
+ var failList []string
+ var noFaceList []string
+ var multiFaceList []string
tAllStart := time.Now()
var wg sync.WaitGroup
var lock sync.Mutex
@@ -856,7 +862,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 +880,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