From b171122a32d43a2ccce08d25168c1c1ef3af9a7f Mon Sep 17 00:00:00 2001 From: kenneth <1185230223@qq.com> Date: Tue, 17 Jun 2025 15:56:05 +0800 Subject: [PATCH] update --- .../erpserver/handler/system/audit/audit.go | 6 +++--- .../erpserver/handler/system/config/config.go | 8 ++++---- .../handler/system/department/department.go | 12 ++++++------ .../handler/system/loginlog/login_log.go | 6 +++--- internal/erpserver/handler/system/menu/menu.go | 12 ++++++------ internal/erpserver/handler/system/role/role.go | 18 +++++++++--------- internal/erpserver/handler/system/user/user.go | 13 ++++++------- internal/pkg/convertor/http_form.go | 6 +++--- 8 files changed, 40 insertions(+), 41 deletions(-) diff --git a/internal/erpserver/handler/system/audit/audit.go b/internal/erpserver/handler/system/audit/audit.go index ee1f45a..064fb7f 100644 --- a/internal/erpserver/handler/system/audit/audit.go +++ b/internal/erpserver/handler/system/audit/audit.go @@ -29,11 +29,11 @@ func (a *app) list(w http.ResponseWriter, r *http.Request) { a.render.Render(ctx, w, auditlog.List(ctx)) case http.MethodPost: var q dto.SearchDto - q.SearchTimeBegin, q.SearchTimeEnd = convertor.DefaultStartTimeAndEndTime(r.PostFormValue("timeBegin"), r.PostFormValue("timeEnd")) + q.SearchTimeBegin, q.SearchTimeEnd = convertor.DefaultTime(r.PostFormValue("timeBegin"), r.PostFormValue("timeEnd")) q.SearchName = r.PostFormValue("name") q.SearchEmail = r.PostFormValue("email") - q.Page = convertor.ConvertInt(r.PostFormValue("page"), 1) - q.Rows = convertor.ConvertInt(r.PostFormValue("rows"), 10) + q.Page = convertor.Int(r.PostFormValue("page"), 1) + q.Rows = convertor.Int(r.PostFormValue("rows"), 10) res, count, err := a.auditLogService.List(r.Context(), q) if err != nil { a.render.JSONErr(w, err.Error()) diff --git a/internal/erpserver/handler/system/config/config.go b/internal/erpserver/handler/system/config/config.go index 0ea620e..4d13ffe 100644 --- a/internal/erpserver/handler/system/config/config.go +++ b/internal/erpserver/handler/system/config/config.go @@ -34,10 +34,10 @@ func (a *app) list(w http.ResponseWriter, r *http.Request) { a.render.Render(ctx, w, config.List(ctx)) case http.MethodPost: var q dto.SearchDto - q.SearchTimeBegin, q.SearchTimeEnd = convertor.DefaultStartTimeAndEndTime(r.PostFormValue("timeBegin"), r.PostFormValue("timeEnd")) + q.SearchTimeBegin, q.SearchTimeEnd = convertor.DefaultTime(r.PostFormValue("timeBegin"), r.PostFormValue("timeEnd")) q.SearchName = r.PostFormValue("name") - q.Page = convertor.ConvertInt(r.PostFormValue("page"), 1) - q.Rows = convertor.ConvertInt(r.PostFormValue("rows"), 10) + q.Page = convertor.Int(r.PostFormValue("page"), 1) + q.Rows = convertor.Int(r.PostFormValue("rows"), 10) ctx := r.Context() res, count, err := a.configService.List(ctx, q) if err != nil { @@ -71,7 +71,7 @@ func (a *app) edit(w http.ResponseWriter, r *http.Request) { } func (a *app) save(w http.ResponseWriter, r *http.Request) { - id := convertor.ConvertInt[int32](r.PostFormValue("ID"), 0) + id := convertor.Int[int32](r.PostFormValue("ID"), 0) key := r.PostFormValue("Key") value := r.PostFormValue("Value") if len(key) == 0 { diff --git a/internal/erpserver/handler/system/department/department.go b/internal/erpserver/handler/system/department/department.go index 3bec746..4a549b8 100644 --- a/internal/erpserver/handler/system/department/department.go +++ b/internal/erpserver/handler/system/department/department.go @@ -32,13 +32,13 @@ func (a *app) list(w http.ResponseWriter, r *http.Request) { a.render.Render(ctx, w, department.List(ctx)) case http.MethodPost: var q dto.SearchDto - q.SearchTimeBegin, q.SearchTimeEnd = convertor.DefaultStartTimeAndEndTime(r.PostFormValue("timeBegin"), r.PostFormValue("timeEnd")) - q.SearchStatus = convertor.ConvertInt(r.PostFormValue("status"), 9999) - q.SearchParentID = convertor.ConvertInt(r.PostFormValue("parentId"), 0) + q.SearchTimeBegin, q.SearchTimeEnd = convertor.DefaultTime(r.PostFormValue("timeBegin"), r.PostFormValue("timeEnd")) + q.SearchStatus = convertor.Int(r.PostFormValue("status"), 9999) + q.SearchParentID = convertor.Int(r.PostFormValue("parentId"), 0) q.SearchName = r.PostFormValue("name") - q.SearchID = convertor.ConvertInt[int64](r.PostFormValue("id"), 0) - q.Page = convertor.ConvertInt(r.PostFormValue("page"), 1) - q.Rows = convertor.ConvertInt(r.PostFormValue("rows"), 10) + q.SearchID = convertor.Int[int64](r.PostFormValue("id"), 0) + q.Page = convertor.Int(r.PostFormValue("page"), 1) + q.Rows = convertor.Int(r.PostFormValue("rows"), 10) res, count, err := a.departmentService.List(r.Context(), q) if err != nil { a.render.JSONErr(w, err.Error()) diff --git a/internal/erpserver/handler/system/loginlog/login_log.go b/internal/erpserver/handler/system/loginlog/login_log.go index b3976e8..af34a92 100644 --- a/internal/erpserver/handler/system/loginlog/login_log.go +++ b/internal/erpserver/handler/system/loginlog/login_log.go @@ -29,10 +29,10 @@ func (a *app) list(w http.ResponseWriter, r *http.Request) { a.render.Render(ctx, w, loginlog.List(ctx)) case http.MethodPost: var q dto.SearchDto - q.SearchTimeBegin, q.SearchTimeEnd = convertor.DefaultStartTimeAndEndTime(r.PostFormValue("timeBegin"), r.PostFormValue("timeEnd")) + q.SearchTimeBegin, q.SearchTimeEnd = convertor.DefaultTime(r.PostFormValue("timeBegin"), r.PostFormValue("timeEnd")) q.SearchEmail = r.PostFormValue("email") - q.Page = convertor.ConvertInt(r.PostFormValue("page"), 1) - q.Rows = convertor.ConvertInt(r.PostFormValue("rows"), 10) + q.Page = convertor.Int(r.PostFormValue("page"), 1) + q.Rows = convertor.Int(r.PostFormValue("rows"), 10) res, count, err := a.loginLogService.List(r.Context(), q) if err != nil { a.render.JSONErr(w, err.Error()) diff --git a/internal/erpserver/handler/system/menu/menu.go b/internal/erpserver/handler/system/menu/menu.go index ea0c64d..542b5a2 100644 --- a/internal/erpserver/handler/system/menu/menu.go +++ b/internal/erpserver/handler/system/menu/menu.go @@ -93,7 +93,7 @@ func (a *app) edit(w http.ResponseWriter, r *http.Request) { } func (a *app) save(w http.ResponseWriter, r *http.Request) { - id := convertor.ConvertInt[int32](r.PostFormValue("ID"), 0) + id := convertor.Int[int32](r.PostFormValue("ID"), 0) name := r.PostFormValue("Name") displayName := r.PostFormValue("DisplayName") t := r.PostFormValue("Type") @@ -103,11 +103,11 @@ func (a *app) save(w http.ResponseWriter, r *http.Request) { } avatar := r.PostFormValue("Avatar") style := r.PostFormValue("Style") - parentID := convertor.ConvertInt[int32](r.PostFormValue("ParentID"), 0) - visible := convertor.ConvertBool(r.PostFormValue("Visible"), false) - isList := convertor.ConvertBool(r.PostFormValue("IsList"), false) - sort := convertor.ConvertInt[int32](r.PostFormValue("Sort"), 6666) - status := convertor.ConvertInt[int32](r.PostFormValue("Status"), 0) + parentID := convertor.Int[int32](r.PostFormValue("ParentID"), 0) + visible := convertor.Bool(r.PostFormValue("Visible"), false) + isList := convertor.Bool(r.PostFormValue("IsList"), false) + sort := convertor.Int[int32](r.PostFormValue("Sort"), 6666) + status := convertor.Int[int32](r.PostFormValue("Status"), 0) ctx := r.Context() if len(avatar) > 0 && !strings.Contains(avatar, "layui-icon ") { diff --git a/internal/erpserver/handler/system/role/role.go b/internal/erpserver/handler/system/role/role.go index eb94478..838c248 100644 --- a/internal/erpserver/handler/system/role/role.go +++ b/internal/erpserver/handler/system/role/role.go @@ -36,13 +36,13 @@ func (a *app) list(w http.ResponseWriter, r *http.Request) { a.render.Render(ctx, w, role.List(ctx)) case http.MethodPost: var q dto.SearchDto - q.SearchTimeBegin, q.SearchTimeEnd = convertor.DefaultStartTimeAndEndTime(r.PostFormValue("timeBegin"), r.PostFormValue("timeEnd")) - q.SearchStatus = convertor.ConvertInt(r.PostFormValue("status"), 9999) - q.SearchParentID = convertor.ConvertInt(r.PostFormValue("parentId"), 0) + q.SearchTimeBegin, q.SearchTimeEnd = convertor.DefaultTime(r.PostFormValue("timeBegin"), r.PostFormValue("timeEnd")) + q.SearchStatus = convertor.Int(r.PostFormValue("status"), 9999) + q.SearchParentID = convertor.Int(r.PostFormValue("parentId"), 0) q.SearchName = r.PostFormValue("name") - q.SearchID = convertor.ConvertInt[int64](r.PostFormValue("id"), 0) - q.Page = convertor.ConvertInt(r.PostFormValue("page"), 1) - q.Rows = convertor.ConvertInt(r.PostFormValue("rows"), 10) + q.SearchID = convertor.Int[int64](r.PostFormValue("id"), 0) + q.Page = convertor.Int(r.PostFormValue("page"), 1) + q.Rows = convertor.Int(r.PostFormValue("rows"), 10) res, count, err := a.roleService.List(r.Context(), q) if err != nil { a.render.JSONErr(w, err.Error()) @@ -149,7 +149,7 @@ func (a *app) refreshRoleMenus(w http.ResponseWriter, r *http.Request) { ctx := r.Context() // 获取需要刷新的角色ID - roleID := convertor.ConvertInt[int32](r.PostFormValue("roleID"), 0) + roleID := convertor.Int[int32](r.PostFormValue("roleID"), 0) roleModel, err := a.roleService.Get(ctx, roleID) if err != nil { a.render.JSONErr(w, err.Error()) @@ -204,7 +204,7 @@ func (a *app) setMenu(w http.ResponseWriter, r *http.Request) { a.render.Render(ctx, w, role.SetMenu(ctx, vm)) case http.MethodPost: ctx := r.Context() - id := convertor.ConvertInt[int32](r.PostFormValue("ID"), 0) + id := convertor.Int[int32](r.PostFormValue("ID"), 0) if id == 0 { a.render.JSONErr(w, "角色异常, 请刷新重试") return @@ -228,7 +228,7 @@ func (a *app) setMenu(w http.ResponseWriter, r *http.Request) { var rms []*system.RoleMenu for _, v := range menuArr { - menuID := convertor.ConvertInt(v, 0) + menuID := convertor.Int(v, 0) if menuID > 0 { menu, err := a.menuService.Get(ctx, int32(menuID)) if err != nil { diff --git a/internal/erpserver/handler/system/user/user.go b/internal/erpserver/handler/system/user/user.go index 2a203a2..b226340 100644 --- a/internal/erpserver/handler/system/user/user.go +++ b/internal/erpserver/handler/system/user/user.go @@ -51,9 +51,8 @@ func (a *app) add(w http.ResponseWriter, r *http.Request) { func (a *app) edit(w http.ResponseWriter, r *http.Request) { ctx := r.Context() - vars := r.URL.Query() - id := convertor.QueryInt[int32](vars, "id", 0) vm := &systemmodel.User{} + id := convertor.QueryInt[int32](r.URL.Query(), "id", 0) if id > 0 { if u, err := a.userService.Get(ctx, id); err == nil { vm = u @@ -110,13 +109,13 @@ func (a *app) list(w http.ResponseWriter, r *http.Request) { a.render.Render(ctx, w, user.List(ctx)) case http.MethodPost: var q dto.SearchDto - q.SearchTimeBegin, q.SearchTimeEnd = convertor.DefaultStartTimeAndEndTime(r.PostFormValue("timeBegin"), r.PostFormValue("timeEnd")) - q.SearchStatus = convertor.ConvertInt(r.PostFormValue("status"), 9999) + q.SearchTimeBegin, q.SearchTimeEnd = convertor.DefaultTime(r.PostFormValue("timeBegin"), r.PostFormValue("timeEnd")) + q.SearchStatus = convertor.Int(r.PostFormValue("status"), 9999) q.SearchName = r.PostFormValue("name") q.SearchEmail = r.PostFormValue("email") - q.SearchID = convertor.ConvertInt[int64](r.PostFormValue("id"), 0) - q.Page = convertor.ConvertInt(r.PostFormValue("page"), 1) - q.Rows = convertor.ConvertInt(r.PostFormValue("rows"), 10) + q.SearchID = convertor.Int[int64](r.PostFormValue("id"), 0) + q.Page = convertor.Int(r.PostFormValue("page"), 1) + q.Rows = convertor.Int(r.PostFormValue("rows"), 10) res, count, err := a.userService.List(r.Context(), q) if err != nil { a.render.JSONErr(w, err.Error()) diff --git a/internal/pkg/convertor/http_form.go b/internal/pkg/convertor/http_form.go index 5eec6da..2e18a3e 100644 --- a/internal/pkg/convertor/http_form.go +++ b/internal/pkg/convertor/http_form.go @@ -6,7 +6,7 @@ import ( "time" ) -func ConvertInt[T int | int16 | int32 | int64](value string, defaultValue T) T { +func Int[T int | int16 | int32 | int64](value string, defaultValue T) T { i, err := strconv.Atoi(value) if err != nil { return defaultValue @@ -14,7 +14,7 @@ func ConvertInt[T int | int16 | int32 | int64](value string, defaultValue T) T { return T(i) } -func ConvertBool(value string, defaultValue bool) bool { +func Bool(value string, defaultValue bool) bool { b, err := strconv.ParseBool(value) if err != nil { return defaultValue @@ -37,7 +37,7 @@ func QueryInt[T int | int16 | int32 | int64](vars url.Values, key string, defaul return T(i) } -func DefaultStartTimeAndEndTime(start string, end string) (string, string) { +func DefaultTime(start string, end string) (string, string) { if len(start) == 0 { start = "2000-01-01 00:00:00" }