From dfddde9de155fcfda55743b71c249a1e3693aaef Mon Sep 17 00:00:00 2001 From: HuangZhi Date: Tue, 4 Jul 2023 18:11:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/bean/vo/request/dict.go | 8 ++++---- src/controller/dict.go | 5 ++--- src/pkg/beagle/resp/resp.go | 2 +- src/service/component_dict.go | 12 ++++++------ 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/bean/vo/request/dict.go b/src/bean/vo/request/dict.go index a710723..8534ae2 100644 --- a/src/bean/vo/request/dict.go +++ b/src/bean/vo/request/dict.go @@ -18,7 +18,7 @@ type AddDictReq struct { Class int `json:"class" form:"class" binding:"required,oneof=1 2 3 4 5 6 7 8 9 10 11 12 13 14"` //组件分类(1开发语言与版本 2中间件类型与中间件 3云组件类型 4模块类型 5所属区域 6操作系统 7对象类型 8SQL类型 9调研评估结果 10任务阶段 11测试文档类型 12验收问题类型 13Q&A问题类型 14文档类型) ParentId string `json:"parent_id" form:"parent_id"` //父级ID Name string `json:"name" form:"name" binding:"required"` //字典标签 - Status int `json:"status" form:"status" binding:"oneof=0 1"` //是否启用(0:启用 1:禁用) + Status int `json:"status" form:"status" binding:"oneof=0 1"` //是否启用(1:启用 2:禁用) Description string `json:"description" form:"description" binding:"lte=200"` //描述 MinVal string `json:"min_val" form:"min_val"` //最大值 MaxVal string `json:"max_val" form:"max_val"` //最小值 @@ -28,19 +28,19 @@ type UpdateDictReq struct { Id string `json:"id" form:"id" binding:"required"` //组件ID ParentId string `json:"parent_id" form:"parent_id"` //父级ID Name string `json:"name" form:"name" binding:"required"` //字典标签 - Status int `json:"status" form:"status" binding:"oneof=0 1"` //是否启用(0:启用 1:禁用) + Status int `json:"status" form:"status" binding:"oneof=0 1"` //是否启用(1:启用 2:禁用) Description string `json:"description" form:"description" binding:"lte=200"` //描述 MinVal string `json:"min_val" form:"min_val"` //最大值 MaxVal string `json:"max_val" form:"max_val"` //最小值 UpdatedBy int `json:"updated_by" ` //修改人 - UpdatedTime jsontime.Time `json:"updated_at"` //修改时间 + UpdatedAt jsontime.Time `json:"updated_at"` //修改时间 } type DictManageListReq struct { Id string `json:"id" form:"id" binding:"required"` //组件ID ParentId string `json:"parent_id" form:"parent_id"` //父级ID Name string `json:"name" form:"name" binding:"required"` //字典标签 - Status int `json:"status" form:"status" binding:"oneof=0 1"` //是否启用(0:启用 1:禁用) + Status int `json:"status" form:"status" binding:"oneof=0 1"` //是否启用(1:启用 2:禁用) Description string `json:"description" form:"description" binding:"lte=200"` //描述 MinVal string `json:"min_val" form:"min_val"` //最大值 MaxVal string `json:"max_val" form:"max_val"` //最小值 diff --git a/src/controller/dict.go b/src/controller/dict.go index 3005a0d..872658c 100644 --- a/src/controller/dict.go +++ b/src/controller/dict.go @@ -3,7 +3,6 @@ package controller import ( "errors" "github.com/gin-gonic/gin" - "github.com/spf13/cast" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/bean/vo/request" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/pkg/beagle/resp" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/router/middleware/header" @@ -135,9 +134,9 @@ func (d Dict) Del(c *gin.Context) { svc := new(service.Dict) svc.Ctx = c - //svc.User = &user + svc.User = header.GetUser(c) - err = svc.Del(cast.ToInt(id)) + err = svc.Del(id) if err != nil { SendJsonResponse(c, resp.FAIL.WithError(err), "") return diff --git a/src/pkg/beagle/resp/resp.go b/src/pkg/beagle/resp/resp.go index ba76d74..bef5fa6 100644 --- a/src/pkg/beagle/resp/resp.go +++ b/src/pkg/beagle/resp/resp.go @@ -63,7 +63,7 @@ func (r Resp) TranslateError(err error) Resp { } func (r Resp) Error() string { - return fmt.Sprintf("code:%d Message:%s", r.Code, r.Msg) + return fmt.Sprintf("code:%d Message:%s data:%v", r.Code, r.Msg, r.Data) } func DecodeErr(err error, data interface{}) (int, string, interface{}) { diff --git a/src/service/component_dict.go b/src/service/component_dict.go index 2061272..a8667af 100644 --- a/src/service/component_dict.go +++ b/src/service/component_dict.go @@ -127,7 +127,7 @@ func (c *Dict) Add(req request.AddDictReq) (err error) { return } - componentDict := &entity.Dict{ + dict := &entity.Dict{ Id: util.GetUUID(), Class: req.Class, Name: req.Name, @@ -148,9 +148,9 @@ func (c *Dict) Add(req request.AddDictReq) (err error) { return } - _, err = db.Insert(&componentDict) + _, err = db.Insert(dict) if err != nil { - err = resp.DbInsertError.ErrorDetail(err) + err = resp.DbInsertError.WithData(err) return } @@ -174,10 +174,10 @@ func (c *Dict) Update(req request.UpdateDictReq) (err error) { session := db.NewSession() req.UpdatedBy = c.User.Id - req.UpdatedTime = jsontime.Time(time.Now()) + req.UpdatedAt = jsontime.Time(time.Now()) _, err = session.Table("dict"). - Cols("name,status,description,updated_by,updated_time,min_val,max_val"). + Cols("name,status,description,updated_by,updated_at,min_val,max_val"). Where("id = ? and is_delete = 0", req.Id).Update(&req) if err != nil { err = errors.Wrap(err, "修改字典失败！") @@ -187,7 +187,7 @@ func (c *Dict) Update(req request.UpdateDictReq) (err error) { } -func (c *Dict) Del(id int) (err error) { +func (c *Dict) Del(id string) (err error) { db, err := client.GetDbClient() if err != nil { -- 2.26.0