From 087af7f0bf2890887bd185a8e2e6879ee7c629d1 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 24 七月 2019 17:26:39 +0800
Subject: [PATCH] add faceExtract and searchByPhoto
---
controllers/task.go | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/controllers/task.go b/controllers/task.go
index 07420dc..b70e24b 100644
--- a/controllers/task.go
+++ b/controllers/task.go
@@ -2,11 +2,13 @@
import (
"basic.com/dbapi.git"
+ "basic.com/pubsub/protomsg.git"
+ "encoding/json"
"time"
+ "github.com/gin-gonic/gin"
"webserver/extend/code"
"webserver/extend/util"
- "github.com/gin-gonic/gin"
)
type TaskController struct{}
@@ -22,6 +24,16 @@
DelFlag bool `json:"del_flag"`
}
+type TaskSdkVo struct {
+ Task TaskVo `json:"task"`
+ Sdks []SdkVo `json:"sdks"`
+}
+
+var (
+ FaceExtract_VirtualTaskId = "92496BDF-2BFA-98F2-62E8-96DD9866ABD2"//铏氭嫙浠诲姟id
+ FaceExtract_VirtualSdkId = "virtual-faceextract-sdk-pull"//缁撴灉杈撳嚭鐨勭畻娉昳d
+)
+
// @Summary 鏌ユ壘鎵�鏈変换鍔★紝鍖呭惈浠诲姟淇℃伅鍜屽搴旂殑绠楁硶淇℃伅
// @Description 鏌ユ壘鎵�鏈変换鍔�
// @Produce json
@@ -34,7 +46,23 @@
var taskApi dbapi.TaskApi
taskInfos := taskApi.FindAll()
- util.ResponseFormat(c, code.Success, taskInfos)
+ var arr []protomsg.TaskSdkInfo
+ for _,ti :=range taskInfos{
+ if ti.Task.Taskid != FaceExtract_VirtualTaskId{
+ arr = append(arr,ti)
+ }
+ }
+ var tasks []TaskSdkVo
+ dataBytes, err := json.Marshal(arr)
+ if err !=nil {
+ util.ResponseFormat(c,code.ComError,[]TaskSdkVo{})
+ } else {
+ if err := json.Unmarshal(dataBytes, &tasks);err !=nil {
+ util.ResponseFormat(c,code.ComError,[]TaskSdkVo{})
+ } else {
+ util.ResponseFormat(c,code.Success,tasks)
+ }
+ }
}
// @Summary 娣诲姞浠诲姟
--
Gitblit v1.8.0