refactor🎨: 修改字典类型status为int

This commit is contained in:
zhangwenjian committed 2021-06-20 00:39:43 +08:00
1 parent dafa627e31
commit a6116ede02
8 files changed
+18 -14

No files matched your search

+6 -7
View File
@@ -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, "查询成功")
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
}
+6 -1
View File
@@ -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)
@@ -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
@@ -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