修复树表上级关系绑定验证，优化CURD代码生成

2025-10-15 14:33:45 +08:00 · 2023-05-29 20:24:13 +08:00
parent d8024d73f8
commit c8a808fcfd
49 changed files with 1453 additions and 1001 deletions
--- a/server/internal/controller/admin/admin/cash.go
+++ b/server/internal/controller/admin/admin/cash.go
@@ -22,27 +22,27 @@ var (
 type cCash struct{}

 // View 获取指定信息
-func (c *cCash) View(ctx context.Context, req *cash.ViewReq) (*cash.ViewRes, error) {
+func (c *cCash) View(ctx context.Context, req *cash.ViewReq) (res *cash.ViewRes, err error) {
 	data, err := service.AdminCash().View(ctx, adminin.CashViewInp{Id: req.Id})
 	if err != nil {
-		return nil, err
+		return
 	}

-	var res cash.ViewRes
+	res = new(cash.ViewRes)
 	res.CashViewModel = data
-	return &res, nil
+	return
 }

 // List 查看列表
 func (c *cCash) List(ctx context.Context, req *cash.ListReq) (res *cash.ListRes, err error) {
 	var in adminin.CashListInp
 	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
+		return
 	}

 	list, totalCount, err := service.AdminCash().List(ctx, in)
 	if err != nil {
-		return nil, err
+		return
 	}

 	res = new(cash.ListRes)
--- a/server/internal/controller/admin/admin/credits_log.go
+++ b/server/internal/controller/admin/admin/credits_log.go
@@ -65,7 +65,7 @@ func (c *cCreditsLog) Export(ctx context.Context, req *creditslog.ExportReq) (re
 }

 // Option 获取变动状态选项
-func (c *cCreditsLog) Option(ctx context.Context, req *creditslog.OptionReq) (res *creditslog.OptionRes, err error) {
+func (c *cCreditsLog) Option(_ context.Context, _ *creditslog.OptionReq) (res *creditslog.OptionRes, err error) {
 	res = &creditslog.OptionRes{
 		CreditType:  consts.CreditTypeOptions,
 		CreditGroup: consts.CreditGroupOptions,
--- a/server/internal/controller/admin/admin/dept.go
+++ b/server/internal/controller/admin/admin/dept.go
@@ -12,6 +12,7 @@ import (
 	"hotgo/internal/model/input/adminin"
 	"hotgo/internal/model/input/form"
 	"hotgo/internal/service"
+	"hotgo/utility/validate"
 )

 var (
@@ -20,18 +21,6 @@ var (

 type cDept struct{}

-// NameUnique 名称是否唯一
-func (c *cDept) NameUnique(ctx context.Context, req *dept.NameUniqueReq) (res *dept.NameUniqueRes, err error) {
-	data, err := service.AdminDept().NameUnique(ctx, adminin.DeptNameUniqueInp{Id: req.Id, Name: req.Name})
-	if err != nil {
-		return
-	}
-
-	res = new(dept.NameUniqueRes)
-	res.IsUnique = data.IsUnique
-	return
-}
-
 // Delete 删除
 func (c *cDept) Delete(ctx context.Context, req *dept.DeleteReq) (res *dept.DeleteRes, err error) {
 	var in adminin.DeptDeleteInp
@@ -50,6 +39,10 @@ func (c *cDept) Edit(ctx context.Context, req *dept.EditReq) (res *dept.EditRes,
 		return nil, err
 	}

+	if err = validate.PreFilter(ctx, &in); err != nil {
+		return
+	}
+
 	err = service.AdminDept().Edit(ctx, in)
 	return
 }
@@ -102,6 +95,10 @@ func (c *cDept) Status(ctx context.Context, req *dept.StatusReq) (res *dept.Stat
 		return
 	}

+	if err = validate.PreFilter(ctx, &in); err != nil {
+		return
+	}
+
 	err = service.AdminDept().Status(ctx, in)
 	return
 }
--- a/server/internal/controller/admin/admin/member.go
+++ b/server/internal/controller/admin/admin/member.go
@@ -115,6 +115,10 @@ func (c *cMember) Delete(ctx context.Context, req *member.DeleteReq) (res *membe
 		return
 	}

+	if err = validate.PreFilter(ctx, &in); err != nil {
+		return
+	}
+
 	err = service.AdminMember().Delete(ctx, in)
 	return
 }
@@ -174,12 +178,16 @@ func (c *cMember) Status(ctx context.Context, req *member.StatusReq) (res *membe
 		return
 	}

+	if err = validate.PreFilter(ctx, &in); err != nil {
+		return
+	}
+
 	err = service.AdminMember().Status(ctx, in)
 	return
 }

 // Select 获取可选的后台用户选项
-func (c *cMember) Select(ctx context.Context, req *member.SelectReq) (res *member.SelectRes, err error) {
+func (c *cMember) Select(ctx context.Context, _ *member.SelectReq) (res *member.SelectRes, err error) {
 	data, err := service.AdminMember().Select(ctx, adminin.MemberSelectInp{})
 	if err != nil {
 		return
--- a/server/internal/controller/admin/admin/role.go
+++ b/server/internal/controller/admin/admin/role.go
@@ -13,6 +13,7 @@ import (
 	"hotgo/internal/model/input/adminin"
 	"hotgo/internal/model/input/form"
 	"hotgo/internal/service"
+	"hotgo/utility/validate"
 )

 var (
@@ -21,26 +22,6 @@ var (

 type cRole struct{}

-// RoleMemberList 获取角色下的用户列表
-func (c *cRole) RoleMemberList(ctx context.Context, req *role.MemberListReq) (res *role.MemberListRes, err error) {
-	var in adminin.RoleMemberListInp
-	if err = gconv.Scan(req, &in); err != nil {
-		return
-	}
-
-	list, totalCount, err := service.AdminMember().RoleMemberList(ctx, in)
-	if err != nil {
-		return
-	}
-
-	res = new(role.MemberListRes)
-	res.List = list
-	res.PageCount = form.CalPageCount(totalCount, req.PerPage)
-	res.PerPage = req.Page
-	res.PerPage = req.PerPage
-	return
-}
-
 // List 获取列表
 func (c *cRole) List(ctx context.Context, req *role.ListReq) (res *role.ListRes, err error) {
 	var in adminin.RoleListInp
@@ -63,49 +44,79 @@ func (c *cRole) List(ctx context.Context, req *role.ListReq) (res *role.ListRes,

 // Edit 修改角色
 func (c *cRole) Edit(ctx context.Context, req *role.EditReq) (res *role.EditRes, err error) {
-	err = service.AdminRole().Edit(ctx, req)
+	var in adminin.RoleEditInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return
+	}
+
+	if err = validate.PreFilter(ctx, &in); err != nil {
+		return
+	}
+
+	err = service.AdminRole().Edit(ctx, in)
 	return
 }

 // Delete 删除
 func (c *cRole) Delete(ctx context.Context, req *role.DeleteReq) (res *role.DeleteRes, err error) {
-	err = service.AdminRole().Delete(ctx, req)
+	var in adminin.RoleDeleteInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return
+	}
+
+	if err = validate.PreFilter(ctx, &in); err != nil {
+		return
+	}
+
+	err = service.AdminRole().Delete(ctx, in)
 	return
 }

 // Dynamic 动态路由
-func (c *cRole) Dynamic(ctx context.Context, req *role.DynamicReq) (res role.DynamicRes, err error) {
+func (c *cRole) Dynamic(ctx context.Context, _ *role.DynamicReq) (res *role.DynamicRes, err error) {
 	return service.AdminMenu().GetMenuList(ctx, contexts.GetUserId(ctx))
 }

 // GetPermissions 获取指定角色权限
 func (c *cRole) GetPermissions(ctx context.Context, req *role.GetPermissionsReq) (res *role.GetPermissionsRes, err error) {
-	MenuIds, err := service.AdminRole().GetPermissions(ctx, req)
+	var in adminin.GetPermissionsInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return
+	}
+
+	if err = validate.PreFilter(ctx, &in); err != nil {
+		return
+	}
+
+	data, err := service.AdminRole().GetPermissions(ctx, in)
 	if err != nil {
-		return nil, err
+		return
 	}

-	res = &role.GetPermissionsRes{
-		MenuIds: []int64{},
-	}
-
-	if MenuIds != nil {
-		res.MenuIds = MenuIds
-	}
-	return res, nil
+	res = new(role.GetPermissionsRes)
+	res.GetPermissionsModel = data
+	return
 }

 // UpdatePermissions 修改角色菜单权限
 func (c *cRole) UpdatePermissions(ctx context.Context, req *role.UpdatePermissionsReq) (res *role.UpdatePermissionsRes, err error) {
-	err = service.AdminRole().UpdatePermissions(ctx, req)
+	var in adminin.UpdatePermissionsInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return
+	}
+
+	if err = validate.PreFilter(ctx, &in); err != nil {
+		return
+	}
+
+	err = service.AdminRole().UpdatePermissions(ctx, in)
 	return
 }

 // DataScopeSelect 获取数据权限选项
-func (c *cRole) DataScopeSelect(ctx context.Context, _ *role.DataScopeSelectReq) (res *role.DataScopeSelectRes, err error) {
-	data := service.AdminRole().DataScopeSelect(ctx)
+func (c *cRole) DataScopeSelect(_ context.Context, _ *role.DataScopeSelectReq) (res *role.DataScopeSelectRes, err error) {
 	res = new(role.DataScopeSelectRes)
-	res.List = data
+	res.List = service.AdminRole().DataScopeSelect()
 	return
 }

@@ -117,6 +128,10 @@ func (c *cRole) DataScopeEdit(ctx context.Context, req *role.DataScopeEditReq) (
 	}

 	in.CustomDept = req.CustomDept
+	if err = validate.PreFilter(ctx, &in); err != nil {
+		return
+	}
+
 	err = service.AdminRole().DataScopeEdit(ctx, &in)
 	return
 }
--- a/server/internal/controller/admin/sys/cron_group.go
+++ b/server/internal/controller/admin/sys/cron_group.go
@@ -12,6 +12,7 @@ import (
 	"hotgo/internal/model/input/form"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"
+	"hotgo/utility/validate"
 )

 var (
@@ -38,6 +39,10 @@ func (c *cCronGroup) Edit(ctx context.Context, req *cron.GroupEditReq) (res *cro
 		return
 	}

+	if err = validate.PreFilter(ctx, &in); err != nil {
+		return
+	}
+
 	err = service.SysCronGroup().Edit(ctx, in)
 	return res, nil
 }
@@ -93,6 +98,10 @@ func (c *cCronGroup) Status(ctx context.Context, req *cron.GroupStatusReq) (res
 		return
 	}

+	if err = validate.PreFilter(ctx, &in); err != nil {
+		return
+	}
+
 	err = service.SysCronGroup().Status(ctx, in)
 	return res, nil
 }
--- a/server/internal/controller/admin/sys/curd_demo.go
+++ b/server/internal/controller/admin/sys/curd_demo.go
@@ -3,8 +3,7 @@
 // @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
-// @AutoGenerate Version 2.5.3
-// @AutoGenerate Date 2023-04-28 15:28:40
+// @AutoGenerate Version 2.7.3
 package sys

 import (
--- a/server/internal/controller/admin/sys/dict_data.go
+++ b/server/internal/controller/admin/sys/dict_data.go
@@ -13,6 +13,7 @@ import (
 	"hotgo/internal/model/input/form"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"
+	"hotgo/utility/validate"
 )

 var (
@@ -39,6 +40,10 @@ func (c *cDictData) Edit(ctx context.Context, req *dict.DataEditReq) (res *dict.
 		return
 	}

+	if err = validate.PreFilter(ctx, &in); err != nil {
+		return
+	}
+
 	err = service.SysDictData().Edit(ctx, in)
 	return
 }
--- a/server/internal/controller/admin/sys/dict_type.go
+++ b/server/internal/controller/admin/sys/dict_type.go
@@ -11,6 +11,7 @@ import (
 	"hotgo/api/admin/dict"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"
+	"hotgo/utility/validate"
 )

 var (
@@ -44,6 +45,10 @@ func (c *cDictType) Edit(ctx context.Context, req *dict.TypeEditReq) (res *dict.
 		return
 	}

+	if err = validate.PreFilter(ctx, &in); err != nil {
+		return
+	}
+
 	err = service.SysDictType().Edit(ctx, in)
 	return
 }
--- a/server/internal/controller/admin/sys/provinces.go
+++ b/server/internal/controller/admin/sys/provinces.go
@@ -3,7 +3,6 @@
 // @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
-//
 package sys

 import (
@@ -14,6 +13,7 @@ import (
 	"hotgo/internal/model/input/form"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"
+	"hotgo/utility/validate"
 )

 var (
@@ -23,7 +23,7 @@ var (
 type cProvinces struct{}

 // Tree 关系树选项列表
-func (c *cProvinces) Tree(ctx context.Context, req *provinces.TreeReq) (res *provinces.TreeRes, err error) {
+func (c *cProvinces) Tree(ctx context.Context, _ *provinces.TreeReq) (res *provinces.TreeRes, err error) {
 	res = new(provinces.TreeRes)
 	res.List, err = service.SysProvinces().Tree(ctx)
 	return
@@ -47,6 +47,10 @@ func (c *cProvinces) Edit(ctx context.Context, req *provinces.EditReq) (res *pro
 		return
 	}

+	if err = validate.PreFilter(ctx, &in); err != nil {
+		return
+	}
+
 	err = service.SysProvinces().Edit(ctx, in)
 	return
 }
@@ -102,6 +106,10 @@ func (c *cProvinces) Status(ctx context.Context, req *provinces.StatusReq) (res
 		return
 	}

+	if err = validate.PreFilter(ctx, &in); err != nil {
+		return
+	}
+
 	err = service.SysProvinces().Status(ctx, in)
 	return
 }