From 9d88c7c467f8d93af4aab9ba0b6d6c01c2ffc546 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期四, 20 八月 2020 20:35:30 +0800
Subject: [PATCH] add get buckets contrl
---
controllers/ruleTemplate.go | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/controllers/ruleTemplate.go b/controllers/ruleTemplate.go
index 293aa12..525b858 100644
--- a/controllers/ruleTemplate.go
+++ b/controllers/ruleTemplate.go
@@ -2,9 +2,6 @@
import (
"basic.com/dbapi.git"
- "basic.com/pubsub/protomsg.git"
- "bytes"
- "encoding/json"
"github.com/gin-gonic/gin"
"github.com/gogo/protobuf/jsonpb"
"webserver/extend/code"
@@ -21,12 +18,20 @@
OrigName: true,
}
+type RuleTemplateVo struct {
+ Id string `json:"id"` //鍦烘櫙妯℃澘id
+ Name string `json:"name"` //妯℃澘鍚嶇О
+ Desc string `json:"desc"` //鍦烘櫙鎻忚堪
+ Txt string `json:"txt"` //鍦烘櫙绛栫暐瑙勫垯缁勫悎鏂囧瓧
+ Rules string `json:"rules"` //鍏蜂綋鐨勫皬瑙勫垯闆嗗悎
+}
+
// @Summary 淇濆瓨鍦烘櫙妯℃澘
// @Description 淇濆瓨鍦烘櫙妯℃澘
// @Accept json
// @Produce json
// @Tags 鍦烘櫙妯℃澘
-// @Param reqBody body models.RuleTemplate true "妯℃澘淇濆瓨鍙傛暟"
+// @Param reqBody body controllers.RuleTemplateVo true "妯℃澘淇濆瓨鍙傛暟"
// @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
// @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
// @Router /data/api-v/template/rule/save [post]
@@ -100,20 +105,7 @@
var api dbapi.RuleTemplateApi
b, templates := api.FindAll()
if b {
- var result protomsg.RuleTemplateList
- for _,r := range templates {
- result.List = append(result.List, &r)
- }
-
- var _buffer bytes.Buffer
- err := jsonpbMarshaler.Marshal(&_buffer, &result)
- if err == nil {
- jsonB := _buffer.Bytes()
- var m map[string]interface{}
- json.Unmarshal(jsonB, &m)
- util.ResponseFormat(c,code.Success, m)
- return
- }
+ util.ResponseFormat(c,code.Success, templates)
} else {
util.ResponseFormat(c, code.ComError, "")
}
--
Gitblit v1.8.0