From a6116ede0282260de9ba9d30516f6f331407b946 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Sun, 20 Jun 2021 00:39:43 +0800 Subject: [PATCH] =?UTF-8?q?refactor=F0=9F=8E=A8:=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=B1=BB=E5=9E=8Bstatus=E4=B8=BAint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/apis/sys_dict_type.go | 13 ++++++------- app/admin/models/sys_dict_data.go | 2 +- app/admin/models/sys_dict_type.go | 2 +- app/admin/service/dto/sys_dict_data.go | 2 +- app/admin/service/dto/sys_dict_type.go | 2 +- app/admin/service/sys_dict_type.go | 7 ++++++- cmd/migrate/migration/models/sys_dict_data.go | 2 +- cmd/migrate/migration/models/sys_dict_type.go | 2 +- 8 files changed, 18 insertions(+), 14 deletions(-) diff --git a/app/admin/apis/sys_dict_type.go b/app/admin/apis/sys_dict_type.go index 2321af1e..767b5ab3 100644 --- a/app/admin/apis/sys_dict_type.go +++ b/app/admin/apis/sys_dict_type.go @@ -1,14 +1,13 @@ package apis import ( - "github.com/gin-gonic/gin/binding" - "go-admin/app/admin/models" - "net/http" - + "fmt" "github.com/gin-gonic/gin" + "github.com/gin-gonic/gin/binding" "github.com/go-admin-team/go-admin-core/sdk/api" "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" _ "github.com/go-admin-team/go-admin-core/sdk/pkg/response" + "go-admin/app/admin/models" "go-admin/app/admin/service" "go-admin/app/admin/service/dto" @@ -111,7 +110,7 @@ func (e SysDictType) Insert(c *gin.Context) { err = s.Insert(&req) if err != nil { e.Logger.Error(err) - e.Error(500, err, "创建失败") + e.Error(500, err,fmt.Sprintf(" 创建字典类型失败，详情：%s", err.Error())) return } e.OK(req.GetId(), "创建成功") @@ -137,7 +136,7 @@ func (e SysDictType) Update(c *gin.Context) { MakeService(&s.Service). Errors if err != nil { - e.Error(http.StatusInternalServerError, err, err.Error()) + e.Error(500, err, err.Error()) e.Logger.Error(err) return } @@ -206,7 +205,7 @@ func (e SysDictType) GetAll(c *gin.Context) { list := make([]models.SysDictType, 0) err = s.GetAll(&req, &list) if err != nil { - e.Error(500, err, "查询失败") + e.Error(500, err, err.Error()) return } e.OK(list, "查询成功") diff --git a/app/admin/models/sys_dict_data.go b/app/admin/models/sys_dict_data.go index 4a013737..01561853 100644 --- a/app/admin/models/sys_dict_data.go +++ b/app/admin/models/sys_dict_data.go @@ -13,7 +13,7 @@ type SysDictData struct { CssClass string `json:"cssClass" gorm:"size:128;comment:CssClass"` ListClass string `json:"listClass" gorm:"size:128;comment:ListClass"` IsDefault string `json:"isDefault" gorm:"size:8;comment:IsDefault"` - Status string `json:"status" gorm:"size:4;comment:Status"` + Status int `json:"status" gorm:"size:4;comment:Status"` Default string `json:"default" gorm:"size:8;comment:Default"` Remark string `json:"remark" gorm:"size:255;comment:Remark"` models.ControlBy diff --git a/app/admin/models/sys_dict_type.go b/app/admin/models/sys_dict_type.go index 29442bdc..70f710d4 100644 --- a/app/admin/models/sys_dict_type.go +++ b/app/admin/models/sys_dict_type.go @@ -8,7 +8,7 @@ type SysDictType struct { ID int `json:"id" gorm:"primaryKey;column:dict_id;autoIncrement;comment:主键编码"` DictName string `json:"dictName" gorm:"size:128;comment:DictName"` DictType string `json:"dictType" gorm:"size:128;comment:DictType"` - Status string `json:"status" gorm:"size:4;comment:Status"` + Status int `json:"status" gorm:"size:4;comment:Status"` Remark string `json:"remark" gorm:"size:255;comment:Remark"` models.ControlBy models.ModelTime diff --git a/app/admin/service/dto/sys_dict_data.go b/app/admin/service/dto/sys_dict_data.go index e77436b3..4a953f56 100644 --- a/app/admin/service/dto/sys_dict_data.go +++ b/app/admin/service/dto/sys_dict_data.go @@ -28,7 +28,7 @@ type SysDictDataControl struct { CssClass string `json:"cssClass" comment:""` ListClass string `json:"listClass" comment:""` IsDefault string `json:"isDefault" comment:""` - Status string `json:"status" comment:""` + Status int `json:"status" comment:""` Default string `json:"default" comment:""` Remark string `json:"remark" comment:""` common.ControlBy diff --git a/app/admin/service/dto/sys_dict_type.go b/app/admin/service/dto/sys_dict_type.go index 80517fdd..76df729c 100644 --- a/app/admin/service/dto/sys_dict_type.go +++ b/app/admin/service/dto/sys_dict_type.go @@ -27,7 +27,7 @@ type SysDictTypeControl struct { Id int `uri:"id"` DictName string `json:"dictName"` DictType string `json:"dictType"` - Status string `json:"status"` + Status int `json:"status"` Remark string `json:"remark"` common.ControlBy } diff --git a/app/admin/service/sys_dict_type.go b/app/admin/service/sys_dict_type.go index 6afbea65..b652433a 100644 --- a/app/admin/service/sys_dict_type.go +++ b/app/admin/service/sys_dict_type.go @@ -2,7 +2,7 @@ package service import ( "errors" - + "fmt" "github.com/go-admin-team/go-admin-core/sdk/service" "gorm.io/gorm" @@ -57,6 +57,11 @@ func (e *SysDictType) Insert(c *dto.SysDictTypeControl) error { var err error var data models.SysDictType c.Generate(&data) + var count int64 + e.Orm.Model(&data).Where("dict_type = ?", data.DictType).Count(&count) + if count > 0 { + return errors.New(fmt.Sprintf("当前字典类型[%s]已经存在！", data.DictType)) + } err = e.Orm.Create(&data).Error if err != nil { e.Log.Errorf("db error: %s", err) diff --git a/cmd/migrate/migration/models/sys_dict_data.go b/cmd/migrate/migration/models/sys_dict_data.go index 4111aacd..c2936c89 100644 --- a/cmd/migrate/migration/models/sys_dict_data.go +++ b/cmd/migrate/migration/models/sys_dict_data.go @@ -9,7 +9,7 @@ type DictData struct { CssClass string `gorm:"size:128;" json:"cssClass"` // ListClass string `gorm:"size:128;" json:"listClass"` // IsDefault string `gorm:"size:8;" json:"isDefault"` // - Status string `gorm:"size:4;" json:"status"` //状态 + Status int `gorm:"size:4;" json:"status"` //状态 Default string `gorm:"size:8;" json:"default"` // Remark string `gorm:"size:255;" json:"remark"` //备注 ControlBy diff --git a/cmd/migrate/migration/models/sys_dict_type.go b/cmd/migrate/migration/models/sys_dict_type.go index 823b5070..4c79e37d 100644 --- a/cmd/migrate/migration/models/sys_dict_type.go +++ b/cmd/migrate/migration/models/sys_dict_type.go @@ -4,7 +4,7 @@ type DictType struct { DictId int `gorm:"primaryKey;autoIncrement;" json:"dictId"` DictName string `gorm:"size:128;" json:"dictName"` //字典名称 DictType string `gorm:"size:128;" json:"dictType"` //字典类型 - Status string `gorm:"size:4;" json:"status"` //状态 + Status int `gorm:"size:4;" json:"status"` //状态 Remark string `gorm:"size:255;" json:"remark"` //备注 ControlBy ModelTime