From 452a561309eda11bb841e8b16ed55e0c09d90478 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Mon, 24 May 2021 07:40:48 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E2=9C=A8=20=E6=95=B0=E6=8D=AE=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E6=A0=B9=E6=8D=AEkey=E8=8E=B7=E5=8F=96=20=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E9=A1=B5=E9=9D=A2=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/apis/sys_dict_data.go | 15 +++++++++++++-- app/admin/apis/sys_dict_type.go | 2 +- app/admin/router/sys_dict.go | 2 +- app/admin/service/dto/sys_dict_type.go | 4 ++++ 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/app/admin/apis/sys_dict_data.go b/app/admin/apis/sys_dict_data.go index a3277cb..0a9f9f6 100644 --- a/app/admin/apis/sys_dict_data.go +++ b/app/admin/apis/sys_dict_data.go @@ -1,6 +1,7 @@ package apis import ( + "github.com/gin-gonic/gin/binding" "go-admin/app/admin/models" "net/http" @@ -170,6 +171,7 @@ func (e SysDictData) UpdateSysDictData(c *gin.Context) { // @Success 200 {string} string "{"code": 200, "message": "删除成功"}" // @Success 200 {string} string "{"code": -1, "message": "删除失败"}" // @Router /api/v1/dict/data/{dictCode} [delete] +// @Security Bearer func (e SysDictData) DeleteSysDictData(c *gin.Context) { s := service.SysDictData{} d := new(dto.SysDictDataById) @@ -196,12 +198,21 @@ func (e SysDictData) DeleteSysDictData(c *gin.Context) { e.OK(d.GetId(), "删除成功") } +// GetSysDictDataAll 数据字典根据key获取 业务页面使用 +// @Summary 数据字典根据key获取 +// @Description 数据字典根据key获取 +// @Tags 字典数据 +// @Param dictType query int true "dictType" +// @Success 200 {string} string "{"code": 200, "message": "删除成功"}" +// @Success 200 {string} string "{"code": -1, "message": "删除失败"}" +// @Router /api/v1/dict-data/option-select [get] +// @Security Bearer func (e SysDictData) GetSysDictDataAll(c *gin.Context) { s := service.SysDictData{} d := &dto.SysDictDataSearch{} err := e.MakeContext(c). MakeOrm(). - Bind(d). + Bind(d,binding.Form). MakeService(&s.Service). Errors if err != nil { @@ -220,4 +231,4 @@ func (e SysDictData) GetSysDictDataAll(c *gin.Context) { } e.OK(list, "查询成功") -} \ No newline at end of file +} diff --git a/app/admin/apis/sys_dict_type.go b/app/admin/apis/sys_dict_type.go index cb2ab4c..e09181e 100644 --- a/app/admin/apis/sys_dict_type.go +++ b/app/admin/apis/sys_dict_type.go @@ -190,7 +190,7 @@ func (e SysDictType) DeleteSysDictType(c *gin.Context) { } // GetSysDictTypeAll -// @Summary 字典类型全部数据 +// @Summary 字典类型全部数据 代码生成使用接口 // @Description 获取JSON // @Tags 字典类型 // @Param dictName query string false "dictName" diff --git a/app/admin/router/sys_dict.go b/app/admin/router/sys_dict.go index 3e08cfa..94e4399 100644 --- a/app/admin/router/sys_dict.go +++ b/app/admin/router/sys_dict.go @@ -30,5 +30,5 @@ func registerDictRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddlewar dicts.PUT("/type/:id", dictApi.UpdateSysDictType) dicts.DELETE("/type", dictApi.DeleteSysDictType) } - v1.Group("/dict").Use(authMiddleware.MiddlewareFunc()).GET("/data-all", dataApi.GetSysDictDataAll) + v1.Group("/dict-data").Use(authMiddleware.MiddlewareFunc()).GET("/option-select", dataApi.GetSysDictDataAll) } diff --git a/app/admin/service/dto/sys_dict_type.go b/app/admin/service/dto/sys_dict_type.go index 92c2731..508facf 100644 --- a/app/admin/service/dto/sys_dict_type.go +++ b/app/admin/service/dto/sys_dict_type.go @@ -17,6 +17,10 @@ type SysDictTypeSearch struct { Status int `form:"status" search:"type:exact;column:status;table:sys_dict_type"` } +type SysDictTypeOrder struct { + DictIdOrder string `search:"type:order;column:dict_id;table:sys_dict_type" form:"dict_id_order"` +} + func (m *SysDictTypeSearch) GetNeedSearch() interface{} { return *m }