refactor🎨 : uint 调整为 int

This commit is contained in:
zhangwenjian committed 2020-12-21 22:04:20 +08:00
1 parent ab7c34f817
commit 46ea5f18aa
17 files changed
+125 -172

No files matched your search

+30 -49
View File
@@ -3,7 +3,6 @@ package sys_file
import (
"github.com/gin-gonic/gin"
"go-admin/app/admin/service"
common "go-admin/common/models"
"net/http"
"go-admin/app/admin/models"
@@ -20,27 +19,23 @@ type SysFileDir struct {
func (e *SysFileDir) GetSysFileDirList(c *gin.Context) {
msgID := tools.GenerateMsgIDFromContext(c)
d := new(dto.SysFileDirSearch)
search := new(dto.SysFileDirSearch)
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
return
}
req := d.Generate()
//查询列表
err = req.Bind(c)
err = c.ShouldBind(search)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
return
log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
}
var list *[]models.SysFileDirL
serviceStudent := service.SysFileDir{}
serviceStudent.MsgID = msgID
serviceStudent.Orm = db
list, err = serviceStudent.SetSysFileDir(req)
list, err = serviceStudent.SetSysFileDir(search)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
return
@@ -59,18 +54,17 @@ func (e *SysFileDir) GetSysFileDir(c *gin.Context) {
msgID := tools.GenerateMsgIDFromContext(c)
//查看详情
req := control.Generate()
err = req.Bind(c)
err = c.ShouldBindUri(control)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
return
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
}
var object models.SysFileDir
serviceSysFileDir := service.SysFileDir{}
serviceSysFileDir.MsgID = msgID
serviceSysFileDir.Orm = db
err = serviceSysFileDir.GetSysFileDir(req, &object)
err = serviceSysFileDir.GetSysFileDir(control, &object)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
return
@@ -89,32 +83,28 @@ func (e *SysFileDir) InsertSysFileDir(c *gin.Context) {
msgID := tools.GenerateMsgIDFromContext(c)
//新增操作
req := control.Generate()
err = req.Bind(c)
err = c.ShouldBindUri(control)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
return
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
}
var object common.ActiveRecord
object, err = req.GenerateM()
err = c.ShouldBind(control)
if err != nil {
e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
return
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
}
// 设置创建人
object.SetCreateBy(tools.GetUserIdUint(c))
control.CreateBy = tools.GetUserId(c)
serviceSysFileDir := service.SysFileDir{}
serviceSysFileDir.Orm = db
serviceSysFileDir.MsgID = msgID
err = serviceSysFileDir.InsertSysFileDir(object)
err = serviceSysFileDir.InsertSysFileDir(control)
if err != nil {
log.Error(err)
e.Error(c, http.StatusInternalServerError, err, "创建失败")
return
}
e.OK(c, object.GetId(), "创建成功")
e.OK(c, control.ID, "创建成功")
}
func (e *SysFileDir) UpdateSysFileDir(c *gin.Context) {
@@ -126,20 +116,16 @@ func (e *SysFileDir) UpdateSysFileDir(c *gin.Context) {
}
msgID := tools.GenerateMsgIDFromContext(c)
req := control.Generate()
//更新操作
err = req.Bind(c)
err = c.ShouldBindUri(control)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
return
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
}
var object common.ActiveRecord
object, err = req.GenerateM()
err = c.ShouldBind(control)
if err != nil {
e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
return
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
}
object.SetUpdateBy(tools.GetUserIdUint(c))
// 设置创建人
control.UpdateBy = tools.GetUserId(c)
//数据权限检查
p := actions.GetPermissionFromContext(c)
@@ -147,12 +133,12 @@ func (e *SysFileDir) UpdateSysFileDir(c *gin.Context) {
serviceSysFileDir := service.SysFileDir{}
serviceSysFileDir.Orm = db
serviceSysFileDir.MsgID = msgID
err = serviceSysFileDir.UpdateSysFileDir(object, p)
err = serviceSysFileDir.UpdateSysFileDir(control, p)
if err != nil {
log.Error(err)
return
}
e.OK(c, object.GetId(), "更新成功")
e.OK(c, control.ID, "更新成功")
}
func (e *SysFileDir) DeleteSysFileDir(c *gin.Context) {
@@ -165,22 +151,17 @@ func (e *SysFileDir) DeleteSysFileDir(c *gin.Context) {
msgID := tools.GenerateMsgIDFromContext(c)
//删除操作
req := control.Generate()
err = req.Bind(c)
err = c.ShouldBindUri(control)
if err != nil {
log.Errorf("MsgID[%s] Bind error: %s", msgID, err)
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
return
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
}
var object common.ActiveRecord
object, err = req.GenerateM()
err = c.ShouldBind(control)
if err != nil {
e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
return
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
}
// 设置编辑人
object.SetUpdateBy(tools.GetUserIdUint(c))
control.UpdateBy = tools.GetUserId(c)
// 数据权限检查
p := actions.GetPermissionFromContext(c)
@@ -188,10 +169,10 @@ func (e *SysFileDir) DeleteSysFileDir(c *gin.Context) {
serviceSysFileDir := service.SysFileDir{}
serviceSysFileDir.Orm = db
serviceSysFileDir.MsgID = msgID
err = serviceSysFileDir.RemoveSysFileDir(req, object, p)
err = serviceSysFileDir.RemoveSysFileDir(control, p)
if err != nil {
log.Error(err)
return
}
e.OK(c, object.GetId(), "删除成功")
e.OK(c, control.Id, "删除成功")
}