refactor🎨 部分功能重写

This commit is contained in:
wenjianzhang committed 2021-05-21 18:25:51 +08:00
1 parent 765775c54d
commit 408dcc5057
28 files changed
+639 -972

No files matched your search

+31 -57
View File
@@ -1,6 +1,7 @@
package apis package apis
import ( import (
"github.com/gin-gonic/gin/binding"
"net/http" "net/http"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
@@ -32,38 +33,28 @@ type SysApi struct {
// @Router /api/v1/sys_api [get] // @Router /api/v1/sys_api [get]
// @Security Bearer // @Security Bearer
func (e SysApi) GetSysApiList(c *gin.Context) { func (e SysApi) GetSysApiList(c *gin.Context) {
e.MakeContext(c) s := new(service.SysApi)
log := e.GetLogger()
db, err := e.GetOrm()
if err != nil {
log.Error(err)
return
}
d := new(dto.SysApiSearch) d := new(dto.SysApiSearch)
//查询列表 err := e.MakeContext(c).
err = d.Bind(c) MakeOrm().
Bind(d,binding.Form).
MakeService(&s.Service).
Errors
if err != nil { if err != nil {
log.Warnf("request body bind error, %s", err.Error()) e.Error(http.StatusInternalServerError, err, err.Error())
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") e.Logger.Error(err)
return return
} }
//数据权限检查 //数据权限检查
p := actions.GetPermissionFromContext(c) p := actions.GetPermissionFromContext(c)
list := make([]models.SysApi, 0) list := make([]models.SysApi, 0)
var count int64 var count int64
serviceSysApi := service.SysApi{} err = s.GetSysApiPage(d, p, &list, &count)
serviceSysApi.Log = log
serviceSysApi.Orm = db
err = serviceSysApi.GetSysApiPage(d, p, &list, &count)
if err != nil { if err != nil {
log.Errorf("Get SysApi Page error, %s", err.Error()) e.Logger.Errorf("Get SysApi Page error, %s", err.Error())
e.Error(http.StatusInternalServerError, err, "查询失败") e.Error(http.StatusInternalServerError, err, "查询失败")
return return
} }
e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功") e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功")
} }
@@ -80,7 +71,7 @@ func (e SysApi) GetSysApi(c *gin.Context) {
s := new(service.SysApi) s := new(service.SysApi)
err := e.MakeContext(c). err := e.MakeContext(c).
MakeOrm(). MakeOrm().
Bind(control). Bind(control,nil).
MakeService(&s.Service). MakeService(&s.Service).
Errors Errors
if err != nil { if err != nil {
@@ -114,26 +105,20 @@ func (e SysApi) GetSysApi(c *gin.Context) {
// @Router /api/v1/sys_api/{id} [put] // @Router /api/v1/sys_api/{id} [put]
// @Security Bearer // @Security Bearer
func (e SysApi) UpdateSysApi(c *gin.Context) { func (e SysApi) UpdateSysApi(c *gin.Context) {
e.MakeContext(c)
log := e.GetLogger()
db, err := e.GetOrm()
if err != nil {
log.Error(err)
return
}
control := new(dto.SysApiControl) control := new(dto.SysApiControl)
s := new(service.SysApi)
//更新操作 err := e.MakeContext(c).
err = control.Bind(c) MakeOrm().
Bind(control).
MakeService(&s.Service).
Errors
if err != nil { if err != nil {
log.Warnf("request body bind error, %s", err.Error()) e.Logger.Error(err)
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return return
} }
object, err := control.GenerateM() object, err := control.GenerateM()
if err != nil { if err != nil {
log.Errorf("generate SysApi model error, %s", err.Error()) e.Logger.Errorf("generate SysApi model error, %s", err.Error())
e.Error(http.StatusInternalServerError, err, "模型生成失败") e.Error(http.StatusInternalServerError, err, "模型生成失败")
return return
} }
@@ -142,12 +127,9 @@ func (e SysApi) UpdateSysApi(c *gin.Context) {
//数据权限检查 //数据权限检查
p := actions.GetPermissionFromContext(c) p := actions.GetPermissionFromContext(c)
serviceSysApi := service.SysApi{} err = s.UpdateSysApi(object.(*models.SysApi), p)
serviceSysApi.Orm = db
serviceSysApi.Log = log
err = serviceSysApi.UpdateSysApi(object.(*models.SysApi), p)
if err != nil { if err != nil {
log.Errorf("Update SysApi error, %s", err.Error()) e.Logger.Errorf("Update SysApi error, %s", err.Error())
e.Error(http.StatusInternalServerError, err, "更新失败") e.Error(http.StatusInternalServerError, err, "更新失败")
return return
} }
@@ -163,21 +145,16 @@ func (e SysApi) UpdateSysApi(c *gin.Context) {
// @Router /api/v1/sys_api [delete] // @Router /api/v1/sys_api [delete]
// @Security Bearer // @Security Bearer
func (e SysApi) DeleteSysApi(c *gin.Context) { func (e SysApi) DeleteSysApi(c *gin.Context) {
e.MakeContext(c)
log := e.GetLogger()
db, err := e.GetOrm()
if err != nil {
log.Error(err)
return
}
control := new(dto.SysApiById) control := new(dto.SysApiById)
s := service.SysApi{}
//删除操作 err := e.MakeContext(c).
err = control.Bind(c) MakeOrm().
Bind(control).
MakeService(&s.Service).
Errors
if err != nil { if err != nil {
log.Warnf("request body bind error, %s", err.Error()) e.Logger.Error(err)
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return return
} }
@@ -187,12 +164,9 @@ func (e SysApi) DeleteSysApi(c *gin.Context) {
// 数据权限检查 // 数据权限检查
p := actions.GetPermissionFromContext(c) p := actions.GetPermissionFromContext(c)
serviceSysApi := service.SysApi{} err = s.RemoveSysApi(control, p)
serviceSysApi.Orm = db
serviceSysApi.Log = log
err = serviceSysApi.RemoveSysApi(control, p)
if err != nil { if err != nil {
log.Errorf("Remove SysApi error, %s", err.Error()) e.Logger.Errorf("Remove SysApi error, %s", err.Error())
e.Error(http.StatusInternalServerError, err, "删除失败") e.Error(http.StatusInternalServerError, err, "删除失败")
return return
} }
+21 -46
View File
@@ -30,7 +30,6 @@ func (e SysConfig) GetSysConfigList(c *gin.Context) {
return return
} }
list := make([]models.SysConfig, 0) list := make([]models.SysConfig, 0)
var count int64 var count int64
err = s.GetSysConfigPage(d, &list, &count) err = s.GetSysConfigPage(d, &list, &count)
@@ -113,22 +112,16 @@ func (e SysConfig) InsertSysConfig(c *gin.Context) {
return return
} }
object, err := control.Generate()
if err != nil {
e.Error(http.StatusInternalServerError, err, "模型生成失败")
e.Logger.Errorf("Orm获取失败, error:%s", err)
return
}
// 设置创建人 // 设置创建人
object.SetCreateBy(user.GetUserId(c)) control.SetCreateBy(user.GetUserId(c))
err = s.InsertSysConfig(object) err = s.InsertSysConfig(control)
if err != nil { if err != nil {
e.Logger.Error(err) e.Logger.Error(err)
e.Error(http.StatusInternalServerError, err, "创建失败") e.Error(http.StatusInternalServerError, err, "创建失败")
return return
} }
e.OK(object.GetId(), "创建成功") e.OK(control.GetId(), "创建成功")
} }
func (e SysConfig) UpdateSysConfig(c *gin.Context) { func (e SysConfig) UpdateSysConfig(c *gin.Context) {
@@ -144,21 +137,15 @@ func (e SysConfig) UpdateSysConfig(c *gin.Context) {
return return
} }
object, err := control.Generate() control.SetUpdateBy(user.GetUserId(c))
if err != nil {
e.Error(http.StatusInternalServerError, err, "模型生成失败")
e.Logger.Errorf("Orm获取失败, error:%s", err)
return
}
object.SetUpdateBy(user.GetUserId(c))
err = s.UpdateSysConfig(object) err = s.UpdateSysConfig(control)
if err != nil { if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "更新失败") e.Error(http.StatusUnprocessableEntity, err, "更新失败")
e.Logger.Errorf("Orm获取失败, error:%s", err) e.Logger.Errorf("Orm获取失败, error:%s", err)
return return
} }
e.OK(object.GetId(), "更新成功") e.OK(control.GetId(), "更新成功")
} }
func (e SysConfig) DeleteSysConfig(c *gin.Context) { func (e SysConfig) DeleteSysConfig(c *gin.Context) {
@@ -174,49 +161,37 @@ func (e SysConfig) DeleteSysConfig(c *gin.Context) {
return return
} }
object, err := control.GenerateM()
if err != nil {
e.Error(http.StatusInternalServerError, err, "模型生成失败")
e.Logger.Errorf("Orm获取失败, error:%s", err)
return
}
// 设置编辑人 // 设置编辑人
object.SetUpdateBy(user.GetUserId(c)) control.SetUpdateBy(user.GetUserId(c))
err = s.RemoveSysConfig(control, object) err = s.RemoveSysConfig(control)
if err != nil { if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "删除失败") e.Error(http.StatusUnprocessableEntity, err, "删除失败")
e.Logger.Errorf("Orm获取失败, error:%s", err) e.Logger.Errorf("Orm获取失败, error:%s", err)
return return
} }
e.OK(object.GetId(), "删除成功") e.OK(control.GetId(), "删除成功")
} }
// GetSysConfigByKEYForService 根据Key获取SysConfig的Service // GetSysConfigByKEYForService 根据Key获取SysConfig的Service
func (e SysConfig) GetSysConfigByKEYForService(c *gin.Context) { func (e SysConfig) GetSysConfigByKEYForService(c *gin.Context) {
e.Context = c var s = new(service.SysConfig)
log := e.GetLogger() var control = new(dto.SysConfigControl)
db, err := e.GetOrm() err := e.MakeContext(c).
MakeOrm().
Bind(control).
MakeService(&s.Service).
Errors
if err != nil { if err != nil {
log.Error(err) e.Logger.Error(err)
return return
} }
var v dto.SysConfigControl
err = v.Bind(c) err = s.GetSysConfigByKEY(control)
if err != nil { if err != nil {
log.Errorf("参数验证错误, error:%s", err) e.Logger.Errorf("通过Key获取配置失败, error:%s", err)
e.Error(422, err, "参数验证失败")
return
}
s := service.SysConfig{}
s.Log = log
s.Orm = db
err = s.GetSysConfigByKEY(&v)
if err != nil {
log.Errorf("通过Key获取配置失败, error:%s", err)
e.Error(500, err, "") e.Error(500, err, "")
return return
} }
e.OK(v, s.Msg) e.OK(control, s.Msg)
} }
+79 -123
View File
@@ -1,6 +1,7 @@
package apis package apis
import ( import (
"github.com/gin-gonic/gin/binding"
"github.com/go-admin-team/go-admin-core/sdk/pkg" "github.com/go-admin-team/go-admin-core/sdk/pkg"
"go-admin/app/admin/models" "go-admin/app/admin/models"
"net/http" "net/http"
@@ -18,6 +19,7 @@ type SysDept struct {
api.Api api.Api
} }
// GetSysDeptList
// @Summary 分页部门列表数据 // @Summary 分页部门列表数据
// @Description 分页列表 // @Description 分页列表
// @Tags 部门 // @Tags 部门
@@ -28,27 +30,21 @@ type SysDept struct {
// @Router /api/v1/dept [get] // @Router /api/v1/dept [get]
// @Security Bearer // @Security Bearer
func (e SysDept) GetSysDeptList(c *gin.Context) { func (e SysDept) GetSysDeptList(c *gin.Context) {
e.Context = c s := new(service.SysDept)
log := e.GetLogger()
d := new(dto.SysDeptSearch) d := new(dto.SysDeptSearch)
db, err := e.GetOrm() err := e.MakeContext(c).
MakeOrm().
Bind(d, binding.Form).
MakeService(&s.Service).
Errors
if err != nil { if err != nil {
log.Error(err) e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
return return
} }
//查询列表
err = d.Bind(c)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
list := make([]models.SysDept, 0) list := make([]models.SysDept, 0)
serviceStudent := service.SysDept{}
serviceStudent.Log = log list, err = s.SetDeptPage(d)
serviceStudent.Orm = db
list, err = serviceStudent.SetDeptPage(d)
if err != nil { if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "查询失败") e.Error(http.StatusUnprocessableEntity, err, "查询失败")
return return
@@ -57,6 +53,7 @@ func (e SysDept) GetSysDeptList(c *gin.Context) {
e.OK(list, "查询成功") e.OK(list, "查询成功")
} }
// GetSysDept
// @Summary 部门列表数据 // @Summary 部门列表数据
// @Description 获取JSON // @Description 获取JSON
// @Tags 部门 // @Tags 部门
@@ -66,27 +63,21 @@ func (e SysDept) GetSysDeptList(c *gin.Context) {
// @Router /api/v1/dept/{deptId} [get] // @Router /api/v1/dept/{deptId} [get]
// @Security Bearer // @Security Bearer
func (e SysDept) GetSysDept(c *gin.Context) { func (e SysDept) GetSysDept(c *gin.Context) {
e.Context = c s := new(service.SysDept)
log := e.GetLogger()
control := new(dto.SysDeptById) control := new(dto.SysDeptById)
db, err := e.GetOrm() err := e.MakeContext(c).
MakeOrm().
Bind(control).
MakeService(&s.Service).
Errors
if err != nil { if err != nil {
log.Error(err) e.Error(http.StatusInternalServerError, err, err.Error())
return e.Logger.Error(err)
}
//查看详情
err = control.Bind(c)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return return
} }
var object models.SysDept var object models.SysDept
serviceSysOperlog := service.SysDept{} err = s.GetSysDept(control, &object)
serviceSysOperlog.Log = log
serviceSysOperlog.Orm = db
err = serviceSysOperlog.GetSysDept(control, &object)
if err != nil { if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "查询失败") e.Error(http.StatusUnprocessableEntity, err, "查询失败")
return return
@@ -95,6 +86,7 @@ func (e SysDept) GetSysDept(c *gin.Context) {
e.OK(object, "查看成功") e.OK(object, "查看成功")
} }
// InsertSysDept 添加部门
// @Summary 添加部门 // @Summary 添加部门
// @Description 获取JSON // @Description 获取JSON
// @Tags 部门 // @Tags 部门
@@ -106,42 +98,33 @@ func (e SysDept) GetSysDept(c *gin.Context) {
// @Router /api/v1/dept [post] // @Router /api/v1/dept [post]
// @Security Bearer // @Security Bearer
func (e SysDept) InsertSysDept(c *gin.Context) { func (e SysDept) InsertSysDept(c *gin.Context) {
e.Context = c s := new(service.SysDept)
log := e.GetLogger()
control := new(dto.SysDeptControl) control := new(dto.SysDeptControl)
db, err := e.GetOrm() err := e.MakeContext(c).
MakeOrm().
Bind(control).
MakeService(&s.Service).
Errors
if err != nil { if err != nil {
log.Error(err) e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
return return
} }
//新增操作
err = control.Bind(c)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
object, err := control.Generate()
if err != nil {
e.Error(http.StatusInternalServerError, err, "模型生成失败")
return
}
// 设置创建人 // 设置创建人
object.SetCreateBy(user.GetUserId(c)) control.SetCreateBy(user.GetUserId(c))
serviceSysDept := service.SysDept{} err = s.InsertSysDept(control)
serviceSysDept.Orm = db
serviceSysDept.Log = log
err = serviceSysDept.InsertSysDept(object)
if err != nil { if err != nil {
log.Error(err) e.Logger.Error(err)
e.Error(http.StatusInternalServerError, err, "创建失败") e.Error(http.StatusInternalServerError, err, "创建失败")
return return
} }
e.OK(object.GetId(), "创建成功") e.OK(control.GetId(), "创建成功")
} }
// UpdateSysDept
// @Summary 修改部门 // @Summary 修改部门
// @Description 获取JSON // @Description 获取JSON
// @Tags 部门 // @Tags 部门
@@ -154,39 +137,30 @@ func (e SysDept) InsertSysDept(c *gin.Context) {
// @Router /api/v1/dept/{deptId} [put] // @Router /api/v1/dept/{deptId} [put]
// @Security Bearer // @Security Bearer
func (e SysDept) UpdateSysDept(c *gin.Context) { func (e SysDept) UpdateSysDept(c *gin.Context) {
e.Context = c s := new(service.SysDept)
log := e.GetLogger()
control := new(dto.SysDeptControl) control := new(dto.SysDeptControl)
db, err := e.GetOrm() err := e.MakeContext(c).
MakeOrm().
Bind(control).
MakeService(&s.Service).
Errors
if err != nil { if err != nil {
log.Error(err) e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
return return
} }
//更新操作 control.SetUpdateBy(user.GetUserId(c))
err = control.Bind(c)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
object, err := control.Generate()
if err != nil {
e.Error(http.StatusInternalServerError, err, "模型生成失败")
return
}
object.SetUpdateBy(user.GetUserId(c))
serviceSysDept := service.SysDept{} err = s.UpdateSysDept(control)
serviceSysDept.Orm = db
serviceSysDept.Log = log
err = serviceSysDept.UpdateSysDept(object)
if err != nil { if err != nil {
log.Error(err) e.Logger.Error(err)
return return
} }
e.OK(object.GetId(), "更新成功") e.OK(control.GetId(), "更新成功")
} }
// DeleteSysDept
// @Summary 删除部门 // @Summary 删除部门
// @Description 删除数据 // @Description 删除数据
// @Tags 部门 // @Tags 部门
@@ -195,29 +169,22 @@ func (e SysDept) UpdateSysDept(c *gin.Context) {
// @Success 200 {string} string "{"code": -1, "message": "删除失败"}" // @Success 200 {string} string "{"code": -1, "message": "删除失败"}"
// @Router /api/v1/dept [delete] // @Router /api/v1/dept [delete]
func (e SysDept) DeleteSysDept(c *gin.Context) { func (e SysDept) DeleteSysDept(c *gin.Context) {
e.Context = c s := service.SysDept{}
log := e.GetLogger()
control := new(dto.SysDeptById) control := new(dto.SysDeptById)
db, err := e.GetOrm() err := e.MakeContext(c).
MakeOrm().
Bind(control).
MakeService(&s.Service).
Errors
if err != nil { if err != nil {
log.Error(err) e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
return return
} }
//删除操作 err = s.RemoveSysDept(control)
err = control.Bind(c)
if err != nil { if err != nil {
log.Errorf("Bind error: %s", err) e.Logger.Errorf("RemoveSysDept error, %s", err.Error())
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
serviceSysDept := service.SysDept{}
serviceSysDept.Orm = db
serviceSysDept.Log = log
err = serviceSysDept.RemoveSysDept(control)
if err != nil {
log.Errorf("RemoveSysDept error, %s", err.Error())
e.Error(http.StatusInternalServerError, err, "删除失败") e.Error(http.StatusInternalServerError, err, "删除失败")
return return
} }
@@ -226,64 +193,53 @@ func (e SysDept) DeleteSysDept(c *gin.Context) {
// GetDeptTree 用户管理 左侧部门树 // GetDeptTree 用户管理 左侧部门树
func (e SysDept) GetDeptTree(c *gin.Context) { func (e SysDept) GetDeptTree(c *gin.Context) {
e.Context = c s := service.SysDept{}
log := e.GetLogger()
d := new(dto.SysDeptSearch) d := new(dto.SysDeptSearch)
db, err := e.GetOrm() err := e.MakeContext(c).
MakeOrm().
Bind(d).
MakeService(&s.Service).
Errors
if err != nil { if err != nil {
log.Error(err) e.Error(http.StatusInternalServerError, err, err.Error())
return e.Logger.Error(err)
}
//查询列表
err = d.Bind(c)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return return
} }
list := make([]dto.DeptLabel, 0) list := make([]dto.DeptLabel, 0)
serviceStudent := service.SysDept{}
serviceStudent.Log = log list, err = s.SetDeptTree(d)
serviceStudent.Orm = db
list, err = serviceStudent.SetDeptTree(d)
if err != nil { if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "查询失败") e.Error(http.StatusUnprocessableEntity, err, "查询失败")
return return
} }
//var Dept models.SysDepts
//Dept.DeptName = c.Request.FormValue("deptName")
//Dept.Status = c.Request.FormValue("status")
//Dept.DeptId, _ = tools.StringToInt(c.Request.FormValue("deptId"))
//result, err := Dept.SetDept(false)
//tools.HasError(err, "抱歉未找到相关信息", -1)
e.OK(list, "") e.OK(list, "")
} }
// GetDeptTreeRoleSelect TODO: 此接口需要调整不应该将list和选中放在一起
func (e SysDept) GetDeptTreeRoleSelect(c *gin.Context) { func (e SysDept) GetDeptTreeRoleSelect(c *gin.Context) {
e.Context = c s := service.SysDept{}
log := e.GetLogger() err := e.MakeContext(c).
db, err := e.GetOrm() MakeOrm().
MakeService(&s.Service).
Errors
if err != nil { if err != nil {
log.Error(err) e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
return return
} }
s := service.SysDept{}
s.Orm = db
s.Log = log
id, err := pkg.StringToInt(c.Param("roleId")) id, err := pkg.StringToInt(c.Param("roleId"))
result, err := s.SetDeptLabel() result, err := s.SetDeptLabel()
if err != nil { if err != nil {
log.Errorf("SetDeptLabel error, %s", err.Error()) e.Logger.Errorf("SetDeptLabel error, %s", err.Error())
e.Error(http.StatusInternalServerError, err, "") e.Error(http.StatusInternalServerError, err, "")
} }
menuIds := make([]int, 0) menuIds := make([]int, 0)
if id != 0 { if id != 0 {
menuIds, err = s.GetRoleDeptId(id) menuIds, err = s.GetRoleDeptId(id)
if err != nil { if err != nil {
log.Errorf("抱歉未找到相关信息, %s", err.Error()) e.Logger.Errorf("抱歉未找到相关信息, %s", err.Error())
e.Error(http.StatusInternalServerError, err, "") e.Error(http.StatusInternalServerError, err, "")
} }
} }
+87 -133
View File
@@ -11,13 +11,13 @@ import (
"go-admin/app/admin/service" "go-admin/app/admin/service"
"go-admin/app/admin/service/dto" "go-admin/app/admin/service/dto"
common "go-admin/common/models"
) )
type SysDictData struct { type SysDictData struct {
api.Api api.Api
} }
// GetSysDictDataList
// @Summary 字典数据列表 // @Summary 字典数据列表
// @Description 获取JSON // @Description 获取JSON
// @Tags 字典数据 // @Tags 字典数据
@@ -30,39 +30,32 @@ type SysDictData struct {
// @Router /api/v1/dict/data [get] // @Router /api/v1/dict/data [get]
// @Security Bearer // @Security Bearer
func (e SysDictData) GetSysDictDataList(c *gin.Context) { func (e SysDictData) GetSysDictDataList(c *gin.Context) {
e.Context = c s := service.SysDictData{}
log := e.GetLogger() d := &dto.SysDictDataSearch{}
db, err := e.GetOrm() err := e.MakeContext(c).
MakeOrm().
Bind(d).
MakeService(&s.Service).
Errors
if err != nil { if err != nil {
log.Error(err) e.Error(http.StatusInternalServerError, err, err.Error())
return e.Logger.Error(err)
}
req := &dto.SysDictDataSearch{}
//查询列表
err = req.Bind(c)
if err != nil {
log.Warnf("Bind error: %s", err.Error())
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return return
} }
list := make([]models.SysDictData, 0) list := make([]models.SysDictData, 0)
var count int64 var count int64
s := service.SysDictData{} err = s.GetPage(d, &list, &count)
s.Log = log
s.Orm = db.Debug()
err = s.GetPage(req, &list, &count)
if err != nil { if err != nil {
log.Errorf("GetPage error, %s", err.Error()) e.Logger.Errorf("GetPage error, %s", err.Error())
e.Error(http.StatusInternalServerError, err, "查询失败") e.Error(http.StatusInternalServerError, err, "查询失败")
return return
} }
e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功") e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功")
} }
// GetSysDictData
// @Summary 通过编码获取字典数据 // @Summary 通过编码获取字典数据
// @Description 获取JSON // @Description 获取JSON
// @Tags 字典数据 // @Tags 字典数据
@@ -71,30 +64,24 @@ func (e SysDictData) GetSysDictDataList(c *gin.Context) {
// @Router /api/v1/dict/data/{dictCode} [get] // @Router /api/v1/dict/data/{dictCode} [get]
// @Security Bearer // @Security Bearer
func (e SysDictData) GetSysDictData(c *gin.Context) { func (e SysDictData) GetSysDictData(c *gin.Context) {
e.Context = c s := service.SysDictData{}
log := e.GetLogger() d := &dto.SysDictDataById{}
db, err := e.GetOrm() err := e.MakeContext(c).
MakeOrm().
Bind(d).
MakeService(&s.Service).
Errors
if err != nil { if err != nil {
log.Error(err) e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
return return
} }
//查看详情
req := &dto.SysDictDataById{}
err = req.Bind(c)
if err != nil {
log.Warnf("Bind error: %s", err.Error())
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
var object models.SysDictData var object models.SysDictData
s := service.SysDictData{} err = s.Get(d, &object)
s.Log = log
s.Orm = db
err = s.Get(req, &object)
if err != nil { if err != nil {
log.Warnf("Get error: %s", err.Error()) e.Logger.Warnf("Get error: %s", err.Error())
e.Error(http.StatusInternalServerError, err, "查询失败") e.Error(http.StatusInternalServerError, err, "查询失败")
return return
} }
@@ -102,6 +89,7 @@ func (e SysDictData) GetSysDictData(c *gin.Context) {
e.OK(object, "查看成功") e.OK(object, "查看成功")
} }
// InsertSysDictData
// @Summary 添加字典数据 // @Summary 添加字典数据
// @Description 获取JSON // @Description 获取JSON
// @Tags 字典数据 // @Tags 字典数据
@@ -113,39 +101,33 @@ func (e SysDictData) GetSysDictData(c *gin.Context) {
// @Router /api/v1/dict/data [post] // @Router /api/v1/dict/data [post]
// @Security Bearer // @Security Bearer
func (e SysDictData) InsertSysDictData(c *gin.Context) { func (e SysDictData) InsertSysDictData(c *gin.Context) {
e.Context = c
log := e.GetLogger()
db, err := e.GetOrm()
if err != nil {
log.Error(err)
return
}
//新增操作
req := &dto.SysDictDataControl{}
err = req.Bind(c)
if err != nil {
log.Warnf("Bind error: %s", err.Error())
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
object, _ := req.GenerateM()
// 设置创建人
object.SetCreateBy(user.GetUserId(c))
s := service.SysDictData{} s := service.SysDictData{}
s.Orm = db d := &dto.SysDictDataControl{}
s.Log = log err := e.MakeContext(c).
err = s.Insert(object.(*models.SysDictData)) MakeOrm().
Bind(d).
MakeService(&s.Service).
Errors
if err != nil { if err != nil {
log.Errorf("Insert error, %s", err) e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
return
}
// 设置创建人
d.SetCreateBy(user.GetUserId(c))
err = s.Insert(d)
if err != nil {
e.Logger.Errorf("Insert error, %s", err)
e.Error(http.StatusInternalServerError, err, "创建失败") e.Error(http.StatusInternalServerError, err, "创建失败")
return return
} }
e.OK(object.GetId(), "创建成功") e.OK(d.GetId(), "创建成功")
} }
// UpdateSysDictData
// @Summary 修改字典数据 // @Summary 修改字典数据
// @Description 获取JSON // @Description 获取JSON
// @Tags 字典数据 // @Tags 字典数据
@@ -157,37 +139,30 @@ func (e SysDictData) InsertSysDictData(c *gin.Context) {
// @Router /api/v1/dict/data/{dictCode} [put] // @Router /api/v1/dict/data/{dictCode} [put]
// @Security Bearer // @Security Bearer
func (e SysDictData) UpdateSysDictData(c *gin.Context) { func (e SysDictData) UpdateSysDictData(c *gin.Context) {
e.Context = c
log := e.GetLogger()
db, err := e.GetOrm()
if err != nil {
log.Error(err)
return
}
req := &dto.SysDictDataControl{}
//更新操作
err = req.Bind(c)
if err != nil {
log.Warnf("request validate error, %s", err.Error())
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
object, _ := req.GenerateM()
object.SetUpdateBy(user.GetUserId(c))
s := service.SysDictData{} s := service.SysDictData{}
s.Orm = db d := &dto.SysDictDataControl{}
s.Log = log err := e.MakeContext(c).
err = s.Update(object.(*models.SysDictData)) MakeOrm().
Bind(d).
MakeService(&s.Service).
Errors
if err != nil { if err != nil {
log.Errorf("Update error, %s", err) e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
return
}
d.SetUpdateBy(user.GetUserId(c))
err = s.Update(d)
if err != nil {
e.Logger.Errorf("Update error, %s", err)
e.Error(http.StatusInternalServerError, err, "更新失败") e.Error(http.StatusInternalServerError, err, "更新失败")
return return
} }
e.OK(object.GetId(), "更新成功") e.OK(d.GetId(), "更新成功")
} }
// DeleteSysDictData
// @Summary 删除字典数据 // @Summary 删除字典数据
// @Description 删除数据 // @Description 删除数据
// @Tags 字典数据 // @Tags 字典数据
@@ -196,71 +171,50 @@ func (e SysDictData) UpdateSysDictData(c *gin.Context) {
// @Success 200 {string} string "{"code": -1, "message": "删除失败"}" // @Success 200 {string} string "{"code": -1, "message": "删除失败"}"
// @Router /api/v1/dict/data/{dictCode} [delete] // @Router /api/v1/dict/data/{dictCode} [delete]
func (e SysDictData) DeleteSysDictData(c *gin.Context) { func (e SysDictData) DeleteSysDictData(c *gin.Context) {
e.Context = c s := service.SysDictData{}
log := e.GetLogger() d := new(dto.SysDictDataById)
db, err := e.GetOrm() err := e.MakeContext(c).
MakeOrm().
Bind(d).
MakeService(&s.Service).
Errors
if err != nil { if err != nil {
log.Error(err) e.Error(http.StatusInternalServerError, err, err.Error())
return e.Logger.Error(err)
}
//删除操作
req := new(dto.SysDictDataById)
err = req.Bind(c)
if err != nil {
log.Warnf("Bind error: %s", err)
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
var object common.ActiveRecord
object, err = req.GenerateM()
if err != nil {
log.Errorf("GenerateM error, %s", err.Error())
e.Error(http.StatusInternalServerError, err, "模型生成失败")
return return
} }
// 设置编辑人 // 设置编辑人
object.SetUpdateBy(user.GetUserId(c)) d.SetUpdateBy(user.GetUserId(c))
s := service.SysDictData{} err = s.Remove(d)
s.Orm = db
s.Log = log
err = s.Remove(req, object.(*models.SysDictData))
if err != nil { if err != nil {
log.Errorf("Remove error, %s", err) e.Logger.Errorf("Remove error, %s", err)
e.Error(http.StatusInternalServerError, err, "删除失败") e.Error(http.StatusInternalServerError, err, "删除失败")
return return
} }
e.OK(object.GetId(), "删除成功") e.OK(d.GetId(), "删除成功")
} }
func (e SysDictData) GetSysDictDataAll(c *gin.Context) { func (e SysDictData) GetSysDictDataAll(c *gin.Context) {
e.Context = c s := service.SysDictData{}
log := e.GetLogger() d := &dto.SysDictDataSearch{}
db, err := e.GetOrm() err := e.MakeContext(c).
MakeOrm().
Bind(d).
MakeService(&s.Service).
Errors
if err != nil { if err != nil {
log.Error(err) e.Error(http.StatusInternalServerError, err, err.Error())
return e.Logger.Error(err)
}
req := &dto.SysDictDataSearch{}
//查询列表
err = req.Bind(c)
if err != nil {
log.Warnf("Bind error: %s", err)
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return return
} }
list := make([]models.SysDictData, 0) list := make([]models.SysDictData, 0)
s := service.SysDictData{}
s.Log = log err = s.GetAll(d, &list)
s.Orm = db
err = s.GetAll(req, &list)
if err != nil { if err != nil {
log.Errorf("GetAll error, %s", err.Error()) e.Logger.Errorf("GetAll error, %s", err.Error())
e.Error(http.StatusInternalServerError, err, "查询失败") e.Error(http.StatusInternalServerError, err, "查询失败")
return return
} }
+90 -132
View File
@@ -11,13 +11,13 @@ import (
"go-admin/app/admin/service" "go-admin/app/admin/service"
"go-admin/app/admin/service/dto" "go-admin/app/admin/service/dto"
common "go-admin/common/models"
) )
type SysDictType struct { type SysDictType struct {
api.Api api.Api
} }
// GetSysDictTypeList 字典类型列表数据
// @Summary 字典类型列表数据 // @Summary 字典类型列表数据
// @Description 获取JSON // @Description 获取JSON
// @Tags 字典类型 // @Tags 字典类型
@@ -30,38 +30,33 @@ type SysDictType struct {
// @Router /api/v1/dict/type [get] // @Router /api/v1/dict/type [get]
// @Security Bearer // @Security Bearer
func (e SysDictType) GetSysDictTypeList(c *gin.Context) { func (e SysDictType) GetSysDictTypeList(c *gin.Context) {
e.Context = c s := service.SysDictType{}
log := e.GetLogger() d := &dto.SysDictTypeSearch{}
db, err := e.GetOrm() err := e.MakeContext(c).
MakeOrm().
Bind(d).
MakeService(&s.Service).
Errors
if err != nil { if err != nil {
log.Error(err) e.Error(http.StatusInternalServerError, err, err.Error())
return e.Logger.Error(err)
}
req := &dto.SysDictTypeSearch{}
//查询列表
err = req.Bind(c)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return return
} }
list := make([]models.SysDictType, 0) list := make([]models.SysDictType, 0)
var count int64 var count int64
s := service.SysDictType{}
s.Log = log err = s.GetPage(d, &list, &count)
s.Orm = db.Debug()
err = s.GetPage(req, &list, &count)
if err != nil { if err != nil {
e.Error(http.StatusInternalServerError, err, "查询失败") e.Error(http.StatusInternalServerError, err, "查询失败")
return return
} }
e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功") e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功")
} }
// @Summary 通过字典id获取字典类型 // GetSysDictType 字典类型通过字典id获取
// @Summary 字典类型通过字典id获取
// @Description 获取JSON // @Description 获取JSON
// @Tags 字典类型 // @Tags 字典类型
// @Param dictId path int true "字典类型编码" // @Param dictId path int true "字典类型编码"
@@ -69,27 +64,20 @@ func (e SysDictType) GetSysDictTypeList(c *gin.Context) {
// @Router /api/v1/dict/type/{dictId} [get] // @Router /api/v1/dict/type/{dictId} [get]
// @Security Bearer // @Security Bearer
func (e SysDictType) GetSysDictType(c *gin.Context) { func (e SysDictType) GetSysDictType(c *gin.Context) {
e.Context = c s := service.SysDictType{}
log := e.GetLogger() d := &dto.SysDictTypeById{}
db, err := e.GetOrm() err := e.MakeContext(c).
MakeOrm().
Bind(d).
MakeService(&s.Service).
Errors
if err != nil { if err != nil {
log.Error(err) e.Error(http.StatusInternalServerError, err, err.Error())
return e.Logger.Error(err)
}
//查看详情
req := &dto.SysDictTypeById{}
err = req.Bind(c)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return return
} }
var object models.SysDictType var object models.SysDictType
err = s.Get(d, &object)
s := service.SysDictType{}
s.Log = log
s.Orm = db
err = s.Get(req, &object)
if err != nil { if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "查询失败") e.Error(http.StatusUnprocessableEntity, err, "查询失败")
return return
@@ -98,6 +86,7 @@ func (e SysDictType) GetSysDictType(c *gin.Context) {
e.OK(object, "查看成功") e.OK(object, "查看成功")
} }
//InsertSysDictType 字典类型创建
// @Summary 添加字典类型 // @Summary 添加字典类型
// @Description 获取JSON // @Description 获取JSON
// @Tags 字典类型 // @Tags 字典类型
@@ -109,38 +98,32 @@ func (e SysDictType) GetSysDictType(c *gin.Context) {
// @Router /api/v1/dict/type [post] // @Router /api/v1/dict/type [post]
// @Security Bearer // @Security Bearer
func (e SysDictType) InsertSysDictType(c *gin.Context) { func (e SysDictType) InsertSysDictType(c *gin.Context) {
e.Context = c
log := e.GetLogger()
db, err := e.GetOrm()
if err != nil {
log.Error(err)
return
}
//新增操作
req := &dto.SysDictTypeControl{}
err = req.Bind(c)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
object, _ := req.GenerateM()
// 设置创建人
object.SetCreateBy(user.GetUserId(c))
s := service.SysDictType{} s := service.SysDictType{}
s.Orm = db d := &dto.SysDictTypeControl{}
s.Log = log err := e.MakeContext(c).
err = s.Insert(object.(*models.SysDictType)) MakeOrm().
Bind(d).
MakeService(&s.Service).
Errors
if err != nil { if err != nil {
log.Error(err) e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
return
}
d.SetCreateBy(user.GetUserId(c))
err = s.Insert(d)
if err != nil {
e.Logger.Error(err)
e.Error(http.StatusInternalServerError, err, "创建失败") e.Error(http.StatusInternalServerError, err, "创建失败")
return return
} }
e.OK(object.GetId(), "创建成功") e.OK(d.GetId(), "创建成功")
} }
// UpdateSysDictType
// @Summary 修改字典类型 // @Summary 修改字典类型
// @Description 获取JSON // @Description 获取JSON
// @Tags 字典类型 // @Tags 字典类型
@@ -152,35 +135,30 @@ func (e SysDictType) InsertSysDictType(c *gin.Context) {
// @Router /api/v1/dict/type/{dictId} [put] // @Router /api/v1/dict/type/{dictId} [put]
// @Security Bearer // @Security Bearer
func (e SysDictType) UpdateSysDictType(c *gin.Context) { func (e SysDictType) UpdateSysDictType(c *gin.Context) {
e.Context = c
log := e.GetLogger()
db, err := e.GetOrm()
if err != nil {
log.Error(err)
return
}
req := &dto.SysDictTypeControl{}
//更新操作
err = req.Bind(c)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
object, _ := req.GenerateM()
object.SetUpdateBy(user.GetUserId(c))
s := service.SysDictType{} s := service.SysDictType{}
s.Orm = db d := &dto.SysDictTypeControl{}
s.Log = log err := e.MakeContext(c).
err = s.Update(object.(*models.SysDictType)) MakeOrm().
Bind(d).
MakeService(&s.Service).
Errors
if err != nil { if err != nil {
log.Error(err) e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
return return
} }
e.OK(object.GetId(), "更新成功")
d.SetUpdateBy(user.GetUserId(c))
err = s.Update(d)
if err != nil {
e.Logger.Error(err)
return
}
e.OK(d.GetId(), "更新成功")
} }
// DeleteSysDictType
// @Summary 删除字典类型 // @Summary 删除字典类型
// @Description 删除数据 // @Description 删除数据
// @Tags 字典类型 // @Tags 字典类型
@@ -189,43 +167,29 @@ func (e SysDictType) UpdateSysDictType(c *gin.Context) {
// @Success 200 {string} string "{"code": -1, "message": "删除失败"}" // @Success 200 {string} string "{"code": -1, "message": "删除失败"}"
// @Router /api/v1/dict/type/{dictId} [delete] // @Router /api/v1/dict/type/{dictId} [delete]
func (e SysDictType) DeleteSysDictType(c *gin.Context) { func (e SysDictType) DeleteSysDictType(c *gin.Context) {
e.Context = c
log := e.GetLogger()
db, err := e.GetOrm()
if err != nil {
log.Error(err)
return
}
//删除操作
req := new(dto.SysDictTypeById)
err = req.Bind(c)
if err != nil {
log.Errorf("Bind error: %s", err)
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
var object common.ActiveRecord
object, err = req.GenerateM()
if err != nil {
e.Error(http.StatusInternalServerError, err, "模型生成失败")
return
}
// 设置编辑人
object.SetUpdateBy(user.GetUserId(c))
s := service.SysDictType{} s := service.SysDictType{}
s.Orm = db d := new(dto.SysDictTypeById)
s.Log = log err := e.MakeContext(c).
err = s.Remove(req, object.(*models.SysDictType)) MakeOrm().
Bind(d).
MakeService(&s.Service).
Errors
if err != nil { if err != nil {
log.Error(err) e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
return return
} }
e.OK(object.GetId(), "删除成功") // 设置编辑人
d.SetUpdateBy(user.GetUserId(c))
err = s.Remove(d)
if err != nil {
e.Logger.Error(err)
return
}
e.OK(d.GetId(), "删除成功")
} }
// GetSysDictTypeAll
// @Summary 字典类型全部数据 // @Summary 字典类型全部数据
// @Description 获取JSON // @Description 获取JSON
// @Tags 字典类型 // @Tags 字典类型
@@ -236,28 +200,22 @@ func (e SysDictType) DeleteSysDictType(c *gin.Context) {
// @Router /api/v1/dict/type-option-select [get] // @Router /api/v1/dict/type-option-select [get]
// @Security Bearer // @Security Bearer
func (e SysDictType) GetSysDictTypeAll(c *gin.Context) { func (e SysDictType) GetSysDictTypeAll(c *gin.Context) {
e.Context = c s := service.SysDictType{}
log := e.GetLogger() d := &dto.SysDictTypeSearch{}
db, err := e.GetOrm() err := e.MakeContext(c).
MakeOrm().
Bind(d).
MakeService(&s.Service).
Errors
if err != nil { if err != nil {
log.Error(err) e.Error(http.StatusInternalServerError, err, err.Error())
return e.Logger.Error(err)
}
req := &dto.SysDictTypeSearch{}
//查询列表
err = req.Bind(c)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return return
} }
list := make([]models.SysDictType, 0) list := make([]models.SysDictType, 0)
s := service.SysDictType{}
s.Log = log err = s.GetAll(d, &list)
s.Orm = db
err = s.GetAll(req, &list)
if err != nil { if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "查询失败") e.Error(http.StatusUnprocessableEntity, err, "查询失败")
return return
+70 -70
View File
@@ -77,77 +77,77 @@ func (e SysLoginLog) GetSysLoginLog(c *gin.Context) {
e.OK(object, "查看成功") e.OK(object, "查看成功")
} }
func (e SysLoginLog) InsertSysLoginLog(c *gin.Context) { //func (e SysLoginLog) InsertSysLoginLog(c *gin.Context) {
e.Context = c // e.Context = c
log := e.GetLogger() // log := e.GetLogger()
control := new(dto.SysLoginLogControl) // control := new(dto.SysLoginLogControl)
db, err := e.GetOrm() // db, err := e.GetOrm()
if err != nil { // if err != nil {
log.Error(err) // log.Error(err)
return // return
} // }
//
// //新增操作
// err = control.Bind(c)
// if err != nil {
// e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
// return
// }
// object, err := control.Generate()
// if err != nil {
// e.Error(http.StatusInternalServerError, err, "模型生成失败")
// return
// }
// // 设置创建人
// object.SetCreateBy(user.GetUserId(c))
//
// serviceSysLoginLog := service.SysLoginLog{}
// serviceSysLoginLog.Orm = db
// serviceSysLoginLog.Log = log
// err = serviceSysLoginLog.InsertSysLoginLog(object)
// if err != nil {
// log.Errorf("InsertSysLoginLog error, %s", err)
// e.Error(http.StatusInternalServerError, err, "创建失败")
// return
// }
//
// e.OK(object.GetId(), "创建成功")
//}
//新增操作 //func (e SysLoginLog) UpdateSysLoginLog(c *gin.Context) {
err = control.Bind(c) // e.Context = c
if err != nil { // log := e.GetLogger()
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") // control := new(dto.SysLoginLogControl)
return // db, err := e.GetOrm()
} // if err != nil {
object, err := control.Generate() // log.Error(err)
if err != nil { // return
e.Error(http.StatusInternalServerError, err, "模型生成失败") // }
return //
} // //更新操作
// 设置创建人 // err = control.Bind(c)
object.SetCreateBy(user.GetUserId(c)) // if err != nil {
// e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
serviceSysLoginLog := service.SysLoginLog{} // return
serviceSysLoginLog.Orm = db // }
serviceSysLoginLog.Log = log // object, err := control.Generate()
err = serviceSysLoginLog.InsertSysLoginLog(object) // if err != nil {
if err != nil { // e.Error(http.StatusInternalServerError, err, "模型生成失败")
log.Errorf("InsertSysLoginLog error, %s", err) // return
e.Error(http.StatusInternalServerError, err, "创建失败") // }
return // object.SetUpdateBy(user.GetUserId(c))
} //
// serviceSysLoginLog := service.SysLoginLog{}
e.OK(object.GetId(), "创建成功") // serviceSysLoginLog.Orm = db
} // serviceSysLoginLog.Log = log
// err = serviceSysLoginLog.UpdateSysLoginLog(object)
func (e SysLoginLog) UpdateSysLoginLog(c *gin.Context) { // if err != nil {
e.Context = c // log.Errorf("UpdateSysLoginLog error, %s", err)
log := e.GetLogger() // e.Error(http.StatusInternalServerError, err, "更新失败")
control := new(dto.SysLoginLogControl) // return
db, err := e.GetOrm() // }
if err != nil { // e.OK(object.GetId(), "更新成功")
log.Error(err) //}
return
}
//更新操作
err = control.Bind(c)
if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
object, err := control.Generate()
if err != nil {
e.Error(http.StatusInternalServerError, err, "模型生成失败")
return
}
object.SetUpdateBy(user.GetUserId(c))
serviceSysLoginLog := service.SysLoginLog{}
serviceSysLoginLog.Orm = db
serviceSysLoginLog.Log = log
err = serviceSysLoginLog.UpdateSysLoginLog(object)
if err != nil {
log.Errorf("UpdateSysLoginLog error, %s", err)
e.Error(http.StatusInternalServerError, err, "更新失败")
return
}
e.OK(object.GetId(), "更新成功")
}
func (e SysLoginLog) DeleteSysLoginLog(c *gin.Context) { func (e SysLoginLog) DeleteSysLoginLog(c *gin.Context) {
e.Context = c e.Context = c
+15 -19
View File
@@ -1,6 +1,7 @@
package apis package apis
import ( import (
"github.com/gin-gonic/gin/binding"
"go-admin/app/admin/models" "go-admin/app/admin/models"
"net/http" "net/http"
@@ -26,27 +27,22 @@ type SysMenu struct {
// @Router /api/v1/menulist [get] // @Router /api/v1/menulist [get]
// @Security Bearer // @Security Bearer
func (e SysMenu) GetSysMenuList(c *gin.Context) { func (e SysMenu) GetSysMenuList(c *gin.Context) {
e.Context = c
log := e.GetLogger()
d := new(dto.SysMenuSearch)
db, err := e.GetOrm()
if err != nil {
log.Error(err)
return
}
//查询列表 s := service.SysMenu{}
err = d.Bind(c) d := new(dto.SysMenuSearch)
err := e.MakeContext(c).
MakeOrm().
Bind(d, binding.Form).
MakeService(&s.Service).
Errors
if err != nil { if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") e.Error(http.StatusInternalServerError, err, err.Error())
e.Logger.Error(err)
return return
} }
var list *[]models.SysMenu var list *[]models.SysMenu
serviceSysMenu := service.SysMenu{} list, err = s.GetSysMenuPage(d)
serviceSysMenu.Log = log
serviceSysMenu.Orm = db
list, err = serviceSysMenu.GetSysMenuPage(d)
if err != nil { if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "查询失败") e.Error(http.StatusUnprocessableEntity, err, "查询失败")
return return
@@ -69,7 +65,7 @@ func (e SysMenu) GetSysMenu(c *gin.Context) {
s := new(service.SysMenu) s := new(service.SysMenu)
err := e.MakeContext(c). err := e.MakeContext(c).
MakeOrm(). MakeOrm().
Bind(control, nil). Bind(control).
MakeService(&s.Service). MakeService(&s.Service).
Errors Errors
if err != nil { if err != nil {
@@ -109,7 +105,7 @@ func (e SysMenu) InsertSysMenu(c *gin.Context) {
s := new(service.SysMenu) s := new(service.SysMenu)
err := e.MakeContext(c). err := e.MakeContext(c).
MakeOrm(). MakeOrm().
Bind(control). Bind(control, binding.JSON).
MakeService(&s.Service). MakeService(&s.Service).
Errors Errors
if err != nil { if err != nil {
@@ -145,7 +141,7 @@ func (e SysMenu) UpdateSysMenu(c *gin.Context) {
s := new(service.SysMenu) s := new(service.SysMenu)
err := e.MakeContext(c). err := e.MakeContext(c).
MakeOrm(). MakeOrm().
Bind(control). Bind(control, binding.JSON).
MakeService(&s.Service). MakeService(&s.Service).
Errors Errors
if err != nil { if err != nil {
@@ -175,7 +171,7 @@ func (e SysMenu) DeleteSysMenu(c *gin.Context) {
s := new(service.SysMenu) s := new(service.SysMenu)
err := e.MakeContext(c). err := e.MakeContext(c).
MakeOrm(). MakeOrm().
Bind(control). Bind(control, binding.JSON).
MakeService(&s.Service). MakeService(&s.Service).
Errors Errors
if err != nil { if err != nil {
+71 -70
View File
@@ -6,8 +6,6 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api" "github.com/go-admin-team/go-admin-core/sdk/api"
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
"go-admin/app/admin/service" "go-admin/app/admin/service"
"go-admin/app/admin/service/dto" "go-admin/app/admin/service/dto"
) )
@@ -16,6 +14,7 @@ type SysOperaLog struct {
api.Api api.Api
} }
// GetSysOperaLogList 操作日志列表
func (e SysOperaLog) GetSysOperaLogList(c *gin.Context) { func (e SysOperaLog) GetSysOperaLogList(c *gin.Context) {
e.Context = c e.Context = c
log := e.GetLogger() log := e.GetLogger()
@@ -47,6 +46,7 @@ func (e SysOperaLog) GetSysOperaLogList(c *gin.Context) {
e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功") e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功")
} }
// GetSysOperaLog 操作日志通过id获取
func (e SysOperaLog) GetSysOperaLog(c *gin.Context) { func (e SysOperaLog) GetSysOperaLog(c *gin.Context) {
e.Context = c e.Context = c
log := e.GetLogger() log := e.GetLogger()
@@ -77,76 +77,77 @@ func (e SysOperaLog) GetSysOperaLog(c *gin.Context) {
e.OK(object, "查看成功") e.OK(object, "查看成功")
} }
func (e SysOperaLog) InsertSysOperaLog(c *gin.Context) {
e.Context = c
log := e.GetLogger()
control := new(dto.SysOperaLogControl)
db, err := e.GetOrm()
if err != nil {
log.Error(err)
return
}
//新增操作 //func (e SysOperaLog) InsertSysOperaLog(c *gin.Context) {
err = control.Bind(c) // e.Context = c
if err != nil { // log := e.GetLogger()
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") // control := new(dto.SysOperaLogControl)
return // db, err := e.GetOrm()
} // if err != nil {
object, err := control.Generate() // log.Error(err)
if err != nil { // return
e.Error(http.StatusInternalServerError, err, "模型生成失败") // }
return //
} // //新增操作
// 设置创建人 // err = control.Bind(c)
object.SetCreateBy(user.GetUserId(c)) // if err != nil {
// e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
// return
// }
// object, err := control.Generate()
// if err != nil {
// e.Error(http.StatusInternalServerError, err, "模型生成失败")
// return
// }
// // 设置创建人
// object.SetCreateBy(user.GetUserId(c))
//
// serviceSysOperaLog := service.SysOperaLog{}
// serviceSysOperaLog.Orm = db
// serviceSysOperaLog.Log = log
// err = serviceSysOperaLog.InsertSysOperaLog(object)
// if err != nil {
// log.Error(err)
// e.Error(http.StatusInternalServerError, err, "创建失败")
// return
// }
//
// e.OK(object.GetId(), "创建成功")
//}
serviceSysOperaLog := service.SysOperaLog{} //func (e SysOperaLog) UpdateSysOperaLog(c *gin.Context) {
serviceSysOperaLog.Orm = db // e.Context = c
serviceSysOperaLog.Log = log // log := e.GetLogger()
err = serviceSysOperaLog.InsertSysOperaLog(object) // control := new(dto.SysOperaLogControl)
if err != nil { // db, err := e.GetOrm()
log.Error(err) // if err != nil {
e.Error(http.StatusInternalServerError, err, "创建失败") // log.Error(err)
return // return
} // }
//
e.OK(object.GetId(), "创建成功") // //更新操作
} // err = control.Bind(c)
// if err != nil {
func (e SysOperaLog) UpdateSysOperaLog(c *gin.Context) { // e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
e.Context = c // return
log := e.GetLogger() // }
control := new(dto.SysOperaLogControl) // object, err := control.Generate()
db, err := e.GetOrm() // if err != nil {
if err != nil { // e.Error(http.StatusInternalServerError, err, "模型生成失败")
log.Error(err) // return
return // }
} // object.SetUpdateBy(user.GetUserId(c))
//
//更新操作 // serviceSysOperaLog := service.SysOperaLog{}
err = control.Bind(c) // serviceSysOperaLog.Orm = db
if err != nil { // serviceSysOperaLog.Log = log
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") // err = serviceSysOperaLog.UpdateSysOperaLog(object)
return // if err != nil {
} // log.Error(err)
object, err := control.Generate() // return
if err != nil { // }
e.Error(http.StatusInternalServerError, err, "模型生成失败") // e.OK(object.GetId(), "更新成功")
return //}
}
object.SetUpdateBy(user.GetUserId(c))
serviceSysOperaLog := service.SysOperaLog{}
serviceSysOperaLog.Orm = db
serviceSysOperaLog.Log = log
err = serviceSysOperaLog.UpdateSysOperaLog(object)
if err != nil {
log.Error(err)
return
}
e.OK(object.GetId(), "更新成功")
}
func (e SysOperaLog) DeleteSysOperaLog(c *gin.Context) { func (e SysOperaLog) DeleteSysOperaLog(c *gin.Context) {
e.Context = c e.Context = c
+2
View File
@@ -55,6 +55,7 @@ func SaveSysApi(message storage.Messager) (err error) {
dbList := sdk.Runtime.GetDb() dbList := sdk.Runtime.GetDb()
for _, d := range dbList { for _, d := range dbList {
for _, v := range l.List { for _, v := range l.List {
if v.HttpMethod != "HEAD" {
err := d.Debug().Where(SysApi{Path: v.RelativePath, Action: v.HttpMethod}). err := d.Debug().Where(SysApi{Path: v.RelativePath, Action: v.HttpMethod}).
Attrs(SysApi{Handle: v.Handler}). Attrs(SysApi{Handle: v.Handler}).
FirstOrCreate(&SysApi{}).Error FirstOrCreate(&SysApi{}).Error
@@ -64,5 +65,6 @@ func SaveSysApi(message storage.Messager) (err error) {
} }
} }
} }
}
return nil return nil
} }
-2
View File
@@ -19,8 +19,6 @@ func registerSysLoginLogRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMi
{ {
r.GET("", api.GetSysLoginLogList) r.GET("", api.GetSysLoginLogList)
r.GET("/:id", api.GetSysLoginLog) r.GET("/:id", api.GetSysLoginLog)
r.POST("", api.InsertSysLoginLog)
r.PUT("/:id", api.UpdateSysLoginLog)
r.DELETE("", api.DeleteSysLoginLog) r.DELETE("", api.DeleteSysLoginLog)
} }
} }
-2
View File
@@ -18,8 +18,6 @@ func registerSysOperaLogRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMi
{ {
r.GET("", api.GetSysOperaLogList) r.GET("", api.GetSysOperaLogList)
r.GET("/:id", api.GetSysOperaLog) r.GET("/:id", api.GetSysOperaLog)
r.POST("", api.InsertSysOperaLog)
r.PUT("/:id", api.UpdateSysOperaLog)
r.DELETE("", api.DeleteSysOperaLog) r.DELETE("", api.DeleteSysOperaLog)
} }
} }
+23 -61
View File
@@ -1,12 +1,6 @@
package dto package dto
import ( import (
"encoding/json"
"github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding"
"github.com/go-admin-team/go-admin-core/sdk/api"
"go-admin/app/admin/models" "go-admin/app/admin/models"
"go-admin/common/dto" "go-admin/common/dto"
common "go-admin/common/models" common "go-admin/common/models"
@@ -15,10 +9,10 @@ import (
// SysConfigSearch 列表或者搜索使用结构体 // SysConfigSearch 列表或者搜索使用结构体
type SysConfigSearch struct { type SysConfigSearch struct {
dto.Pagination `search:"-"` dto.Pagination `search:"-"`
ConfigName string `form:"configName" search:"type:contains;column:config_name;table:sys_config" comment:""` ConfigName string `form:"configName" search:"type:contains;column:config_name;table:sys_config"`
ConfigKey string `form:"configKey" search:"type:contains;column:config_key;table:sys_config" comment:""` ConfigKey string `form:"configKey" search:"type:contains;column:config_key;table:sys_config"`
ConfigType string `form:"configType" search:"type:exact;column:config_type;table:sys_config" comment:""` ConfigType string `form:"configType" search:"type:exact;column:config_type;table:sys_config"`
IsFrontend int `json:"isFrontend" search:"type:exact;column:is_frontend;table:sys_config" comment:""` IsFrontend int `form:"isFrontend" search:"type:exact;column:is_frontend;table:sys_config"`
} }
func (m *SysConfigSearch) GetNeedSearch() interface{} { func (m *SysConfigSearch) GetNeedSearch() interface{} {
@@ -27,58 +21,40 @@ func (m *SysConfigSearch) GetNeedSearch() interface{} {
// SysConfigControl 增、改使用的结构体 // SysConfigControl 增、改使用的结构体
type SysConfigControl struct { type SysConfigControl struct {
ID int `uri:"Id" comment:"编码"` // 编码 Id int `uri:"Id" comment:"编码"` // 编码
ConfigName string `json:"configName" comment:""` ConfigName string `json:"configName" comment:""`
ConfigKey string `uri:"configKey" json:"configKey" comment:""` ConfigKey string `uri:"configKey" json:"configKey" comment:""`
ConfigValue string `json:"configValue" comment:""` ConfigValue string `json:"configValue" comment:""`
ConfigType string `json:"configType" comment:""` ConfigType string `json:"configType" comment:""`
IsFrontend int `json:"isFrontend"` IsFrontend int `json:"isFrontend"`
Remark string `json:"remark" comment:""` Remark string `json:"remark" comment:""`
} common.ControlBy
// Bind 映射上下文中的结构体数据
func (s *SysConfigControl) Bind(ctx *gin.Context) error {
log := api.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBindBodyWith(s, binding.JSON)
if err != nil {
log.Debugf("ShouldBind error: %s", err.Error())
}
var jsonStr []byte
jsonStr, err = json.Marshal(s)
if err != nil {
log.Debugf("ShouldBind error: %s", err.Error())
}
ctx.Set("body", string(jsonStr))
return err
} }
// Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型 // Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型
func (s *SysConfigControl) Generate() (*models.SysConfig, error) { func (s *SysConfigControl) Generate(model *models.SysConfig) {
return &models.SysConfig{ if s.Id == 0 {
Model: common.Model{Id: s.ID}, model.Model = common.Model{Id: s.Id}
ConfigName: s.ConfigName, }
ConfigKey: s.ConfigKey, model.ConfigName = s.ConfigName
ConfigValue: s.ConfigValue, model.ConfigKey = s.ConfigKey
ConfigType: s.ConfigType, model.ConfigValue = s.ConfigValue
IsFrontend: s.IsFrontend, model.ConfigType = s.ConfigType
Remark: s.Remark, model.IsFrontend = s.IsFrontend
}, nil model.Remark = s.Remark
} }
// GetId 获取数据对应的ID // GetId 获取数据对应的ID
func (s *SysConfigControl) GetId() interface{} { func (s *SysConfigControl) GetId() interface{} {
return s.ID return s.Id
} }
// SysConfigById 获取单个或者删除的结构体 // SysConfigById 获取单个或者删除的结构体
type SysConfigById struct { type SysConfigById struct {
Id int `uri:"id"` Id int `uri:"id"`
Ids []int `json:"ids"` Ids []int `json:"ids"`
common.ControlBy
} }
func (s *SysConfigById) Generate() *SysConfigById { func (s *SysConfigById) Generate() *SysConfigById {
@@ -87,23 +63,9 @@ func (s *SysConfigById) Generate() *SysConfigById {
} }
func (s *SysConfigById) GetId() interface{} { func (s *SysConfigById) GetId() interface{} {
if len(s.Ids) > 0 {
s.Ids = append(s.Ids, s.Id)
return s.Ids
}
return s.Id return s.Id
} }
func (s *SysConfigById) Bind(ctx *gin.Context) error {
log := api.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBind(s)
if err != nil {
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
func (s *SysConfigById) GenerateM() (*models.SysConfig, error) {
return &models.SysConfig{}, nil
}
+26 -48
View File
@@ -1,11 +1,10 @@
package dto package dto
import ( import (
"encoding/json"
"go-admin/app/admin/models" "go-admin/app/admin/models"
common "go-admin/common/models"
"github.com/gin-gonic/gin" "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/api"
"go-admin/common/dto" "go-admin/common/dto"
@@ -39,7 +38,7 @@ func (m *SysDeptSearch) Bind(ctx *gin.Context) error {
return err return err
} }
// SysConfigControl 增、改使用的结构体 // SysDeptControl 增、改使用的结构体
type SysDeptControl struct { type SysDeptControl struct {
DeptId int `uri:"id" comment:"编码"` // 编码 DeptId int `uri:"id" comment:"编码"` // 编码
ParentId int `form:"parentId" comment:"上级部门"` //上级部门 ParentId int `form:"parentId" comment:"上级部门"` //上级部门
@@ -50,42 +49,30 @@ type SysDeptControl struct {
Phone string `form:"phone" comment:"手机"` //手机 Phone string `form:"phone" comment:"手机"` //手机
Email string `form:"email" comment:"邮箱"` //邮箱 Email string `form:"email" comment:"邮箱"` //邮箱
Status string `form:"status" comment:"状态"` //状态 Status string `form:"status" comment:"状态"` //状态
common.ControlBy
} }
// Bind 映射上下文中的结构体数据 func (s *SysDeptControl) SetCreateBy(id int) {
func (s *SysDeptControl) Bind(ctx *gin.Context) error { s.CreateBy = id
log := api.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBindBodyWith(s, binding.JSON)
if err != nil {
log.Debugf("ShouldBind error: %s", err.Error())
}
var jsonStr []byte
jsonStr, err = json.Marshal(s)
if err != nil {
log.Debugf("ShouldBind error: %s", err.Error())
}
ctx.Set("body", string(jsonStr))
return err
} }
// Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型 func (s *SysDeptControl) SetUpdateBy(id int) {
func (s *SysDeptControl) Generate() (*models.SysDept, error) { s.UpdateBy = id
return &models.SysDept{ }
DeptId: s.DeptId,
DeptName: s.DeptName, // Generate 结构体数据转化 从 SysDeptControl 至 SysDept 对应的模型
ParentId: s.ParentId, func (s *SysDeptControl) Generate(model *models.SysDept) {
DeptPath: s.DeptPath, if s.DeptId != 0 {
Sort: s.Sort, model.DeptId = s.DeptId
Leader: s.Leader, }
Phone: s.Phone, model.DeptName = s.DeptName
Email: s.Email, model.ParentId = s.ParentId
Status: s.Status, model.DeptPath = s.DeptPath
}, nil model.Sort = s.Sort
model.Leader = s.Leader
model.Phone = s.Phone
model.Email = s.Email
model.Status = s.Status
} }
// GetId 获取数据对应的ID // GetId 获取数据对应的ID
@@ -105,22 +92,13 @@ func (s *SysDeptById) Generate() *SysDeptById {
} }
func (s *SysDeptById) GetId() interface{} { func (s *SysDeptById) GetId() interface{} {
if len(s.Ids) > 0 {
s.Ids = append(s.Ids, s.Id)
return s.Ids
}
return s.Id return s.Id
} }
func (s *SysDeptById) Bind(ctx *gin.Context) error {
log := api.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBind(s)
if err != nil {
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
func (s *SysDeptById) GenerateM() (*models.SysDept, error) { func (s *SysDeptById) GenerateM() (*models.SysDept, error) {
return &models.SysDept{}, nil return &models.SysDept{}, nil
+15 -32
View File
@@ -50,41 +50,22 @@ type SysDictDataControl struct {
Status string `json:"status" comment:""` Status string `json:"status" comment:""`
Default string `json:"default" comment:""` Default string `json:"default" comment:""`
Remark string `json:"remark" comment:""` Remark string `json:"remark" comment:""`
common.ControlBy
} }
func (s *SysDictDataControl) Bind(ctx *gin.Context) error { func (s *SysDictDataControl) Generate(model *models.SysDictData) {
log := api.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBind(s)
if err != nil {
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
func (s *SysDictDataControl) Generate() dto.Control { model.DictCode = s.Id
cp := *s model.DictSort = s.DictSort
return &cp model.DictLabel = s.DictLabel
} model.DictValue = s.DictValue
model.DictType = s.DictType
func (s *SysDictDataControl) GenerateM() (common.ActiveRecord, error) { model.CssClass = s.CssClass
return &models.SysDictData{ model.ListClass = s.ListClass
DictCode: s.Id, model.IsDefault = s.IsDefault
DictSort: s.DictSort, model.Status = s.Status
DictLabel: s.DictLabel, model.Default = s.Default
DictValue: s.DictValue, model.Remark = s.Remark
DictType: s.DictType,
CssClass: s.CssClass,
ListClass: s.ListClass,
IsDefault: s.IsDefault,
Status: s.Status,
Default: s.Default,
Remark: s.Remark,
}, nil
} }
func (s *SysDictDataControl) GetId() interface{} { func (s *SysDictDataControl) GetId() interface{} {
@@ -94,6 +75,7 @@ func (s *SysDictDataControl) GetId() interface{} {
type SysDictDataById struct { type SysDictDataById struct {
Id int `uri:"dictCode"` Id int `uri:"dictCode"`
Ids []int `json:"ids"` Ids []int `json:"ids"`
common.ControlBy
} }
func (s *SysDictDataById) Bind(ctx *gin.Context) error { func (s *SysDictDataById) Bind(ctx *gin.Context) error {
@@ -111,6 +93,7 @@ func (s *SysDictDataById) Bind(ctx *gin.Context) error {
func (s *SysDictDataById) GetId() interface{} { func (s *SysDictDataById) GetId() interface{} {
if len(s.Ids) > 0 { if len(s.Ids) > 0 {
s.Ids = append(s.Ids, s.Id)
return s.Ids return s.Ids
} }
return s.Id return s.Id
+22 -35
View File
@@ -36,45 +36,23 @@ func (m *SysDictTypeSearch) Generate() dto.Index {
} }
type SysDictTypeControl struct { type SysDictTypeControl struct {
Id int `uri:"id" comment:""` // Id int `uri:"id"`
DictName string `json:"dictName"`
DictName string `json:"dictName" comment:""` DictType string `json:"dictType"`
Status string `json:"status"`
DictType string `json:"dictType" comment:""` Remark string `json:"remark"`
common.ControlBy
Status string `json:"status" comment:""`
Remark string `json:"remark" comment:""`
} }
func (s *SysDictTypeControl) Bind(ctx *gin.Context) error { func (s *SysDictTypeControl) Generate(model *models.SysDictType) {
log := api.GetRequestLogger(ctx) if s.Id != 0 {
err := ctx.ShouldBindUri(s) model.ID = s.Id
if err != nil {
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBind(s)
if err != nil {
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
} }
model.DictName = s.DictName
model.DictType = s.DictType
model.Status = s.Status
model.Remark = s.Remark
func (s *SysDictTypeControl) Generate() dto.Control {
cp := *s
return &cp
}
func (s *SysDictTypeControl) GenerateM() (common.ActiveRecord, error) {
return &models.SysDictType{
ID: s.Id,
DictName: s.DictName,
DictType: s.DictType,
Status: s.Status,
Remark: s.Remark,
}, nil
} }
func (s *SysDictTypeControl) GetId() interface{} { func (s *SysDictTypeControl) GetId() interface{} {
@@ -83,6 +61,7 @@ func (s *SysDictTypeControl) GetId() interface{} {
type SysDictTypeById struct { type SysDictTypeById struct {
dto.ObjectById dto.ObjectById
common.ControlBy
} }
func (s *SysDictTypeById) Generate() dto.Control { func (s *SysDictTypeById) Generate() dto.Control {
@@ -90,6 +69,14 @@ func (s *SysDictTypeById) Generate() dto.Control {
return &cp return &cp
} }
func (s *SysDictTypeById) GetId() interface{} {
if len(s.Ids) > 0 {
s.Ids = append(s.Ids, s.Id)
return s.Ids
}
return s.Id
}
func (s *SysDictTypeById) GenerateM() (common.ActiveRecord, error) { func (s *SysDictTypeById) GenerateM() (common.ActiveRecord, error) {
return &models.SysDictType{}, nil return &models.SysDictType{}, nil
} }
+4
View File
@@ -19,6 +19,10 @@ type SysLoginLogSearch struct {
LoginLocation string `form:"loginLocation" search:"type:exact;column:login_location;table:sys_login_log" comment:"归属地"` LoginLocation string `form:"loginLocation" search:"type:exact;column:login_location;table:sys_login_log" comment:"归属地"`
} }
type SysLoginLogOrder struct {
HandleOrder string `search:"type:order;column:created_at;table:sys_login_log" form:"created_at_order"`
}
func (m *SysLoginLogSearch) GetNeedSearch() interface{} { func (m *SysLoginLogSearch) GetNeedSearch() interface{} {
return *m return *m
} }
+7 -49
View File
@@ -1,10 +1,6 @@
package dto package dto
import ( import (
"encoding/json"
"github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding"
"github.com/go-admin-team/go-admin-core/sdk/api"
"go-admin/app/admin/models" "go-admin/app/admin/models"
common "go-admin/common/models" common "go-admin/common/models"
@@ -28,15 +24,6 @@ func (m *SysMenuSearch) GetNeedSearch() interface{} {
return *m return *m
} }
// Bind 映射上下文中的结构体数据
func (m *SysMenuSearch) Bind(ctx *gin.Context) error {
log := api.GetRequestLogger(ctx)
err := ctx.ShouldBind(m)
if err != nil {
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
// SysMenuControl 增、改使用的结构体 // SysMenuControl 增、改使用的结构体
type SysMenuControl struct { type SysMenuControl struct {
@@ -69,27 +56,6 @@ func (s *SysMenuControl) SetUpdateBy(id int) {
s.UpdateBy = id s.UpdateBy = id
} }
// Bind 映射上下文中的结构体数据
func (s *SysMenuControl) Bind(ctx *gin.Context) error {
log := api.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBindBodyWith(s, binding.JSON)
if err != nil {
log.Debugf("ShouldBind error: %s", err.Error())
}
var jsonStr []byte
jsonStr, err = json.Marshal(s)
if err != nil {
log.Debugf("ShouldBind error: %s", err.Error())
}
ctx.Set("body", string(jsonStr))
return err
}
// Generate 结构体数据转化 从 Control 至 model 对应的模型 // Generate 结构体数据转化 从 Control 至 model 对应的模型
func (s *SysMenuControl) Generate(model *models.SysMenu) { func (s *SysMenuControl) Generate(model *models.SysMenu) {
if s.MenuId != 0 { if s.MenuId != 0 {
@@ -124,35 +90,27 @@ func (s *SysMenuControl) GetId() interface{} {
return s.MenuId return s.MenuId
} }
// SysConfigById 获取单个或者删除的结构体 // SysMenuById 获取单个或者删除的结构体
type SysMenuById struct { type SysMenuById struct {
Id int `uri:"id"` Id int `uri:"id"`
Ids []int `json:"ids"` Ids []int `json:"ids"`
common.ControlBy
} }
func (s *SysMenuById) Generate() *SysMenuById { func (s *SysMenuById) Generate() *SysMenuById {
cp := *s cp := *s
return &cp return &cp
} }
func (s *SysMenuById) GetId() interface{} { func (s *SysMenuById) GetId() interface{} {
if len(s.Ids) > 0 {
s.Ids = append(s.Ids, s.Id)
return s.Ids
}
return s.Id return s.Id
} }
func (s *SysMenuById) Bind(ctx *gin.Context) error {
log := api.GetRequestLogger(ctx)
err := ctx.ShouldBindUri(s)
if err != nil {
log.Debugf("ShouldBindUri error: %s", err.Error())
return err
}
err = ctx.ShouldBind(s)
if err != nil {
log.Debugf("ShouldBind error: %s", err.Error())
}
return err
}
func (s *SysMenuById) GenerateM() (*models.SysMenu, error) { func (s *SysMenuById) GenerateM() (*models.SysMenu, error) {
return &models.SysMenu{}, nil return &models.SysMenu{}, nil
} }
+4
View File
@@ -96,6 +96,10 @@ func (s *SysPostById) Generate() *SysPostById {
} }
func (s *SysPostById) GetId() interface{} { func (s *SysPostById) GetId() interface{} {
if len(s.Ids) > 0 {
s.Ids = append(s.Ids, s.Id)
return s.Ids
}
return s.Id return s.Id
} }
+4
View File
@@ -119,6 +119,10 @@ func (s *SysRoleById) Generate() *SysRoleById {
} }
func (s *SysRoleById) GetId() interface{} { func (s *SysRoleById) GetId() interface{} {
if len(s.Ids) > 0 {
s.Ids = append(s.Ids, s.Id)
return s.Ids
}
return s.Id return s.Id
} }
+4
View File
@@ -66,6 +66,10 @@ func (s *SysSettingById) Generate() *SysSettingById {
} }
func (s *SysSettingById) GetId() interface{} { func (s *SysSettingById) GetId() interface{} {
if len(s.Ids) > 0 {
s.Ids = append(s.Ids, s.Id)
return s.Ids
}
return s.Id return s.Id
} }
+9 -5
View File
@@ -59,11 +59,7 @@ type SysUserControl struct {
func (s *SysUserControl) Bind(ctx *gin.Context) error { func (s *SysUserControl) Bind(ctx *gin.Context) error {
log := api.GetRequestLogger(ctx) log := api.GetRequestLogger(ctx)
//err := ctx.ShouldBindUri(s)
//if err != nil {
// log.Debugf("ShouldBindUri error: %s", err.Error())
// return err
//}
err := ctx.ShouldBind(s) err := ctx.ShouldBind(s)
if err != nil { if err != nil {
log.Debugf("ShouldBind error: %s", err.Error()) log.Debugf("ShouldBind error: %s", err.Error())
@@ -107,6 +103,14 @@ func (s *SysUserById) Generate() dto.Control {
return &cp return &cp
} }
func (s *SysUserById) GetId() interface{} {
if len(s.Ids) > 0 {
s.Ids = append(s.Ids, s.Id)
return s.Ids
}
return s.Id
}
func (s *SysUserById) GenerateM() (common.ActiveRecord, error) { func (s *SysUserById) GenerateM() (common.ActiveRecord, error) {
return &models.SysUser{}, nil return &models.SysUser{}, nil
} }
+4 -5
View File
@@ -41,7 +41,6 @@ func (e *SysApi) GetSysApiPage(c *dto.SysApiSearch, p *actions.DataPermission, l
// GetSysApi 获取SysApi对象 // GetSysApi 获取SysApi对象
func (e *SysApi) GetSysApi(d *dto.SysApiById, p *actions.DataPermission, model *models.SysApi) *SysApi { func (e *SysApi) GetSysApi(d *dto.SysApiById, p *actions.DataPermission, model *models.SysApi) *SysApi {
var data models.SysApi var data models.SysApi
err := e.Orm.Model(&data). err := e.Orm.Model(&data).
Scopes( Scopes(
actions.Permission(data.TableName(), p), actions.Permission(data.TableName(), p),
@@ -50,18 +49,18 @@ func (e *SysApi) GetSysApi(d *dto.SysApiById, p *actions.DataPermission, model *
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
err = errors.New("查看对象不存在或无权查看") err = errors.New("查看对象不存在或无权查看")
e.Log.Errorf("Service GetSysApi error:%s", err) e.Log.Errorf("Service GetSysApi error:%s", err)
e.AddError(err) _ = e.AddError(err)
return e return e
} }
if err != nil { if err != nil {
e.Log.Errorf("db error:%s", err) e.Log.Errorf("db error:%s", err)
e.AddError(err) _ = e.AddError(err)
return e return e
} }
return nil return e
} }
// InsertSysApi 创建SysApi对象 // CheckStorageSysApi 创建SysApi对象
func (e *SysApi) CheckStorageSysApi(c *[]runtime.Router) error { func (e *SysApi) CheckStorageSysApi(c *[]runtime.Router) error {
for _, v := range *c { for _, v := range *c {
err := e.Orm.Debug().Where(models.SysApi{Path: v.RelativePath, Action: v.HttpMethod}). err := e.Orm.Debug().Where(models.SysApi{Path: v.RelativePath, Action: v.HttpMethod}).
+10 -11
View File
@@ -67,12 +67,11 @@ func (e *SysConfig) GetSysConfig(d *dto.SysConfigById, model *models.SysConfig)
} }
// InsertSysConfig 创建SysConfig对象 // InsertSysConfig 创建SysConfig对象
func (e *SysConfig) InsertSysConfig(model *models.SysConfig) error { func (e *SysConfig) InsertSysConfig(c *dto.SysConfigControl) error {
var err error var err error
var data models.SysConfig var data models.SysConfig
c.Generate(&data)
err = e.Orm.Model(&data). err = e.Orm.Create(data).Error
Create(model).Error
if err != nil { if err != nil {
e.Log.Errorf("Service InsertSysConfig error:%s", err) e.Log.Errorf("Service InsertSysConfig error:%s", err)
return err return err
@@ -81,11 +80,12 @@ func (e *SysConfig) InsertSysConfig(model *models.SysConfig) error {
} }
// UpdateSysConfig 修改SysConfig对象 // UpdateSysConfig 修改SysConfig对象
func (e *SysConfig) UpdateSysConfig(c *models.SysConfig) error { func (e *SysConfig) UpdateSysConfig(c *dto.SysConfigControl) error {
var err error var err error
var model = models.SysConfig{}
db := e.Orm.Model(c). e.Orm.First(&model, c.GetId())
Where(c.GetId()).Updates(c) c.Generate(&model)
db := e.Orm.Save(&model)
err = db.Error err = db.Error
if err != nil { if err != nil {
e.Log.Errorf("Service UpdateSysConfig error:%s", err) e.Log.Errorf("Service UpdateSysConfig error:%s", err)
@@ -99,12 +99,11 @@ func (e *SysConfig) UpdateSysConfig(c *models.SysConfig) error {
} }
// RemoveSysConfig 删除SysConfig // RemoveSysConfig 删除SysConfig
func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById, c *models.SysConfig) error { func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById) error {
var err error var err error
var data models.SysConfig var data models.SysConfig
db := e.Orm.Model(&data). db := e.Orm.Delete(&data, d.Ids)
Where(d.Ids).Delete(c)
if db.Error != nil { if db.Error != nil {
err = db.Error err = db.Error
e.Log.Errorf("Service RemoveSysConfig error:%s", err) e.Log.Errorf("Service RemoveSysConfig error:%s", err)
+12 -13
View File
@@ -55,27 +55,26 @@ func (e *SysDept) GetSysDept(d *dto.SysDeptById, model *models.SysDept) error {
} }
// InsertSysDept 创建SysDept对象 // InsertSysDept 创建SysDept对象
func (e *SysDept) InsertSysDept(model *models.SysDept) error { func (e *SysDept) InsertSysDept(c *dto.SysDeptControl) error {
var err error var err error
var data models.SysDept var data models.SysDept
c.Generate(&data)
err = e.Orm.Model(&data). err = e.Orm.Create(data).Error
Create(model).Error
if err != nil { if err != nil {
e.Log.Errorf("db error:%s", err) e.Log.Errorf("db error:%s", err)
return err return err
} }
deptPath := "/" + pkg.IntToString(model.DeptId) deptPath := "/" + pkg.IntToString(data.DeptId)
if model.ParentId != 0 { if data.ParentId != 0 {
var deptP models.SysDept var deptP models.SysDept
e.Orm.Model(&data).First(&deptP, model.ParentId) e.Orm.First(&deptP, data.ParentId)
deptPath = deptP.DeptPath + deptPath deptPath = deptP.DeptPath + deptPath
} else { } else {
deptPath = "/0" + deptPath deptPath = "/0" + deptPath
} }
var mp = map[string]string{} var mp = map[string]string{}
mp["dept_path"] = deptPath mp["dept_path"] = deptPath
if err := e.Orm.Model(&model).Update("dept_path", deptPath).Error; err != nil { if err := e.Orm.Update("dept_path", deptPath).Error; err != nil {
e.Log.Errorf("db error:%s", err) e.Log.Errorf("db error:%s", err)
return err return err
} }
@@ -83,12 +82,12 @@ func (e *SysDept) InsertSysDept(model *models.SysDept) error {
} }
// UpdateSysDept 修改SysDept对象 // UpdateSysDept 修改SysDept对象
func (e *SysDept) UpdateSysDept(c *models.SysDept) error { func (e *SysDept) UpdateSysDept(c *dto.SysDeptControl) error {
var err error var err error
var data models.SysDept var model = models.SysDept{}
e.Orm.First(&model, c.GetId())
db := e.Orm.Model(&data). c.Generate(&model)
Where(c.GetId()).Updates(c) db := e.Orm.Where(c.GetId()).Updates(c)
if db.Error != nil { if db.Error != nil {
e.Log.Errorf("db error:%s", err) e.Log.Errorf("db error:%s", err)
return err return err
+11 -13
View File
@@ -55,12 +55,11 @@ func (e *SysDictData) Get(d *dto.SysDictDataById, model *models.SysDictData) err
} }
// Insert 创建对象 // Insert 创建对象
func (e *SysDictData) Insert(model *models.SysDictData) error { func (e *SysDictData) Insert(c *dto.SysDictDataControl) error {
var err error var err error
var data models.SysDictData var data = new(models.SysDictData)
c.Generate(data)
err = e.Orm.Model(&data). err = e.Orm.Create(data).Error
Create(model).Error
if err != nil { if err != nil {
e.Log.Errorf("db error: %s", err) e.Log.Errorf("db error: %s", err)
return err return err
@@ -69,12 +68,12 @@ func (e *SysDictData) Insert(model *models.SysDictData) error {
} }
// Update 修改对象 // Update 修改对象
func (e *SysDictData) Update(c *models.SysDictData) error { func (e *SysDictData) Update(c *dto.SysDictDataControl) error {
var err error var err error
var data models.SysDictData var model = models.SysDictData{}
e.Orm.First(&model, c.GetId())
db := e.Orm.Model(&data). c.Generate(&model)
Where(c.GetId()).Updates(c) db := e.Orm.Save(model)
if err = db.Error; err != nil { if err = db.Error; err != nil {
e.Log.Errorf("db error: %s", err) e.Log.Errorf("db error: %s", err)
return err return err
@@ -87,12 +86,11 @@ func (e *SysDictData) Update(c *models.SysDictData) error {
} }
// Remove 删除 // Remove 删除
func (e *SysDictData) Remove(d *dto.SysDictDataById, c *models.SysDictData) error { func (e *SysDictData) Remove(c *dto.SysDictDataById) error {
var err error var err error
var data models.SysDictData var data models.SysDictData
db := e.Orm.Model(&data). db := e.Orm.Delete(&data, c.GetId())
Where(d.GetId()).Delete(c)
if db.Error != nil { if db.Error != nil {
err = db.Error err = db.Error
e.Log.Errorf("Delete error: %s", err) e.Log.Errorf("Delete error: %s", err)
+11 -15
View File
@@ -37,10 +37,8 @@ func (e *SysDictType) GetPage(c *dto.SysDictTypeSearch, list *[]models.SysDictTy
// Get 获取对象 // Get 获取对象
func (e *SysDictType) Get(d *dto.SysDictTypeById, model *models.SysDictType) error { func (e *SysDictType) Get(d *dto.SysDictTypeById, model *models.SysDictType) error {
var err error var err error
var data models.SysDictType
db := e.Orm.Model(&data). db := e.Orm.First(model, d.GetId())
First(model, d.GetId())
err = db.Error err = db.Error
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
err = errors.New("查看对象不存在或无权查看") err = errors.New("查看对象不存在或无权查看")
@@ -55,12 +53,11 @@ func (e *SysDictType) Get(d *dto.SysDictTypeById, model *models.SysDictType) err
} }
// Insert 创建对象 // Insert 创建对象
func (e *SysDictType) Insert(model *models.SysDictType) error { func (e *SysDictType) Insert(c *dto.SysDictTypeControl) error {
var err error var err error
var data models.SysDictType var data models.SysDictType
c.Generate(&data)
err = e.Orm.Model(&data). err = e.Orm.Create(&data).Error
Create(model).Error
if err != nil { if err != nil {
e.Log.Errorf("db error: %s", err) e.Log.Errorf("db error: %s", err)
return err return err
@@ -69,12 +66,12 @@ func (e *SysDictType) Insert(model *models.SysDictType) error {
} }
// Update 修改对象 // Update 修改对象
func (e *SysDictType) Update(c *models.SysDictType) error { func (e *SysDictType) Update(c *dto.SysDictTypeControl) error {
var err error var err error
var data models.SysDictType var model = models.SysDictType{}
e.Orm.First(&model, c.GetId())
db := e.Orm.Model(&data). c.Generate(&model)
Where(c.GetId()).Updates(c) db := e.Orm.Save(&model)
if db.Error != nil { if db.Error != nil {
e.Log.Errorf("db error: %s", err) e.Log.Errorf("db error: %s", err)
return err return err
@@ -87,12 +84,11 @@ func (e *SysDictType) Update(c *models.SysDictType) error {
} }
// Remove 删除 // Remove 删除
func (e *SysDictType) Remove(d *dto.SysDictTypeById, c *models.SysDictType) error { func (e *SysDictType) Remove(d *dto.SysDictTypeById) error {
var err error var err error
var data models.SysDictType var data models.SysDictType
db := e.Orm.Model(&data). db := e.Orm.Delete(&data, d.GetId())
Where(d.GetId()).Delete(c)
if db.Error != nil { if db.Error != nil {
err = db.Error err = db.Error
e.Log.Errorf("Delete error: %s", err) e.Log.Errorf("Delete error: %s", err)
-8
View File
@@ -149,14 +149,6 @@ func run() error {
} }
} }
} }
//serviceApi := service.SysApi{}
//serviceApi.Orm = sdk.Runtime.GetDb()["*"]
//var routers = sdk.Runtime.GetRouter()
//err := serviceApi.CheckStorageSysApi(&routers)
//if err != nil {
// log.Println("Server check api data :", err)
//}
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel() defer cancel()
+7 -23
View File
@@ -24,8 +24,9 @@ func LoggerToFile() gin.HandlerFunc {
// 处理请求 // 处理请求
c.Next() c.Next()
if strings.Index(c.Request.RequestURI, "/api/v1/logout") > -1 || url := c.Request.RequestURI
strings.Index(c.Request.RequestURI, "/login") > -1 { if strings.Index(url, "logout") > -1 ||
strings.Index(url, "login") > -1 {
return return
} }
// 结束时间 // 结束时间
@@ -77,8 +78,7 @@ func LoggerToFile() gin.HandlerFunc {
"uri": reqUri, "uri": reqUri,
} }
log.WithFields(logData).Info() log.WithFields(logData).Info()
//l := logger.Logger{Logger: log.Fields(logData)}
//l.Info(logData)
if c.Request.Method != "GET" && c.Request.Method != "OPTIONS" && config.LoggerConfig.EnabledDB { if c.Request.Method != "GET" && c.Request.Method != "OPTIONS" && config.LoggerConfig.EnabledDB {
SetDBOperLog(c, clientIP, statusCode, reqUri, reqMethod, latencyTime, body, result, statusBus) SetDBOperLog(c, clientIP, statusCode, reqUri, reqMethod, latencyTime, body, result, statusBus)
} }
@@ -98,25 +98,9 @@ func SetDBOperLog(c *gin.Context, clientIP string, statusCode int, reqUri string
l["requestMethod"] = c.Request.Method l["requestMethod"] = c.Request.Method
l["operParam"] = body l["operParam"] = body
l["operTime"] = time.Now() l["operTime"] = time.Now()
if reqUri == "/login" { l["jsonResult"] = result
l["businessType"] = "10" l["latencyTime"] = latencyTime.String()
l["title"] = "用户登录" l["statusCode"] = statusCode
l["operName"] = "-"
} else if strings.Contains(reqUri, "/api/v1/logout") {
l["businessType"] = "11"
l["title"] = "退出登录"
} else if strings.Contains(reqUri, "/api/v1/getCaptcha") {
l["businessType"] = "12"
l["title"] = "验证码"
} else {
if reqMethod == "POST" {
l["businessType"] = "1"
} else if reqMethod == "PUT" {
l["businessType"] = "2"
} else if reqMethod == "DELETE" {
l["businessType"] = "3"
}
}
if status == http.StatusOK { if status == http.StatusOK {
l["status"] = "2" l["status"] = "2"
} else { } else {