From cb707715e4648719a5ab083f0623620079b20f2a Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 20 六月 2019 16:23:42 +0800
Subject: [PATCH] task rules set complete
---
controllers/task.go | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/controllers/task.go b/controllers/task.go
index 07420dc..b76c7b5 100644
--- a/controllers/task.go
+++ b/controllers/task.go
@@ -2,11 +2,12 @@
import (
"basic.com/dbapi.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 +23,11 @@
DelFlag bool `json:"del_flag"`
}
+type TaskSdkVo struct {
+ Task TaskVo `json:"task"`
+ Sdks []SdkVo `json:"sdks"`
+}
+
// @Summary 鏌ユ壘鎵�鏈変换鍔★紝鍖呭惈浠诲姟淇℃伅鍜屽搴旂殑绠楁硶淇℃伅
// @Description 鏌ユ壘鎵�鏈変换鍔�
// @Produce json
@@ -34,7 +40,17 @@
var taskApi dbapi.TaskApi
taskInfos := taskApi.FindAll()
- util.ResponseFormat(c, code.Success, taskInfos)
+ var tasks []TaskSdkVo
+ dataBytes, err := json.Marshal(taskInfos)
+ 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