From 76946e463bf2668841c8c3dbbdb478e53c616fc4 Mon Sep 17 00:00:00 2001 From: QM303176530 <303176530@qq.com> Date: Wed, 24 Jun 2020 20:41:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E5=85=B8=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/api/v1/sys_dictionary.go | 111 ++++++++ server/api/v1/sys_dictionary_detail.go | 111 ++++++++ server/initialize/db_table.go | 2 + server/initialize/router.go | 2 + server/model/request/sys_dictionary.go | 8 + server/model/request/sys_dictionary_detail.go | 8 + server/model/sys_dictionary.go | 16 ++ server/model/sys_dictionary_detail.go | 16 ++ server/resource/template/fe/table.vue.tpl | 15 +- server/router/sys_dictionary.go | 18 ++ server/router/sys_dictionary_detail.go | 18 ++ server/service/sys_dictionary.go | 82 ++++++ server/service/sys_dictionary_detail.go | 82 ++++++ server/service/sys_user.go | 1 - web/src/api/sys_dictionary.js | 84 ++++++ web/src/api/sys_dictionary_detail.js | 84 ++++++ .../superAdmin/dictionary/sys_dictionary.vue | 249 +++++++++++++++++ .../dictionary/sys_dictionary_detail.vue | 258 ++++++++++++++++++ 18 files changed, 1155 insertions(+), 10 deletions(-) create mode 100644 server/api/v1/sys_dictionary.go create mode 100644 server/api/v1/sys_dictionary_detail.go create mode 100644 server/model/request/sys_dictionary.go create mode 100644 server/model/request/sys_dictionary_detail.go create mode 100644 server/model/sys_dictionary.go create mode 100644 server/model/sys_dictionary_detail.go create mode 100644 server/router/sys_dictionary.go create mode 100644 server/router/sys_dictionary_detail.go create mode 100644 server/service/sys_dictionary.go create mode 100644 server/service/sys_dictionary_detail.go create mode 100644 web/src/api/sys_dictionary.js create mode 100644 web/src/api/sys_dictionary_detail.js create mode 100644 web/src/view/superAdmin/dictionary/sys_dictionary.vue create mode 100644 web/src/view/superAdmin/dictionary/sys_dictionary_detail.vue diff --git a/server/api/v1/sys_dictionary.go b/server/api/v1/sys_dictionary.go new file mode 100644 index 00000000..b3c12197 --- /dev/null +++ b/server/api/v1/sys_dictionary.go @@ -0,0 +1,111 @@ +package v1 + +import ( + "fmt" + "gin-vue-admin/global/response" + "gin-vue-admin/model" + "gin-vue-admin/model/request" + resp "gin-vue-admin/model/response" + "gin-vue-admin/service" + "github.com/gin-gonic/gin" +) + +// @Tags SysDictionary +// @Summary 创建SysDictionary +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body model.SysDictionary true "创建SysDictionary" +// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /sysDictionary/createSysDictionary [post] +func CreateSysDictionary(c *gin.Context) { + var sysDictionary model.SysDictionary + _ = c.ShouldBindJSON(&sysDictionary) + err := service.CreateSysDictionary(sysDictionary) + if err != nil { + response.FailWithMessage(fmt.Sprintf("创建失败，%v", err), c) + } else { + response.OkWithMessage("创建成功", c) + } +} + +// @Tags SysDictionary +// @Summary 删除SysDictionary +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body model.SysDictionary true "删除SysDictionary" +// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}" +// @Router /sysDictionary/deleteSysDictionary [delete] +func DeleteSysDictionary(c *gin.Context) { + var sysDictionary model.SysDictionary + _ = c.ShouldBindJSON(&sysDictionary) + err := service.DeleteSysDictionary(sysDictionary) + if err != nil { + response.FailWithMessage(fmt.Sprintf("删除失败，%v", err), c) + } else { + response.OkWithMessage("删除成功", c) + } +} + +// @Tags SysDictionary +// @Summary 更新SysDictionary +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body model.SysDictionary true "更新SysDictionary" +// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}" +// @Router /sysDictionary/updateSysDictionary [put] +func UpdateSysDictionary(c *gin.Context) { + var sysDictionary model.SysDictionary + _ = c.ShouldBindJSON(&sysDictionary) + err := service.UpdateSysDictionary(&sysDictionary) + if err != nil { + response.FailWithMessage(fmt.Sprintf("更新失败，%v", err), c) + } else { + response.OkWithMessage("更新成功", c) + } +} + +// @Tags SysDictionary +// @Summary 用id查询SysDictionary +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body model.SysDictionary true "用id查询SysDictionary" +// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}" +// @Router /sysDictionary/findSysDictionary [get] +func FindSysDictionary(c *gin.Context) { + var sysDictionary model.SysDictionary + _ = c.ShouldBindQuery(&sysDictionary) + err, resysDictionary := service.GetSysDictionary(sysDictionary.ID) + if err != nil { + response.FailWithMessage(fmt.Sprintf("查询失败，%v", err), c) + } else { + response.OkWithData(gin.H{"resysDictionary": resysDictionary}, c) + } +} + +// @Tags SysDictionary +// @Summary 分页获取SysDictionary列表 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body request.SysDictionarySearch true "分页获取SysDictionary列表" +// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /sysDictionary/getSysDictionaryList [get] +func GetSysDictionaryList(c *gin.Context) { + var pageInfo request.SysDictionarySearch + _ = c.ShouldBindQuery(&pageInfo) + err, list, total := service.GetSysDictionaryInfoList(pageInfo) + if err != nil { + response.FailWithMessage(fmt.Sprintf("获取数据失败，%v", err), c) + } else { + response.OkWithData(resp.PageResult{ + List: list, + Total: total, + Page: pageInfo.Page, + PageSize: pageInfo.PageSize, + }, c) + } +} diff --git a/server/api/v1/sys_dictionary_detail.go b/server/api/v1/sys_dictionary_detail.go new file mode 100644 index 00000000..b40fe5a2 --- /dev/null +++ b/server/api/v1/sys_dictionary_detail.go @@ -0,0 +1,111 @@ +package v1 + +import ( + "fmt" + "gin-vue-admin/global/response" + "gin-vue-admin/model" + "gin-vue-admin/model/request" + resp "gin-vue-admin/model/response" + "gin-vue-admin/service" + "github.com/gin-gonic/gin" +) + +// @Tags SysDictionaryDetail +// @Summary 创建SysDictionaryDetail +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body model.SysDictionaryDetail true "创建SysDictionaryDetail" +// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /sysDictionaryDetail/createSysDictionaryDetail [post] +func CreateSysDictionaryDetail(c *gin.Context) { + var sysDictionaryDetail model.SysDictionaryDetail + _ = c.ShouldBindJSON(&sysDictionaryDetail) + err := service.CreateSysDictionaryDetail(sysDictionaryDetail) + if err != nil { + response.FailWithMessage(fmt.Sprintf("创建失败，%v", err), c) + } else { + response.OkWithMessage("创建成功", c) + } +} + +// @Tags SysDictionaryDetail +// @Summary 删除SysDictionaryDetail +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body model.SysDictionaryDetail true "删除SysDictionaryDetail" +// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}" +// @Router /sysDictionaryDetail/deleteSysDictionaryDetail [delete] +func DeleteSysDictionaryDetail(c *gin.Context) { + var sysDictionaryDetail model.SysDictionaryDetail + _ = c.ShouldBindJSON(&sysDictionaryDetail) + err := service.DeleteSysDictionaryDetail(sysDictionaryDetail) + if err != nil { + response.FailWithMessage(fmt.Sprintf("删除失败，%v", err), c) + } else { + response.OkWithMessage("删除成功", c) + } +} + +// @Tags SysDictionaryDetail +// @Summary 更新SysDictionaryDetail +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body model.SysDictionaryDetail true "更新SysDictionaryDetail" +// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}" +// @Router /sysDictionaryDetail/updateSysDictionaryDetail [put] +func UpdateSysDictionaryDetail(c *gin.Context) { + var sysDictionaryDetail model.SysDictionaryDetail + _ = c.ShouldBindJSON(&sysDictionaryDetail) + err := service.UpdateSysDictionaryDetail(&sysDictionaryDetail) + if err != nil { + response.FailWithMessage(fmt.Sprintf("更新失败，%v", err), c) + } else { + response.OkWithMessage("更新成功", c) + } +} + +// @Tags SysDictionaryDetail +// @Summary 用id查询SysDictionaryDetail +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body model.SysDictionaryDetail true "用id查询SysDictionaryDetail" +// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}" +// @Router /sysDictionaryDetail/findSysDictionaryDetail [get] +func FindSysDictionaryDetail(c *gin.Context) { + var sysDictionaryDetail model.SysDictionaryDetail + _ = c.ShouldBindQuery(&sysDictionaryDetail) + err, resysDictionaryDetail := service.GetSysDictionaryDetail(sysDictionaryDetail.ID) + if err != nil { + response.FailWithMessage(fmt.Sprintf("查询失败，%v", err), c) + } else { + response.OkWithData(gin.H{"resysDictionaryDetail": resysDictionaryDetail}, c) + } +} + +// @Tags SysDictionaryDetail +// @Summary 分页获取SysDictionaryDetail列表 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body request.SysDictionaryDetailSearch true "分页获取SysDictionaryDetail列表" +// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /sysDictionaryDetail/getSysDictionaryDetailList [get] +func GetSysDictionaryDetailList(c *gin.Context) { + var pageInfo request.SysDictionaryDetailSearch + _ = c.ShouldBindQuery(&pageInfo) + err, list, total := service.GetSysDictionaryDetailInfoList(pageInfo) + if err != nil { + response.FailWithMessage(fmt.Sprintf("获取数据失败，%v", err), c) + } else { + response.OkWithData(resp.PageResult{ + List: list, + Total: total, + Page: pageInfo.Page, + PageSize: pageInfo.PageSize, + }, c) + } +} diff --git a/server/initialize/db_table.go b/server/initialize/db_table.go index 58d460ab..7d90c0d0 100644 --- a/server/initialize/db_table.go +++ b/server/initialize/db_table.go @@ -15,6 +15,8 @@ func DBTables() { model.JwtBlacklist{}, model.SysWorkflow{}, model.SysWorkflowStepInfo{}, + model.SysDictionary{}, + model.SysDictionaryDetail{}, model.ExaFileUploadAndDownload{}, model.ExaFile{}, model.ExaFileChunk{}, diff --git a/server/initialize/router.go b/server/initialize/router.go index 643de3a1..8b2bafc2 100644 --- a/server/initialize/router.go +++ b/server/initialize/router.go @@ -35,6 +35,8 @@ func Routers() *gin.Engine { router.InitSystemRouter(ApiGroup) // system相关路由 router.InitCustomerRouter(ApiGroup) // 客户路由 router.InitAutoCodeRouter(ApiGroup) // 创建自动化代码 + router.InitSysDictionaryDetailRouter(ApiGroup) // 字典详情管理 + router.InitSysDictionaryRouter(ApiGroup) // 字典管理 global.GVA_LOG.Info("router register success") return Router } diff --git a/server/model/request/sys_dictionary.go b/server/model/request/sys_dictionary.go new file mode 100644 index 00000000..c71b3666 --- /dev/null +++ b/server/model/request/sys_dictionary.go @@ -0,0 +1,8 @@ +package request + +import "gin-vue-admin/model" + +type SysDictionarySearch struct{ + model.SysDictionary + PageInfo +} \ No newline at end of file diff --git a/server/model/request/sys_dictionary_detail.go b/server/model/request/sys_dictionary_detail.go new file mode 100644 index 00000000..95b30a62 --- /dev/null +++ b/server/model/request/sys_dictionary_detail.go @@ -0,0 +1,8 @@ +package request + +import "gin-vue-admin/model" + +type SysDictionaryDetailSearch struct{ + model.SysDictionaryDetail + PageInfo +} \ No newline at end of file diff --git a/server/model/sys_dictionary.go b/server/model/sys_dictionary.go new file mode 100644 index 00000000..8947909c --- /dev/null +++ b/server/model/sys_dictionary.go @@ -0,0 +1,16 @@ +// 自动生成模板SysDictionary +package model + +import ( + "github.com/jinzhu/gorm" +) + +// 如果含有time.Time 请自行import time包 +type SysDictionary struct { + gorm.Model + Name string `json:"name" form:"name" gorm:"column:name;comment:'字典名（中）'"` + Type string `json:"type" form:"type" gorm:"column:type;comment:'字典名（英）'"` + Status *bool `json:"status" form:"status" gorm:"column:status;comment:'状态'"` + Desc string `json:"desc" form:"desc" gorm:"column:desc;comment:'描述'"` + SysDictionaryDetails []SysDictionaryDetail `json:"sysDictionaryDetails" form:"sysDictionaryDetails"` +} diff --git a/server/model/sys_dictionary_detail.go b/server/model/sys_dictionary_detail.go new file mode 100644 index 00000000..4905c645 --- /dev/null +++ b/server/model/sys_dictionary_detail.go @@ -0,0 +1,16 @@ +// 自动生成模板SysDictionaryDetail +package model + +import ( + "github.com/jinzhu/gorm" +) + +// 如果含有time.Time 请自行import time包 +type SysDictionaryDetail struct { + gorm.Model + Label string `json:"label" form:"label" gorm:"column:label;comment:'展示值'"` + Value int `json:"value" form:"value" gorm:"column:value;comment:'字典值'"` + Status *bool `json:"status" form:"status" gorm:"column:status;comment:'启用状态'"` + Sort int `json:"sort" form:"sort" gorm:"column:sort;comment:'排序标记'"` + SysDictionaryID int `json:"sysDictionaryID" form:"sysDictionaryID" gorm:"column:sys_dictionary_id;comment:'关联标记'"` +} \ No newline at end of file diff --git a/server/resource/template/fe/table.vue.tpl b/server/resource/template/fe/table.vue.tpl index 464c44a6..bce6ec9f 100644 --- a/server/resource/template/fe/table.vue.tpl +++ b/server/resource/template/fe/table.vue.tpl @@ -4,8 +4,7 @@ {{- range .Fields}} {{- if .FieldSearchType}} {{- if eq .FieldType "bool" }} - - + - - - {{- else }} @@ -31,7 +25,7 @@ 查询 - 新增api + 新增{{.Description}} @@ -181,8 +175,11 @@ export default { res = await create{{.StructName}}(this.formData); break; } - if (res.code == 0) { + this.$message({ + type:"success", + message:"创建/更改成功" + }) this.closeDialog(); this.getTableData(); } diff --git a/server/router/sys_dictionary.go b/server/router/sys_dictionary.go new file mode 100644 index 00000000..21b543e6 --- /dev/null +++ b/server/router/sys_dictionary.go @@ -0,0 +1,18 @@ +package router + +import ( + "gin-vue-admin/api/v1" + "gin-vue-admin/middleware" + "github.com/gin-gonic/gin" +) + +func InitSysDictionaryRouter(Router *gin.RouterGroup) { + SysDictionaryRouter := Router.Group("sysDictionary").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler()) + { + SysDictionaryRouter.POST("createSysDictionary", v1.CreateSysDictionary) // 新建SysDictionary + SysDictionaryRouter.DELETE("deleteSysDictionary", v1.DeleteSysDictionary) // 删除SysDictionary + SysDictionaryRouter.PUT("updateSysDictionary", v1.UpdateSysDictionary) // 更新SysDictionary + SysDictionaryRouter.GET("findSysDictionary", v1.FindSysDictionary) // 根据ID获取SysDictionary + SysDictionaryRouter.GET("getSysDictionaryList", v1.GetSysDictionaryList) // 获取SysDictionary列表 + } +} diff --git a/server/router/sys_dictionary_detail.go b/server/router/sys_dictionary_detail.go new file mode 100644 index 00000000..2935750c --- /dev/null +++ b/server/router/sys_dictionary_detail.go @@ -0,0 +1,18 @@ +package router + +import ( + "gin-vue-admin/api/v1" + "gin-vue-admin/middleware" + "github.com/gin-gonic/gin" +) + +func InitSysDictionaryDetailRouter(Router *gin.RouterGroup) { + SysDictionaryDetailRouter := Router.Group("sysDictionaryDetail").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler()) + { + SysDictionaryDetailRouter.POST("createSysDictionaryDetail", v1.CreateSysDictionaryDetail) // 新建SysDictionaryDetail + SysDictionaryDetailRouter.DELETE("deleteSysDictionaryDetail", v1.DeleteSysDictionaryDetail) // 删除SysDictionaryDetail + SysDictionaryDetailRouter.PUT("updateSysDictionaryDetail", v1.UpdateSysDictionaryDetail) // 更新SysDictionaryDetail + SysDictionaryDetailRouter.GET("findSysDictionaryDetail", v1.FindSysDictionaryDetail) // 根据ID获取SysDictionaryDetail + SysDictionaryDetailRouter.GET("getSysDictionaryDetailList", v1.GetSysDictionaryDetailList) // 获取SysDictionaryDetail列表 + } +} diff --git a/server/service/sys_dictionary.go b/server/service/sys_dictionary.go new file mode 100644 index 00000000..6efd7a67 --- /dev/null +++ b/server/service/sys_dictionary.go @@ -0,0 +1,82 @@ +package service + +import ( + "gin-vue-admin/global" + "gin-vue-admin/model" + "gin-vue-admin/model/request" +) + +// @title CreateSysDictionary +// @description create a SysDictionary +// @param sysDictionary model.SysDictionary +// @auth （2020/04/05 20:22） +// @return err error + +func CreateSysDictionary(sysDictionary model.SysDictionary) (err error) { + err = global.GVA_DB.Create(&sysDictionary).Error + return err +} + +// @title DeleteSysDictionary +// @description delete a SysDictionary +// @auth （2020/04/05 20:22） +// @param sysDictionary model.SysDictionary +// @return error + +func DeleteSysDictionary(sysDictionary model.SysDictionary) (err error) { + err = global.GVA_DB.Delete(sysDictionary).Error + return err +} + +// @title UpdateSysDictionary +// @description update a SysDictionary +// @param sysDictionary *model.SysDictionary +// @auth （2020/04/05 20:22） +// @return error + +func UpdateSysDictionary(sysDictionary *model.SysDictionary) (err error) { + err = global.GVA_DB.Save(sysDictionary).Error + return err +} + +// @title GetSysDictionary +// @description get the info of a SysDictionary +// @auth （2020/04/05 20:22） +// @param id uint +// @return error +// @return SysDictionary SysDictionary + +func GetSysDictionary(id uint) (err error, sysDictionary model.SysDictionary) { + err = global.GVA_DB.Where("id = ?", id).First(&sysDictionary).Error + return +} + +// @title GetSysDictionaryInfoList +// @description get SysDictionary list by pagination, 分页获取用户列表 +// @auth （2020/04/05 20:22） +// @param info PageInfo +// @return error + +func GetSysDictionaryInfoList(info request.SysDictionarySearch) (err error, list interface{}, total int) { + limit := info.PageSize + offset := info.PageSize * (info.Page - 1) + // 创建db + db := global.GVA_DB.Model(&model.SysDictionary{}) + var sysDictionarys []model.SysDictionary + // 如果有条件搜索 下方会自动创建搜索语句 + if info.Name != "" { + db = db.Where("name LIKE ?","%"+ info.Name+"%") + } + if info.Type != "" { + db = db.Where("type LIKE ?","%"+ info.Type+"%") + } + if info.Status != nil { + db = db.Where("status = ?",info.Status) + } + if info.Desc != "" { + db = db.Where("desc LIKE ?","%"+ info.Desc+"%") + } + err = db.Count(&total).Error + err = db.Limit(limit).Offset(offset).Find(&sysDictionarys).Error + return err, sysDictionarys, total +} \ No newline at end of file diff --git a/server/service/sys_dictionary_detail.go b/server/service/sys_dictionary_detail.go new file mode 100644 index 00000000..750cf3fd --- /dev/null +++ b/server/service/sys_dictionary_detail.go @@ -0,0 +1,82 @@ +package service + +import ( + "gin-vue-admin/global" + "gin-vue-admin/model" + "gin-vue-admin/model/request" +) + +// @title CreateSysDictionaryDetail +// @description create a SysDictionaryDetail +// @param sysDictionaryDetail model.SysDictionaryDetail +// @auth （2020/04/05 20:22） +// @return err error + +func CreateSysDictionaryDetail(sysDictionaryDetail model.SysDictionaryDetail) (err error) { + err = global.GVA_DB.Create(&sysDictionaryDetail).Error + return err +} + +// @title DeleteSysDictionaryDetail +// @description delete a SysDictionaryDetail +// @auth （2020/04/05 20:22） +// @param sysDictionaryDetail model.SysDictionaryDetail +// @return error + +func DeleteSysDictionaryDetail(sysDictionaryDetail model.SysDictionaryDetail) (err error) { + err = global.GVA_DB.Delete(sysDictionaryDetail).Error + return err +} + +// @title UpdateSysDictionaryDetail +// @description update a SysDictionaryDetail +// @param sysDictionaryDetail *model.SysDictionaryDetail +// @auth （2020/04/05 20:22） +// @return error + +func UpdateSysDictionaryDetail(sysDictionaryDetail *model.SysDictionaryDetail) (err error) { + err = global.GVA_DB.Save(sysDictionaryDetail).Error + return err +} + +// @title GetSysDictionaryDetail +// @description get the info of a SysDictionaryDetail +// @auth （2020/04/05 20:22） +// @param id uint +// @return error +// @return SysDictionaryDetail SysDictionaryDetail + +func GetSysDictionaryDetail(id uint) (err error, sysDictionaryDetail model.SysDictionaryDetail) { + err = global.GVA_DB.Where("id = ?", id).First(&sysDictionaryDetail).Error + return +} + +// @title GetSysDictionaryDetailInfoList +// @description get SysDictionaryDetail list by pagination, 分页获取用户列表 +// @auth （2020/04/05 20:22） +// @param info PageInfo +// @return error + +func GetSysDictionaryDetailInfoList(info request.SysDictionaryDetailSearch) (err error, list interface{}, total int) { + limit := info.PageSize + offset := info.PageSize * (info.Page - 1) + // 创建db + db := global.GVA_DB.Model(&model.SysDictionaryDetail{}) + var sysDictionaryDetails []model.SysDictionaryDetail + // 如果有条件搜索 下方会自动创建搜索语句 + if info.Label != "" { + db = db.Where("label LIKE ?", "%"+info.Label+"%") + } + if info.Value != 0 { + db = db.Where("value = ?", info.Value) + } + if info.Status != nil { + db = db.Where("status = ?", info.Status) + } + if info.SysDictionaryID != 0 { + db = db.Where("sys_dictionary_id = ?", info.SysDictionaryID) + } + err = db.Count(&total).Error + err = db.Limit(limit).Offset(offset).Find(&sysDictionaryDetails).Error + return err, sysDictionaryDetails, total +} diff --git a/server/service/sys_user.go b/server/service/sys_user.go index e3cfefba..e1f47a92 100644 --- a/server/service/sys_user.go +++ b/server/service/sys_user.go @@ -56,7 +56,6 @@ func Login(u *model.SysUser) (err error, userInter *model.SysUser) { func ChangePassword(u *model.SysUser, newPassword string) (err error, userInter *model.SysUser) { var user model.SysUser - // TODO:后期修改jwt+password模式 u.Password = utils.MD5V([]byte(u.Password)) err = global.GVA_DB.Where("username = ? AND password = ?", u.Username, u.Password).First(&user).Update("password", utils.MD5V([]byte(newPassword))).Error return err, u diff --git a/web/src/api/sys_dictionary.js b/web/src/api/sys_dictionary.js new file mode 100644 index 00000000..e08efbbb --- /dev/null +++ b/web/src/api/sys_dictionary.js @@ -0,0 +1,84 @@ +import service from '@/utils/request' + +// @Tags SysDictionary +// @Summary 创建SysDictionary +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body model.SysDictionary true "创建SysDictionary" +// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /sysDictionary/createSysDictionary [post] +export const createSysDictionary = (data) => { + return service({ + url: "/sysDictionary/createSysDictionary", + method: 'post', + data + }) + } + + +// @Tags SysDictionary +// @Summary 删除SysDictionary +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body model.SysDictionary true "删除SysDictionary" +// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}" +// @Router /sysDictionary/deleteSysDictionary [delete] + export const deleteSysDictionary = (data) => { + return service({ + url: "/sysDictionary/deleteSysDictionary", + method: 'delete', + data + }) + } + +// @Tags SysDictionary +// @Summary 更新SysDictionary +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body model.SysDictionary true "更新SysDictionary" +// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}" +// @Router /sysDictionary/updateSysDictionary [put] + export const updateSysDictionary = (data) => { + return service({ + url: "/sysDictionary/updateSysDictionary", + method: 'put', + data + }) + } + + +// @Tags SysDictionary +// @Summary 用id查询SysDictionary +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body model.SysDictionary true "用id查询SysDictionary" +// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}" +// @Router /sysDictionary/findSysDictionary [get] + export const findSysDictionary = (params) => { + return service({ + url: "/sysDictionary/findSysDictionary", + method: 'get', + params + }) + } + + +// @Tags SysDictionary +// @Summary 分页获取SysDictionary列表 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body request.PageInfo true "分页获取SysDictionary列表" +// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /sysDictionary/getSysDictionaryList [get] + export const getSysDictionaryList = (params) => { + return service({ + url: "/sysDictionary/getSysDictionaryList", + method: 'get', + params + }) + } \ No newline at end of file diff --git a/web/src/api/sys_dictionary_detail.js b/web/src/api/sys_dictionary_detail.js new file mode 100644 index 00000000..a64fe68a --- /dev/null +++ b/web/src/api/sys_dictionary_detail.js @@ -0,0 +1,84 @@ +import service from '@/utils/request' + +// @Tags SysDictionaryDetail +// @Summary 创建SysDictionaryDetail +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body model.SysDictionaryDetail true "创建SysDictionaryDetail" +// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /sysDictionaryDetail/createSysDictionaryDetail [post] +export const createSysDictionaryDetail = (data) => { + return service({ + url: "/sysDictionaryDetail/createSysDictionaryDetail", + method: 'post', + data + }) + } + + +// @Tags SysDictionaryDetail +// @Summary 删除SysDictionaryDetail +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body model.SysDictionaryDetail true "删除SysDictionaryDetail" +// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}" +// @Router /sysDictionaryDetail/deleteSysDictionaryDetail [delete] + export const deleteSysDictionaryDetail = (data) => { + return service({ + url: "/sysDictionaryDetail/deleteSysDictionaryDetail", + method: 'delete', + data + }) + } + +// @Tags SysDictionaryDetail +// @Summary 更新SysDictionaryDetail +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body model.SysDictionaryDetail true "更新SysDictionaryDetail" +// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}" +// @Router /sysDictionaryDetail/updateSysDictionaryDetail [put] + export const updateSysDictionaryDetail = (data) => { + return service({ + url: "/sysDictionaryDetail/updateSysDictionaryDetail", + method: 'put', + data + }) + } + + +// @Tags SysDictionaryDetail +// @Summary 用id查询SysDictionaryDetail +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body model.SysDictionaryDetail true "用id查询SysDictionaryDetail" +// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}" +// @Router /sysDictionaryDetail/findSysDictionaryDetail [get] + export const findSysDictionaryDetail = (params) => { + return service({ + url: "/sysDictionaryDetail/findSysDictionaryDetail", + method: 'get', + params + }) + } + + +// @Tags SysDictionaryDetail +// @Summary 分页获取SysDictionaryDetail列表 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body request.PageInfo true "分页获取SysDictionaryDetail列表" +// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /sysDictionaryDetail/getSysDictionaryDetailList [get] + export const getSysDictionaryDetailList = (params) => { + return service({ + url: "/sysDictionaryDetail/getSysDictionaryDetailList", + method: 'get', + params + }) + } \ No newline at end of file diff --git a/web/src/view/superAdmin/dictionary/sys_dictionary.vue b/web/src/view/superAdmin/dictionary/sys_dictionary.vue new file mode 100644 index 00000000..9634e8a1 --- /dev/null +++ b/web/src/view/superAdmin/dictionary/sys_dictionary.vue @@ -0,0 +1,249 @@ + + + + + \ No newline at end of file diff --git a/web/src/view/superAdmin/dictionary/sys_dictionary_detail.vue b/web/src/view/superAdmin/dictionary/sys_dictionary_detail.vue new file mode 100644 index 00000000..83fdee8a --- /dev/null +++ b/web/src/view/superAdmin/dictionary/sys_dictionary_detail.vue @@ -0,0 +1,258 @@ + + + + + \ No newline at end of file -- GitLab