From 87d5fd981f83cef66f4aa16fa751bc33e9612160 Mon Sep 17 00:00:00 2001 From: "Mr. Lan" Date: Thu, 16 Jul 2020 01:22:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=81=E7=A8=8B=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/log/loginLog.go | 63 ++++++--- apis/process/classify.go | 27 ++-- apis/process/process.go | 282 +++++++++++++++++++------------------- apis/process/tpl.go | 45 +++--- apis/system/captcha.go | 7 +- apis/system/dept.go | 70 ++++++++-- apis/system/info.go | 5 +- apis/system/menu.go | 65 +++++++-- apis/system/post.go | 56 ++++++-- apis/system/role.go | 88 +++++++++--- apis/system/rolemenu.go | 15 +- apis/system/sysuser.go | 111 +++++++++++---- router/process/process.go | 20 +-- tools/app/msg/message.go | 1 - 14 files changed, 559 insertions(+), 296 deletions(-) diff --git a/apis/log/loginLog.go b/apis/log/loginLog.go index 726803b..6a2ea00 100644 --- a/apis/log/loginLog.go +++ b/apis/log/loginLog.go @@ -22,10 +22,12 @@ import ( // @Router /api/v1/loginloglist [get] // @Security func GetLoginLogList(c *gin.Context) { - var data system.LoginLog - var err error - var pageSize = 10 - var pageIndex = 1 + var ( + err error + pageSize = 10 + pageIndex = 1 + data system.LoginLog + ) size := c.Request.FormValue("pageSize") if size != "" { @@ -41,7 +43,10 @@ func GetLoginLogList(c *gin.Context) { data.Status = c.Request.FormValue("status") data.Ipaddr = c.Request.FormValue("ipaddr") result, count, err := data.GetPage(pageSize, pageIndex) - tools.HasError(err, "", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } var mp = make(map[string]interface{}, 3) mp["list"] = result @@ -62,12 +67,17 @@ func GetLoginLogList(c *gin.Context) { // @Router /api/v1/loginlog/{infoId} [get] // @Security func GetLoginLog(c *gin.Context) { - var LoginLog system.LoginLog + var ( + res app.Response + LoginLog system.LoginLog + ) LoginLog.InfoId, _ = tools.StringToInt(c.Param("infoId")) result, err := LoginLog.Get() - tools.HasError(err, "抱歉未找到相关信息", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } - var res app.Response res.Data = result c.JSON(http.StatusOK, res.ReturnOK()) } @@ -85,9 +95,15 @@ func GetLoginLog(c *gin.Context) { func InsertLoginLog(c *gin.Context) { var data system.LoginLog err := c.BindWith(&data, binding.JSON) - tools.HasError(err, "", 500) + if err != nil { + app.Error(c, -1, err, "") + return + } result, err := data.Create() - tools.HasError(err, "", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } var res app.Response res.Data = result c.JSON(http.StatusOK, res.ReturnOK()) @@ -104,12 +120,20 @@ func InsertLoginLog(c *gin.Context) { // @Router /api/v1/loginlog [put] // @Security Bearer func UpdateLoginLog(c *gin.Context) { - var data system.LoginLog + var ( + res app.Response + data system.LoginLog + ) err := c.BindWith(&data, binding.JSON) - tools.HasError(err, "", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } result, err := data.Update(data.InfoId) - tools.HasError(err, "", -1) - var res app.Response + if err != nil { + app.Error(c, -1, err, "") + return + } res.Data = result c.JSON(http.StatusOK, res.ReturnOK()) } @@ -122,12 +146,17 @@ func UpdateLoginLog(c *gin.Context) { // @Success 200 {string} string "{"code": -1, "message": "删除失败"}" // @Router /api/v1/loginlog/{infoId} [delete] func DeleteLoginLog(c *gin.Context) { - var data system.LoginLog + var ( + res app.Response + data system.LoginLog + ) data.UpdateBy = tools.GetUserIdStr(c) IDS := tools.IdsStrToIdsIntGroup("infoId", c) _, err := data.BatchDelete(IDS) - tools.HasError(err, "修改失败", 500) - var res app.Response + if err != nil { + app.Error(c, -1, err, "") + return + } res.Msg = "删除成功" c.JSON(http.StatusOK, res.ReturnOK()) } diff --git a/apis/process/classify.go b/apis/process/classify.go index 1759e8c..7c3fdfd 100644 --- a/apis/process/classify.go +++ b/apis/process/classify.go @@ -25,7 +25,8 @@ func CreateClassify(c *gin.Context) { err = c.ShouldBind(&classifyValue) if err != nil { - tools.HasError(err, "", -1) + app.Error(c, -1, err, "") + return } // 判断创建的分类是否存在 @@ -33,17 +34,20 @@ func CreateClassify(c *gin.Context) { Where("name = ?", classifyValue.Name). Count(&classifyCount).Error if err != nil { - tools.HasError(err, "创建的分类名称已经存在，请修改", -1) + app.Error(c, -1, err, "") + return } if classifyCount > 0 { - tools.HasError(err, "", -1) + app.Error(c, -1, errors.New("创建的分类名称已经存在"), "") + return } classifyValue.Creator = tools.GetUserId(c) err = orm.Eloquent.Table("p_process_classify").Create(&classifyValue).Error if err != nil { - tools.HasError(err, "", -1) + app.Error(c, -1, err, "") + return } app.OK(c, "", "创建流程分类成功") @@ -76,7 +80,8 @@ func ClassifyList(c *gin.Context) { }, &classifyList, SearchParams, "p_process_classify") if err != nil { - tools.HasError(err, "", -1) + app.Error(c, -1, err, "") + return } app.OK(c, result, "获取分类列表成功") } @@ -90,7 +95,8 @@ func UpdateClassify(c *gin.Context) { err = c.ShouldBind(&classifyValue) if err != nil { - tools.HasError(err, "", -1) + app.Error(c, -1, err, "") + return } // 更新 @@ -98,7 +104,8 @@ func UpdateClassify(c *gin.Context) { Where("id = ?", classifyValue.Id). Update("name", classifyValue.Name).Error if err != nil { - tools.HasError(err, "", -1) + app.Error(c, -1, err, "") + return } app.OK(c, classifyValue, "流程分类更新成功") @@ -108,12 +115,14 @@ func UpdateClassify(c *gin.Context) { func DeleteClassify(c *gin.Context) { classifyId := c.DefaultQuery("classifyId", "") if classifyId == "" { - tools.HasError(errors.New("参数传递失败，请确认classifyId是否传递"), "", -1) + app.Error(c, -1, errors.New("参数传递失败，请确认classifyId是否传递"), "") + return } err := orm.Eloquent.Delete(process2.Classify{}, "id = ?", classifyId).Error if err != nil { - tools.HasError(err, "", -1) + app.Error(c, -1, err, "") + return } app.OK(c, "", "流程分类删除成功") diff --git a/apis/process/process.go b/apis/process/process.go index 0faa1a2..799d9fd 100644 --- a/apis/process/process.go +++ b/apis/process/process.go @@ -1,125 +1,123 @@ package process -//import ( -// process2 "ferry/models/process" -// "ferry/pkg/connection" -// "ferry/pkg/pagination" -// "ferry/pkg/response/code" -// "fmt" -// -// "github.com/gin-gonic/gin" -//) -// -///* -// @Author : lanyulei -//*/ -// -//// 流程列表 -//func ProcessList(c *gin.Context) { -// type processValue struct { -// process2.Info -// CreateUser string `json:"create_user"` -// CreateName string `json:"create_name"` -// ClassifyName string `json:"classify_name"` -// } -// -// var ( -// err error -// processList []*processValue -// ) -// -// SearchParams := map[string]map[string]interface{}{ -// "like": pagination.RequestParams(c), -// } -// -// db := connection.DB.Self. -// Model(&process2.Info{}). -// Joins("left join user_info on user_info.id = p_process_info.creator"). -// Joins("left join p_process_classify on p_process_classify.id = p_process_info.classify"). -// Select("p_process_info.id, p_process_info.create_time, p_process_info.update_time, p_process_info.name, p_process_info.creator, p_process_classify.name as classify_name, user_info.username as create_user, user_info.nickname as create_name"). -// Where("p_process_info.`delete_time` IS NULL") -// -// result, err := pagination.Paging(&pagination.Param{ -// C: c, -// DB: db, -// }, &processList, SearchParams, "p_process_info") -// -// if err != nil { -// Response(c, code.SelectError, nil, fmt.Sprintf("查询流程列表失败，%v", err.Error())) -// return -// } -// Response(c, nil, result, "") -//} -// -//// 创建流程 -//func CreateProcess(c *gin.Context) { -// var ( -// err error -// processValue process2.Info -// processCount int -// ) -// -// err = c.ShouldBind(&processValue) -// if err != nil { -// Response(c, code.BindError, nil, err.Error()) -// return -// } -// -// // 确定修改的分类是否存在 -// err = connection.DB.Self.Model(&processValue). -// Where("name = ?", processValue.Name). -// Count(&processCount).Error -// if err != nil { -// Response(c, code.SelectError, nil, fmt.Sprintf("查询流程数量失败，%v", err.Error())) -// return -// } -// if processCount > 0 { -// Response(c, code.InternalServerError, nil, "流程名称出现重复，请换一个名称") -// return -// } -// -// processValue.Creator = c.GetInt("userId") -// -// err = connection.DB.Self.Create(&processValue).Error -// if err != nil { -// Response(c, code.CreateError, nil, fmt.Sprintf("创建流程失败，%v", err.Error())) -// return -// } -// -// Response(c, nil, nil, "") -//} -// -//// 更新流程 -//func UpdateProcess(c *gin.Context) { -// var ( -// err error -// processValue process2.Info -// ) -// -// err = c.ShouldBind(&processValue) -// if err != nil { -// Response(c, code.BindError, nil, err.Error()) -// return -// } -// -// err = connection.DB.Self.Model(&process2.Info{}). -// Where("id = ?", processValue.Id). -// Updates(map[string]interface{}{ -// "name": processValue.Name, -// "structure": processValue.Structure, -// "tpls": processValue.Tpls, -// "classify": processValue.Classify, -// "task": processValue.Task, -// }).Error -// if err != nil { -// Response(c, code.UpdateError, nil, fmt.Sprintf("更新流程信息失败，%v", err.Error())) -// return -// } -// -// Response(c, nil, nil, "") -//} -// -//// 删除流程 +import ( + "errors" + "ferry/global/orm" + process2 "ferry/models/process" + "ferry/pkg/pagination" + "ferry/tools" + "ferry/tools/app" + "fmt" + + "github.com/gin-gonic/gin" +) + +/* + @Author : lanyulei +*/ + +// 流程列表 +func ProcessList(c *gin.Context) { + var ( + err error + processList []*struct { + process2.Info + CreateUser string `json:"create_user"` + CreateName string `json:"create_name"` + ClassifyName string `json:"classify_name"` + } + ) + + SearchParams := map[string]map[string]interface{}{ + "like": pagination.RequestParams(c), + } + + db := orm.Eloquent.Model(&process2.Info{}). + Joins("left join sys_user on sys_user.user_id = p_process_info.creator"). + Joins("left join p_process_classify on p_process_classify.id = p_process_info.classify"). + Select("p_process_info.id, p_process_info.create_time, p_process_info.update_time, p_process_info.name, p_process_info.creator, p_process_classify.name as classify_name, sys_user.username as create_user, sys_user.nick_name as create_name") + + result, err := pagination.Paging(&pagination.Param{ + C: c, + DB: db, + }, &processList, SearchParams, "p_process_info") + + if err != nil { + app.Error(c, -1, err, fmt.Sprintf("查询流程模版失败，%v", err.Error())) + return + } + app.OK(c, result, "查询流程列表成功") +} + +// 创建流程 +func CreateProcess(c *gin.Context) { + var ( + err error + processValue process2.Info + processCount int + ) + + err = c.ShouldBind(&processValue) + if err != nil { + app.Error(c, -1, err, fmt.Sprintf("参数绑定失败，%v", err.Error())) + return + } + + // 确定流程名称是否重复 + err = orm.Eloquent.Model(&processValue). + Where("name = ?", processValue.Name). + Count(&processCount).Error + if err != nil { + app.Error(c, -1, err, fmt.Sprintf("流程信息查询失败，%v", err.Error())) + return + } + if processCount > 0 { + app.Error(c, -1, errors.New("流程名称重复"), "") + return + } + + processValue.Creator = tools.GetUserId(c) + + err = orm.Eloquent.Create(&processValue).Error + if err != nil { + app.Error(c, -1, err, fmt.Sprintf("创建流程失败，%v", err.Error())) + return + } + + app.OK(c, processValue, "流程创建成功") +} + +// 更新流程 +func UpdateProcess(c *gin.Context) { + var ( + err error + processValue process2.Info + ) + + err = c.ShouldBind(&processValue) + if err != nil { + app.Error(c, -1, err, "") + return + } + + err = orm.Eloquent.Model(&process2.Info{}). + Where("id = ?", processValue.Id). + Updates(map[string]interface{}{ + "name": processValue.Name, + "structure": processValue.Structure, + "tpls": processValue.Tpls, + "classify": processValue.Classify, + "task": processValue.Task, + }).Error + if err != nil { + app.Error(c, -1, err, fmt.Sprintf("更新流程信息失败，%v", err.Error())) + return + } + + app.OK(c, processValue, "更新流程信息成功") +} + +// 删除流程 //func DeleteProcess(c *gin.Context) { // processId := c.DefaultQuery("processId", "") // if processId == "" { @@ -134,28 +132,28 @@ package process // } // Response(c, nil, nil, "") //} -// -//// 流程详情 -//func ProcessDetails(c *gin.Context) { -// processId := c.DefaultQuery("processId", "") -// if processId == "" { -// Response(c, code.InternalServerError, nil, "参数不正确，请确定参数processId是否传递") -// return -// } -// -// var processValue process2.Info -// err := connection.DB.Self.Model(&processValue). -// Where("id = ?", processId). -// Find(&processValue).Error -// if err != nil { -// Response(c, code.SelectError, nil, fmt.Sprintf("查询流程详情失败, %v", err.Error())) -// return -// } -// -// Response(c, nil, processValue, "") -//} -// -//// 分类流程列表 + +// 流程详情 +func ProcessDetails(c *gin.Context) { + processId := c.DefaultQuery("processId", "") + if processId == "" { + app.Error(c, -1, errors.New("参数不正确，请确定参数processId是否传递"), "") + return + } + + var processValue process2.Info + err := orm.Eloquent.Model(&processValue). + Where("id = ?", processId). + Find(&processValue).Error + if err != nil { + app.Error(c, -1, err, fmt.Sprintf("查询流程详情失败, %v", err.Error())) + return + } + + app.OK(c, processValue, "查询流程详情成功") +} + +// 分类流程列表 //func ClassifyProcessList(c *gin.Context) { // type classifyProcess struct { // process2.Classify diff --git a/apis/process/tpl.go b/apis/process/tpl.go index 944fe72..2f23a16 100644 --- a/apis/process/tpl.go +++ b/apis/process/tpl.go @@ -17,15 +17,13 @@ import ( // 模板列表 func TemplateList(c *gin.Context) { - type templateUserValue struct { - process.TplInfo - CreateUser string `json:"create_user"` - CreateName string `json:"create_name"` - } - var ( err error - templateList []*templateUserValue + templateList []*struct { + process.TplInfo + CreateUser string `json:"create_user"` + CreateName string `json:"create_name"` + } ) SearchParams := map[string]map[string]interface{}{ @@ -41,7 +39,8 @@ func TemplateList(c *gin.Context) { }, &templateList, SearchParams, "p_tpl_info") if err != nil { - tools.HasError(err, "") + app.Error(c, -1, err, "") + return } app.OK(c, result, "获取模版列表成功") @@ -57,7 +56,8 @@ func CreateTemplate(c *gin.Context) { err = c.ShouldBind(&templateValue) if err != nil { - tools.HasError(err, "") + app.Error(c, -1, err, "") + return } // 确认模版名称是否存在 @@ -65,16 +65,19 @@ func CreateTemplate(c *gin.Context) { Where("name = ?", templateValue.Name). Count(&templateCount).Error if err != nil { - tools.HasError(err, "") + app.Error(c, -1, err, "") + return } if templateCount > 0 { - tools.HasError(errors.New("模版名称已存在"), "") + app.Error(c, -1, errors.New("模版名称已存在"), "") + return } templateValue.Creator = tools.GetUserId(c) // 当前登陆用户ID err = orm.Eloquent.Create(&templateValue).Error if err != nil { - tools.HasError(err, "") + app.Error(c, -1, err, "") + return } app.OK(c, "", "创建模版成功") @@ -89,14 +92,16 @@ func TemplateDetails(c *gin.Context) { templateId := c.DefaultQuery("template_id", "") if templateId == "" { - tools.HasError(err, "") + app.Error(c, -1, err, "") + return } err = orm.Eloquent.Model(&templateDetailsValue). Where("id = ?", templateId). Find(&templateDetailsValue).Error if err != nil { - tools.HasError(err, "") + app.Error(c, -1, err, "") + return } app.OK(c, templateDetailsValue, "") @@ -110,7 +115,8 @@ func UpdateTemplate(c *gin.Context) { ) err = c.ShouldBind(&templateValue) if err != nil { - tools.HasError(err, "") + app.Error(c, -1, err, "") + return } err = orm.Eloquent.Model(&templateValue). @@ -121,7 +127,8 @@ func UpdateTemplate(c *gin.Context) { "form_structure": templateValue.FormStructure, }).Error if err != nil { - tools.HasError(err, "") + app.Error(c, -1, err, "") + return } app.OK(c, templateValue, "") @@ -135,12 +142,14 @@ func DeleteTemplate(c *gin.Context) { templateId := c.DefaultQuery("templateId", "") if templateId == "" { - tools.HasError(errors.New("参数不正确，请确认templateId是否传递"), "") + app.Error(c, -1, errors.New("参数不正确，请确认templateId是否传递"), "") + return } err = orm.Eloquent.Delete(process.TplInfo{}, "id = ?", templateId).Error if err != nil { - tools.HasError(err, "") + app.Error(c, -1, err, "") + return } app.OK(c, "", "删除模版成功") diff --git a/apis/system/captcha.go b/apis/system/captcha.go index d1c4d3a..00cec40 100644 --- a/apis/system/captcha.go +++ b/apis/system/captcha.go @@ -1,16 +1,19 @@ package system import ( - "ferry/tools" "ferry/tools/app" "ferry/tools/captcha" + "fmt" "github.com/gin-gonic/gin" ) func GenerateCaptchaHandler(c *gin.Context) { id, b64s, err := captcha.DriverDigitFunc() - tools.HasError(err, "验证码获取失败", 500) + if err != nil { + app.Error(c, -1, err, fmt.Sprintf("验证码获取失败, %v", err.Error())) + return + } app.Custum(c, gin.H{ "code": 200, "data": b64s, diff --git a/apis/system/dept.go b/apis/system/dept.go index 8b0dc96..2cacd2d 100644 --- a/apis/system/dept.go +++ b/apis/system/dept.go @@ -20,22 +20,36 @@ import ( // @Router /api/v1/deptList [get] // @Security func GetDeptList(c *gin.Context) { - var Dept system.Dept + var ( + Dept system.Dept + err error + ) Dept.DeptName = c.Request.FormValue("deptName") Dept.Status = c.Request.FormValue("status") Dept.DeptId, _ = tools.StringToInt(c.Request.FormValue("deptId")) + result, err := Dept.SetDept(true) - tools.HasError(err, "抱歉未找到相关信息", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } app.OK(c, result, "") } func GetDeptTree(c *gin.Context) { - var Dept system.Dept + var ( + Dept system.Dept + err error + ) 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) + if err != nil { + app.Error(c, -1, err, "") + return + } app.OK(c, result, "") } @@ -48,10 +62,17 @@ func GetDeptTree(c *gin.Context) { // @Router /api/v1/dept/{deptId} [get] // @Security func GetDept(c *gin.Context) { - var Dept system.Dept + var ( + err error + Dept system.Dept + ) Dept.DeptId, _ = tools.StringToInt(c.Param("deptId")) + result, err := Dept.Get() - tools.HasError(err, msg.NotFound, 404) + if err != nil { + app.Error(c, -1, err, "") + return + } app.OK(c, result, msg.GetSuccess) } @@ -68,10 +89,16 @@ func GetDept(c *gin.Context) { func InsertDept(c *gin.Context) { var data system.Dept err := c.BindWith(&data, binding.JSON) - tools.HasError(err, "", 500) + if err != nil { + app.Error(c, -1, err, "") + return + } data.CreateBy = tools.GetUserIdStr(c) result, err := data.Create() - tools.HasError(err, "", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } app.OK(c, result, msg.CreatedSuccess) } @@ -89,10 +116,16 @@ func InsertDept(c *gin.Context) { func UpdateDept(c *gin.Context) { var data system.Dept err := c.BindJSON(&data) - tools.HasError(err, "", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } data.UpdateBy = tools.GetUserIdStr(c) result, err := data.Update(data.DeptId) - tools.HasError(err, "", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } app.OK(c, result, msg.UpdatedSuccess) } @@ -106,8 +139,12 @@ func UpdateDept(c *gin.Context) { func DeleteDept(c *gin.Context) { var data system.Dept id, _ := tools.StringToInt(c.Param("id")) + _, err := data.Delete(id) - tools.HasError(err, "删除失败", 500) + if err != nil { + app.Error(c, -1, err, "") + return + } app.OK(c, "", msg.DeletedSuccess) } @@ -115,13 +152,20 @@ func GetDeptTreeRoleselect(c *gin.Context) { var Dept system.Dept var SysRole system.SysRole id, _ := tools.StringToInt(c.Param("roleId")) + SysRole.RoleId = id result, err := Dept.SetDeptLable() - tools.HasError(err, msg.NotFound, -1) + if err != nil { + app.Error(c, -1, err, "") + return + } menuIds := make([]int, 0) if id != 0 { menuIds, err = SysRole.GetRoleDeptId() - tools.HasError(err, "抱歉未找到相关信息", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } } app.Custum(c, gin.H{ "code": 200, diff --git a/apis/system/info.go b/apis/system/info.go index 8f52efd..a9d2574 100644 --- a/apis/system/info.go +++ b/apis/system/info.go @@ -36,7 +36,10 @@ func GetInfo(c *gin.Context) { sysuser := system.SysUser{} sysuser.UserId = tools.GetUserId(c) user, err := sysuser.Get() - tools.HasError(err, "", 500) + if err != nil { + app.Error(c, -1, err, "") + return + } mp["introduction"] = " am a super administrator" diff --git a/apis/system/menu.go b/apis/system/menu.go index b3f3fbf..63b7502 100644 --- a/apis/system/menu.go +++ b/apis/system/menu.go @@ -23,7 +23,10 @@ func GetMenuList(c *gin.Context) { Menu.Visible = c.Request.FormValue("visible") Menu.Title = c.Request.FormValue("title") result, err := Menu.SetMenu() - tools.HasError(err, "抱歉未找到相关信息", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } app.OK(c, result, "") } @@ -41,7 +44,10 @@ func GetMenu(c *gin.Context) { id, _ := tools.StringToInt(c.Param("id")) data.MenuId = id result, err := data.GetByMenuId() - tools.HasError(err, "抱歉未找到相关信息", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } app.OK(c, result, "") } @@ -51,11 +57,17 @@ func GetMenuTreeRoleselect(c *gin.Context) { id, _ := tools.StringToInt(c.Param("roleId")) SysRole.RoleId = id result, err := Menu.SetMenuLable() - tools.HasError(err, "抱歉未找到相关信息", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } menuIds := make([]int, 0) if id != 0 { menuIds, err = SysRole.GetRoleMeunId() - tools.HasError(err, "抱歉未找到相关信息", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } } app.Custum(c, gin.H{ "code": 200, @@ -76,7 +88,10 @@ func GetMenuTreeRoleselect(c *gin.Context) { func GetMenuTreeelect(c *gin.Context) { var data system.Menu result, err := data.SetMenuLable() - tools.HasError(err, "抱歉未找到相关信息", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } app.OK(c, result, "") } @@ -98,10 +113,16 @@ func GetMenuTreeelect(c *gin.Context) { func InsertMenu(c *gin.Context) { var data system.Menu err := c.BindWith(&data, binding.JSON) - tools.HasError(err, "抱歉未找到相关信息", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } data.CreateBy = tools.GetUserIdStr(c) result, err := data.Create() - tools.HasError(err, "抱歉未找到相关信息", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } app.OK(c, result, "") } @@ -118,11 +139,17 @@ func InsertMenu(c *gin.Context) { // @Security Bearer func UpdateMenu(c *gin.Context) { var data system.Menu - err2 := c.BindWith(&data, binding.JSON) + err := c.BindWith(&data, binding.JSON) + if err != nil { + app.Error(c, -1, err, "") + return + } data.UpdateBy = tools.GetUserIdStr(c) - tools.HasError(err2, "修改失败", -1) - _, err := data.Update(data.MenuId) - tools.HasError(err, "", 501) + _, err = data.Update(data.MenuId) + if err != nil { + app.Error(c, -1, err, "") + return + } app.OK(c, "", "修改成功") } @@ -137,9 +164,13 @@ func UpdateMenu(c *gin.Context) { func DeleteMenu(c *gin.Context) { var data system.Menu id, _ := tools.StringToInt(c.Param("id")) + data.UpdateBy = tools.GetUserIdStr(c) _, err := data.Delete(id) - tools.HasError(err, "删除失败", 500) + if err != nil { + app.Error(c, -1, err, "") + return + } app.OK(c, "", "删除成功") } @@ -154,7 +185,10 @@ func DeleteMenu(c *gin.Context) { func GetMenuRole(c *gin.Context) { var Menu system.Menu result, err := Menu.SetMenuRole(tools.GetRoleName(c)) - tools.HasError(err, "获取失败", 500) + if err != nil { + app.Error(c, -1, err, "") + return + } app.OK(c, result, "") } @@ -171,6 +205,9 @@ func GetMenuIDS(c *gin.Context) { data.RoleName = c.GetString("role") data.UpdateBy = tools.GetUserIdStr(c) result, err := data.GetIDS() - tools.HasError(err, "获取失败", 500) + if err != nil { + app.Error(c, -1, err, "") + return + } app.OK(c, result, "") } diff --git a/apis/system/post.go b/apis/system/post.go index 22fddcd..80e6f10 100644 --- a/apis/system/post.go +++ b/apis/system/post.go @@ -19,10 +19,12 @@ import ( // @Router /api/v1/post [get] // @Security func GetPostList(c *gin.Context) { - var data system.Post - var err error - var pageSize = 10 - var pageIndex = 1 + var ( + data system.Post + err error + pageSize = 10 + pageIndex = 1 + ) if size := c.Request.FormValue("pageSize"); size != "" { pageSize = tools.StrToInt(err, size) @@ -32,15 +34,17 @@ func GetPostList(c *gin.Context) { pageIndex = tools.StrToInt(err, index) } - id := c.Request.FormValue("postId") - data.PostId, _ = tools.StringToInt(id) + data.PostId, _ = tools.StringToInt(c.Request.FormValue("postId")) data.PostCode = c.Request.FormValue("postCode") data.PostName = c.Request.FormValue("postName") data.Status = c.Request.FormValue("status") result, count, err := data.GetPage(pageSize, pageIndex) - tools.HasError(err, "", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } app.PageOK(c, result, count, pageIndex, pageSize, "") } @@ -52,10 +56,17 @@ func GetPostList(c *gin.Context) { // @Router /api/v1/post/{postId} [get] // @Security func GetPost(c *gin.Context) { - var Post system.Post - Post.PostId, _ = tools.StringToInt(c.Param("postId")) + var ( + err error + Post system.Post + ) + Post.PostId, err = tools.StringToInt(c.Param("postId")) + result, err := Post.Get() - tools.HasError(err, "抱歉未找到相关信息", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } app.OK(c, result, "") } @@ -72,10 +83,16 @@ func GetPost(c *gin.Context) { func InsertPost(c *gin.Context) { var data system.Post err := c.Bind(&data) + if err != nil { + app.Error(c, -1, err, "") + return + } data.CreateBy = tools.GetUserIdStr(c) - tools.HasError(err, "", 500) result, err := data.Create() - tools.HasError(err, "", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } app.OK(c, result, "") } @@ -93,10 +110,16 @@ func UpdatePost(c *gin.Context) { var data system.Post err := c.Bind(&data) + if err != nil { + app.Error(c, -1, err, "") + return + } data.UpdateBy = tools.GetUserIdStr(c) - tools.HasError(err, "", -1) result, err := data.Update(data.PostId) - tools.HasError(err, "", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } app.OK(c, result, "修改成功") } @@ -112,6 +135,9 @@ func DeletePost(c *gin.Context) { data.UpdateBy = tools.GetUserIdStr(c) IDS := tools.IdsStrToIdsIntGroup("postId", c) result, err := data.BatchDelete(IDS) - tools.HasError(err, "删除失败", 500) + if err != nil { + app.Error(c, -1, err, "") + return + } app.OK(c, result, "删除成功") } diff --git a/apis/system/role.go b/apis/system/role.go index ebba668..f16909b 100644 --- a/apis/system/role.go +++ b/apis/system/role.go @@ -21,10 +21,12 @@ import ( // @Router /api/v1/rolelist [get] // @Security func GetRoleList(c *gin.Context) { - var data system.SysRole - var err error - var pageSize = 10 - var pageIndex = 1 + var ( + err error + pageSize = 10 + pageIndex = 1 + data system.SysRole + ) if size := c.Request.FormValue("pageSize"); size != "" { pageSize = tools.StrToInt(err, size) @@ -38,7 +40,10 @@ func GetRoleList(c *gin.Context) { data.RoleName = c.Request.FormValue("roleName") data.Status = c.Request.FormValue("status") result, count, err := data.GetPage(pageSize, pageIndex) - tools.HasError(err, "", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } app.PageOK(c, result, count, pageIndex, pageSize, "") } @@ -52,11 +57,22 @@ func GetRoleList(c *gin.Context) { // @Router /api/v1/role [get] // @Security Bearer func GetRole(c *gin.Context) { - var Role system.SysRole + var ( + err error + Role system.SysRole + ) Role.RoleId, _ = tools.StringToInt(c.Param("roleId")) - result, _ := Role.Get() + + result, err := Role.Get() + if err != nil { + app.Error(c, -1, err, "") + return + } menuIds, err := Role.GetRoleMeunId() - tools.HasError(err, "抱歉未找到相关信息", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } result.MenuIds = menuIds app.OK(c, result, "") @@ -75,13 +91,22 @@ func InsertRole(c *gin.Context) { var data system.SysRole data.CreateBy = tools.GetUserIdStr(c) err := c.BindWith(&data, binding.JSON) - tools.HasError(err, "", 500) + if err != nil { + app.Error(c, -1, err, "") + return + } id, err := data.Insert() + if err != nil { + app.Error(c, -1, err, "") + return + } data.RoleId = id - tools.HasError(err, "", -1) var t system.RoleMenu _, err = t.Insert(id, data.MenuIds) - tools.HasError(err, "", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } app.OK(c, data, "添加成功") } @@ -95,17 +120,32 @@ func InsertRole(c *gin.Context) { // @Success 200 {string} string "{"code": -1, "message": "修改失败"}" // @Router /api/v1/role [put] func UpdateRole(c *gin.Context) { - var data system.SysRole + var ( + data system.SysRole + t system.RoleMenu + err error + ) data.UpdateBy = tools.GetUserIdStr(c) - err := c.Bind(&data) - tools.HasError(err, "数据解析失败", -1) + err = c.Bind(&data) + if err != nil { + app.Error(c, -1, err, "") + return + } result, err := data.Update(data.RoleId) - tools.HasError(err, "", -1) - var t system.RoleMenu + if err != nil { + app.Error(c, -1, err, "") + return + } _, err = t.DeleteRoleMenu(data.RoleId) - tools.HasError(err, "添加失败1", -1) - _, err2 := t.Insert(data.RoleId, data.MenuIds) - tools.HasError(err2, "添加失败2", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } + _, err = t.Insert(data.RoleId, data.MenuIds) + if err != nil { + app.Error(c, -1, err, "") + return + } app.OK(c, result, "修改成功") } @@ -123,9 +163,15 @@ func DeleteRole(c *gin.Context) { IDS := tools.IdsStrToIdsIntGroup("roleId", c) _, err := Role.BatchDelete(IDS) - tools.HasError(err, "删除失败1", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } var t system.RoleMenu _, err = t.BatchDeleteRoleMenu(IDS) - tools.HasError(err, "删除失败1", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } app.OK(c, "", "删除成功") } diff --git a/apis/system/rolemenu.go b/apis/system/rolemenu.go index fb87a2e..f44e089 100644 --- a/apis/system/rolemenu.go +++ b/apis/system/rolemenu.go @@ -3,7 +3,6 @@ package system import ( "ferry/models/system" "ferry/tools/app" - "fmt" "net/http" "github.com/gin-gonic/gin" @@ -18,13 +17,14 @@ import ( // @Router /api/v1/rolemenu [get] // @Security Bearer func GetRoleMenu(c *gin.Context) { - var Rm system.RoleMenu + var ( + res app.Response + Rm system.RoleMenu + ) _ = c.ShouldBind(&Rm) result, err := Rm.Get() - var res app.Response if err != nil { - res.Msg = "抱歉未找到相关信息" - c.JSON(http.StatusOK, res.ReturnError(200)) + app.Error(c, -1, err, "") return } res.Data = result @@ -55,12 +55,9 @@ func DeleteRoleMenu(c *gin.Context) { var t system.RoleMenu id := c.Param("id") menuId := c.Request.FormValue("menu_id") - fmt.Println(menuId) _, err := t.Delete(id, menuId) if err != nil { - var res app.Response - res.Msg = "删除失败" - c.JSON(http.StatusOK, res.ReturnError(200)) + app.Error(c, -1, err, "") return } var res app.Response diff --git a/apis/system/sysuser.go b/apis/system/sysuser.go index 4d5228e..48fa3ee 100644 --- a/apis/system/sysuser.go +++ b/apis/system/sysuser.go @@ -20,10 +20,12 @@ import ( // @Router /api/v1/sysUserList [get] // @Security Bearer func GetSysUserList(c *gin.Context) { - var data system.SysUser - var err error - var pageSize = 10 - var pageIndex = 1 + var ( + pageIndex = 1 + pageSize = 10 + err error + data system.SysUser + ) size := c.Request.FormValue("pageSize") if size != "" { @@ -46,7 +48,10 @@ func GetSysUserList(c *gin.Context) { data.DeptId, _ = tools.StringToInt(deptId) result, count, err := data.GetPage(pageSize, pageIndex) - tools.HasError(err, "", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } app.PageOK(c, result, count, pageIndex, pageSize, "") } @@ -62,7 +67,10 @@ func GetSysUser(c *gin.Context) { var SysUser system.SysUser SysUser.UserId, _ = tools.StringToInt(c.Param("userId")) result, err := SysUser.Get() - tools.HasError(err, "抱歉未找到相关信息", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } var SysRole system.SysRole var Post system.Post roles, _ := SysRole.GetList() @@ -90,21 +98,38 @@ func GetSysUser(c *gin.Context) { // @Router /api/v1/user/profile [get] // @Security func GetSysUserProfile(c *gin.Context) { - var SysUser system.SysUser + var ( + Dept system.Dept + Post system.Post + SysRole system.SysRole + SysUser system.SysUser + ) userId := tools.GetUserIdStr(c) SysUser.UserId, _ = tools.StringToInt(userId) result, err := SysUser.Get() - tools.HasError(err, "抱歉未找到相关信息", -1) - var SysRole system.SysRole - var Post system.Post - var Dept system.Dept + if err != nil { + app.Error(c, -1, err, "") + return + } //获取角色列表 - roles, _ := SysRole.GetList() + roles, err := SysRole.GetList() + if err != nil { + app.Error(c, -1, err, "") + return + } //获取职位列表 - posts, _ := Post.GetList() + posts, err := Post.GetList() + if err != nil { + app.Error(c, -1, err, "") + return + } //获取部门列表 Dept.DeptId = result.DeptId - dept, _ := Dept.Get() + dept, err := Dept.Get() + if err != nil { + app.Error(c, -1, err, "") + return + } postIds := make([]int, 0) postIds = append(postIds, result.PostId) @@ -133,9 +158,15 @@ func GetSysUserInit(c *gin.Context) { var SysRole system.SysRole var Post system.Post roles, err := SysRole.GetList() - tools.HasError(err, "抱歉未找到相关信息", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } posts, err := Post.GetList() - tools.HasError(err, "抱歉未找到相关信息", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } mp := make(map[string]interface{}, 2) mp["roles"] = roles mp["posts"] = posts @@ -154,11 +185,17 @@ func GetSysUserInit(c *gin.Context) { func InsertSysUser(c *gin.Context) { var sysuser system.SysUser err := c.BindWith(&sysuser, binding.JSON) - tools.HasError(err, "非法数据格式", 500) + if err != nil { + app.Error(c, -1, err, "") + return + } sysuser.CreateBy = tools.GetUserIdStr(c) id, err := sysuser.Insert() - tools.HasError(err, "添加失败", 500) + if err != nil { + app.Error(c, -1, err, "") + return + } app.OK(c, id, "添加成功") } @@ -174,10 +211,16 @@ func InsertSysUser(c *gin.Context) { func UpdateSysUser(c *gin.Context) { var data system.SysUser err := c.Bind(&data) - tools.HasError(err, "数据解析失败", -1) + if err != nil { + app.Error(c, -1, err, "") + return + } data.UpdateBy = tools.GetUserIdStr(c) result, err := data.Update(data.UserId) - tools.HasError(err, "修改失败", 500) + if err != nil { + app.Error(c, -1, err, "") + return + } app.OK(c, result, "修改成功") } @@ -193,7 +236,10 @@ func DeleteSysUser(c *gin.Context) { data.UpdateBy = tools.GetUserIdStr(c) IDS := tools.IdsStrToIdsIntGroup("userId", c) result, err := data.BatchDelete(IDS) - tools.HasError(err, "删除失败", 500) + if err != nil { + app.Error(c, -1, err, "") + return + } app.OK(c, result, "删除成功") } @@ -206,14 +252,22 @@ func DeleteSysUser(c *gin.Context) { // @Success 200 {string} string "{"code": -1, "message": "添加失败"}" // @Router /api/v1/user/profileAvatar [post] func InsetSysUserAvatar(c *gin.Context) { - form, _ := c.MultipartForm() + form, err := c.MultipartForm() + if err != nil { + app.Error(c, -1, err, "") + return + } files := form.File["upload[]"] guid := uuid.New().String() filPath := "static/uploadfile/" + guid + ".jpg" for _, file := range files { log.Println(file.Filename) // 上传文件至指定目录 - _ = c.SaveUploadedFile(file, filPath) + err = c.SaveUploadedFile(file, filPath) + if err != nil { + app.Error(c, -1, err, "") + return + } } sysuser := system.SysUser{} sysuser.UserId = tools.GetUserId(c) @@ -226,9 +280,16 @@ func InsetSysUserAvatar(c *gin.Context) { func SysUserUpdatePwd(c *gin.Context) { var pwd system.SysUserPwd err := c.Bind(&pwd) - tools.HasError(err, "数据解析失败", 500) + if err != nil { + app.Error(c, -1, err, "") + return + } sysuser := system.SysUser{} sysuser.UserId = tools.GetUserId(c) - _, _ = sysuser.SetPwd(pwd) + _, err = sysuser.SetPwd(pwd) + if err != nil { + app.Error(c, -1, err, "") + return + } app.OK(c, "", "密码修改成功") } diff --git a/router/process/process.go b/router/process/process.go index 8090623..4718923 100644 --- a/router/process/process.go +++ b/router/process/process.go @@ -5,19 +5,21 @@ package process */ import ( + "ferry/apis/process" + "ferry/middleware" jwt "ferry/pkg/jwtauth" "github.com/gin-gonic/gin" ) func RegisterProcessRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - //processRouter := v1.Group("/process").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) - //{ - //processRouter.GET("/classify", process.ClassifyProcessList) - //processRouter.GET("", process.ProcessList) - //processRouter.POST("", process.CreateProcess) - //processRouter.PUT("", process.UpdateProcess) - //processRouter.DELETE("", process.DeleteProcess) - //processRouter.GET("/details", process.ProcessDetails) - //} + processRouter := v1.Group("/process").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) + { + //processRouter.GET("/classify", process.ClassifyProcessList) + processRouter.GET("", process.ProcessList) + processRouter.POST("", process.CreateProcess) + processRouter.PUT("", process.UpdateProcess) + //processRouter.DELETE("", process.DeleteProcess) + processRouter.GET("/details", process.ProcessDetails) + } } diff --git a/tools/app/msg/message.go b/tools/app/msg/message.go index 8e239c2..aafd31b 100644 --- a/tools/app/msg/message.go +++ b/tools/app/msg/message.go @@ -4,7 +4,6 @@ var ( CreatedSuccess = "创建成功！" UpdatedSuccess = "更新成功！" DeletedSuccess = "删除成功！" - DeletedFail = "删除失败！" GetSuccess = "查询成功！" NotFound = "未找到相关内容或者数据为空！" )