kenneth/projectx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2

Browse Source
This commit is contained in:
kenneth
2025-04-14 15:28:51 +08:00
parent f100427f8b
commit 371b89ee8d
93 changed files with 3757 additions and 1038 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
internal/erpserver/handler/app.go Normal file
View File

@@ -0,0 +1,62 @@
package handler
import (
systemrepo "management/internal/erpserver/model/system"
"management/internal/erpserver/repository"
systemsvc "management/internal/erpserver/service/v1"
"management/internal/pkg/config"
"management/internal/pkg/middleware"
"management/internal/pkg/redis"
"management/internal/pkg/session"
"management/internal/pkg/tpl"
"github.com/drhin/logger"
"gorm.io/gorm"
)
type AppContext struct {
// DB
DB *gorm.DB
// Store
Store repository.Store
// Cache
Redis redis.RedisCache
// session
Session session.Session
// middleware
Middleware middleware.Middleware
// render
Render tpl.Renderer
// config
Config *config.Config
// log
Log *logger.Logger
// repository
UserRepo systemrepo.UserRepository
LoginLogRepo systemrepo.LoginLogRepository
AuditLogRepo systemrepo.AuditLogRepository
RoleRepo systemrepo.RoleRepository
DepartmentRepo systemrepo.DepartmentRepository
ConfigRepo systemrepo.ConfigRepository
MenuRepo systemrepo.MenuRepository
RoleMenuRepo systemrepo.RoleMenuRepository
// service
CaptchaService systemsvc.CaptchaService
UserService systemsvc.UserService
LoginLogService systemsvc.LoginLogService
AuditLogService systemsvc.AuditLogService
RoleService systemsvc.RoleService
DepartmentService systemsvc.DepartmentService
ConfigService systemsvc.ConfigService
MenuService systemsvc.MenuService
RoleMenuService systemsvc.RoleMenuService
}

4
internal/erpserver/handler/budget/budget.go
View File

@@ -30,12 +30,12 @@ type BudgetHandler interface {
type budgetHandler struct {
render tpl.Renderer
biz biz.IBiz
mi middleware.IMiddleware
mi middleware.Middleware
}
var _ BudgetHandler = (*budgetHandler)(nil)
func NewBudgetHandler(render tpl.Renderer, biz biz.IBiz, mi middleware.IMiddleware) *budgetHandler {
func NewBudgetHandler(render tpl.Renderer, biz biz.IBiz, mi middleware.Middleware) *budgetHandler {
return &budgetHandler{
render: render,
biz: biz,

18
internal/erpserver/handler/common/captcha.go
View File

@@ -3,30 +3,22 @@ package common
import (
"net/http"
commonv1 "management/internal/erpserver/biz/v1/common"
v1 "management/internal/erpserver/service/v1"
"management/internal/pkg/config"
"management/internal/pkg/tpl"
)
type CaptchaHandler interface {
Captcha(w http.ResponseWriter, r *http.Request)
}
// captchaHandler 是 CaptchaHandler 接口的实现.
type captchaHandler struct {
conf *config.Captcha
render tpl.Renderer
biz commonv1.CaptchaBiz
svc v1.CaptchaService
}
// 确保 captchaHandler 实现了 CaptchaHandler 接口.
var _ CaptchaHandler = (*captchaHandler)(nil)
func NewCaptchaHandler(conf *config.Captcha, render tpl.Renderer, biz commonv1.CaptchaBiz) *captchaHandler {
func NewCaptchaHandler(conf *config.Captcha, render tpl.Renderer, svc v1.CaptchaService) *captchaHandler {
return &captchaHandler{
conf: conf,
render: render,
biz: biz,
svc: svc,
}
}
@@ -40,7 +32,7 @@ type CaptchaResponse struct {
func (h *captchaHandler) Captcha(w http.ResponseWriter, r *http.Request) {
keyLong := h.conf.KeyLong
oc := h.conf.OpenCaptcha
id, b64s, _, err := h.biz.Generate(h.conf.ImgHeight, h.conf.ImgWidth, keyLong, 0.7, 80)
id, b64s, _, err := h.svc.Generate(h.conf.ImgHeight, h.conf.ImgWidth, keyLong, 0.7, 80)
if err != nil {
h.render.JSON(w, tpl.Response{Success: false, Message: "获取验证码失败"})
return

36
internal/erpserver/handler/common/common.go
View File

@@ -1,36 +0,0 @@
package common
import (
commonv1 "management/internal/erpserver/biz/v1/common"
"management/internal/pkg/config"
"management/internal/pkg/tpl"
)
type CommonHandler interface {
CaptchaHandler() CaptchaHandler
UploadHandler() UploadHandler
}
type commonHandler struct {
conf *config.Config
render tpl.Renderer
biz commonv1.CommonBiz
}
var _ CommonHandler = (*commonHandler)(nil)
func NewCommonHandler(conf *config.Config, render tpl.Renderer, biz commonv1.CommonBiz) *commonHandler {
return &commonHandler{
conf: conf,
render: render,
biz: biz,
}
}
func (h *commonHandler) CaptchaHandler() CaptchaHandler {
return NewCaptchaHandler(&h.conf.Captcha, h.render, h.biz.CaptchaBiz())
}
func (h *commonHandler) UploadHandler() UploadHandler {
return NewUploadHandler(h.render)
}

8
internal/erpserver/handler/common/upload.go
View File

@@ -8,18 +8,10 @@ import (
"management/internal/pkg/tpl"
)
type UploadHandler interface {
Img(w http.ResponseWriter, r *http.Request)
File(w http.ResponseWriter, r *http.Request)
MutilFiles(w http.ResponseWriter, r *http.Request)
}
type uploadHandler struct {
render tpl.Renderer
}
var _ UploadHandler = (*uploadHandler)(nil)
func NewUploadHandler(render tpl.Renderer) *uploadHandler {
return &uploadHandler{
render: render,

4
internal/erpserver/handler/customer/customer.go
View File

@@ -28,12 +28,12 @@ type CustomerHandler interface {
type customerHandler struct {
render tpl.Renderer
biz biz.IBiz
mi middleware.IMiddleware
mi middleware.Middleware
}
var _ CustomerHandler = (*customerHandler)(nil)
func NewCustomerHandler(render tpl.Renderer, biz biz.IBiz, mi middleware.IMiddleware) *customerHandler {
func NewCustomerHandler(render tpl.Renderer, biz biz.IBiz, mi middleware.Middleware) *customerHandler {
return &customerHandler{
render: render,
biz: biz,

4
internal/erpserver/handler/expense/expense.go
View File

@@ -29,12 +29,12 @@ type ExpenseHandler interface {
type expenseHandler struct {
render tpl.Renderer
biz biz.IBiz
mi middleware.IMiddleware
mi middleware.Middleware
}
var _ ExpenseHandler = (*expenseHandler)(nil)
func NewExpenseHandler(render tpl.Renderer, biz biz.IBiz, mi middleware.IMiddleware) *expenseHandler {
func NewExpenseHandler(render tpl.Renderer, biz biz.IBiz, mi middleware.Middleware) *expenseHandler {
return &expenseHandler{
render: render,
biz: biz,

90
internal/erpserver/handler/handler.go
View File

@@ -1,90 +0,0 @@
package handler
import (
"management/internal/erpserver/biz"
"management/internal/erpserver/handler/budget"
"management/internal/erpserver/handler/common"
"management/internal/erpserver/handler/customer"
"management/internal/erpserver/handler/expense"
"management/internal/erpserver/handler/income"
"management/internal/erpserver/handler/project"
"management/internal/erpserver/handler/system"
"management/internal/pkg/config"
"management/internal/pkg/middleware"
"management/internal/pkg/redis"
"management/internal/pkg/session"
"management/internal/pkg/tpl"
)
// IHandler 定义了Handler需要实现的方法.
type IHandler interface {
// 获取 Common Handler 接口.
CommonHandler() common.CommonHandler
// 获取 System Handler 接口.
SystemHandler() system.SystemHandler
ProjectHandler() project.ProjectHandler
BudgetHandler() budget.BudgetHandler
CustomerHandler() customer.CustomerHandler
IncomeHandler() income.IncomeHandler
ExpenseHandler() expense.ExpenseHandler
}
// handler 是 IHandler 的一个具体实现.
type handler struct {
conf *config.Config
render tpl.Renderer
redis redis.IRedis
session session.ISession
biz biz.IBiz
mi middleware.IMiddleware
}
// 确保 handler 实现了 IHandler 接口.
var _ IHandler = (*handler)(nil)
// NewHandler 创建一个 IHandler 类型的实例.
func NewHandler(conf *config.Config, render tpl.Renderer, redis redis.IRedis, session session.ISession, biz biz.IBiz, mi middleware.IMiddleware) *handler {
return &handler{
conf: conf,
render: render,
redis: redis,
session: session,
biz: biz,
mi: mi,
}
}
// CommonHandler 返回一个实现了 CommonHandler 接口的实例.
func (h *handler) CommonHandler() common.CommonHandler {
return common.NewCommonHandler(h.conf, h.render, h.biz.CommonV1())
}
// SystemHandler 返回一个实现了 SystemHandler 接口的实例.
func (h *handler) SystemHandler() system.SystemHandler {
return system.NewSystemHandler(h.render, h.redis, h.session, h.biz, h.mi)
}
// ProjectHandler 返回一个实现了 ProjectHandler 接口的实例.
func (h *handler) ProjectHandler() project.ProjectHandler {
return project.NewProjectHandler(h.render, h.biz, h.mi)
}
// BudgetHandler 返回一个实现了 BudgetHandler 接口的实例.
func (h *handler) BudgetHandler() budget.BudgetHandler {
return budget.NewBudgetHandler(h.render, h.biz, h.mi)
}
// CustomerHandler 返回一个实现了 CustomerHandler 接口的实例.
func (h *handler) CustomerHandler() customer.CustomerHandler {
return customer.NewCustomerHandler(h.render, h.biz, h.mi)
}
// IncomeHandler 返回一个实现了 IncomeHandler 接口的实例.
func (h *handler) IncomeHandler() income.IncomeHandler {
return income.NewIncomeHandler(h.render, h.biz, h.mi)
}
// ExpenseHandler 返回一个实现了 ExpenseHandler 接口的实例.
func (h *handler) ExpenseHandler() expense.ExpenseHandler {
return expense.NewExpenseHandler(h.render, h.biz, h.mi)
}

4
internal/erpserver/handler/income/income.go
View File

@@ -29,12 +29,12 @@ type IncomeHandler interface {
type incomeHandler struct {
render tpl.Renderer
biz biz.IBiz
mi middleware.IMiddleware
mi middleware.Middleware
}
var _ IncomeHandler = (*incomeHandler)(nil)
func NewIncomeHandler(render tpl.Renderer, biz biz.IBiz, mi middleware.IMiddleware) *incomeHandler {
func NewIncomeHandler(render tpl.Renderer, biz biz.IBiz, mi middleware.Middleware) *incomeHandler {
return &incomeHandler{
render: render,
biz: biz,

4
internal/erpserver/handler/project/project.go
View File

@@ -31,12 +31,12 @@ type ProjectHandler interface {
type projectHandler struct {
render tpl.Renderer
biz biz.IBiz
mi middleware.IMiddleware
mi middleware.Middleware
}
var _ ProjectHandler = (*projectHandler)(nil)
func NewProjectHandler(render tpl.Renderer, biz biz.IBiz, mi middleware.IMiddleware) *projectHandler {
func NewProjectHandler(render tpl.Renderer, biz biz.IBiz, mi middleware.Middleware) *projectHandler {
return &projectHandler{
render: render,
biz: biz,

126
internal/erpserver/handler/router.go Normal file
View File

@@ -0,0 +1,126 @@
package handler
import (
"net/http"
"management/internal/erpserver/handler/common"
"management/internal/erpserver/handler/system"
"github.com/go-chi/chi/v5"
"github.com/go-chi/chi/v5/middleware"
)
func (ctx *AppContext) Router() *chi.Mux {
r := chi.NewRouter()
r.Use(middleware.RequestID)
r.Use(middleware.RealIP)
// r.Use(middleware.Logger)
r.Use(middleware.Recoverer)
staticServer := http.FileServer(http.Dir("./web/statics/"))
r.Handle("/statics/*", http.StripPrefix("/statics", staticServer))
uploadServer := http.FileServer(http.Dir("./upload/"))
r.Handle("/upload/*", http.StripPrefix("/upload", uploadServer))
r.Group(func(r chi.Router) {
r.Use(ctx.Middleware.NoSurf) // CSRF
r.Use(ctx.Middleware.LoadSession) // Session
captchaHandler := common.NewCaptchaHandler(&ctx.Config.Captcha, ctx.Render, ctx.CaptchaService)
r.Get("/captcha", captchaHandler.Captcha)
uploadHandler := common.NewUploadHandler(ctx.Render)
r.With(ctx.Middleware.Authorize, ctx.Middleware.Audit).Post("/upload/img", uploadHandler.Img)
r.With(ctx.Middleware.Authorize, ctx.Middleware.Audit).Post("/upload/file", uploadHandler.File)
r.With(ctx.Middleware.Authorize, ctx.Middleware.Audit).Post("/upload/mutilfile", uploadHandler.MutilFiles)
userHandler := system.NewUserHandler(ctx.Render, ctx.Middleware, ctx.CaptchaService, ctx.UserService, ctx.RoleService, ctx.DepartmentService)
r.Get("/", userHandler.Login)
r.Post("/login", userHandler.Login)
r.Get("/logout", userHandler.Logout)
homeHandler := system.NewHomeHandler(ctx.Render, ctx.Middleware, ctx.UserService, ctx.LoginLogService)
r.With(ctx.Middleware.Authorize).Get("/home.html", homeHandler.Home)
r.With(ctx.Middleware.Authorize).Get("/dashboard", homeHandler.Dashboard)
configHandler := system.NewConfigHandler(ctx.Render, ctx.Redis, ctx.ConfigService)
r.With(ctx.Middleware.Authorize).Get("/pear.json", configHandler.Pear)
r.Route("/system", func(r chi.Router) {
r.Use(ctx.Middleware.Authorize)
menuHandler := system.NewMenuHandler(ctx.Render, ctx.Middleware, ctx.MenuService)
r.Get("/menus", menuHandler.Menus)
r.Route("/menu", func(r chi.Router) {
r.Use(ctx.Middleware.Audit)
r.Get("/list", menuHandler.List)
r.Post("/list", menuHandler.List)
r.Get("/add", menuHandler.Add)
r.Get("/add_children", menuHandler.AddChildren)
r.Get("/edit", menuHandler.Edit)
r.Post("/save", menuHandler.Save)
r.Post("/data", menuHandler.Data)
r.Post("/refresh_cache", menuHandler.RefreshCache)
})
r.Route("/department", func(r chi.Router) {
r.Use(ctx.Middleware.Audit)
departHandler := system.NewDepartmentHandler(ctx.Render, ctx.DepartmentService)
r.Get("/list", departHandler.List)
r.Post("/list", departHandler.List)
r.Get("/add", departHandler.Add)
r.Get("/add_children", departHandler.AddChildren)
r.Get("/edit", departHandler.Edit)
r.Post("/save", departHandler.Save)
r.Post("/data", departHandler.Data)
r.Post("/refresh_cache", departHandler.RefreshCache)
r.Post("/rebuild_parent_path", departHandler.RebuildParentPath)
})
r.Route("/role", func(r chi.Router) {
r.Use(ctx.Middleware.Audit)
roleHandler := system.NewRoleHandler(ctx.Render, ctx.RoleService, ctx.MenuService)
r.Get("/list", roleHandler.List)
r.Post("/list", roleHandler.List)
r.Get("/add", roleHandler.Add)
r.Get("/add_children", roleHandler.AddChildren)
r.Get("/edit", roleHandler.Edit)
r.Post("/save", roleHandler.Save)
r.Post("/data", roleHandler.Data)
r.Post("/refresh_cache", roleHandler.RefreshCache)
r.Post("/rebuild_parent_path", roleHandler.RebuildParentPath)
r.Post("/refresh_role_menus", roleHandler.RefreshRoleMenus)
r.Get("/set_menu", roleHandler.SetMenu)
r.Post("/set_menu", roleHandler.SetMenu)
})
r.Route("/user", func(r chi.Router) {
r.Get("/list", userHandler.List)
r.Post("/list", userHandler.List)
r.Get("/add", userHandler.Add)
r.Get("/edit", userHandler.Edit)
r.Post("/save", userHandler.Save)
r.Get("/profile", userHandler.Profile)
r.Post("/data", userHandler.Data)
})
loginLogHandler := system.NewLoginLogHandler(ctx.Render, ctx.LoginLogService)
r.Route("/login_log", func(r chi.Router) {
r.Get("/list", loginLogHandler.List)
r.Post("/list", loginLogHandler.List)
})
auditHandler := system.NewAuditHandler(ctx.Render, ctx.AuditLogService)
r.Route("/audit_log", func(r chi.Router) {
r.Get("/list", auditHandler.List)
r.Post("/list", auditHandler.List)
})
})
})
return r
}

16
internal/erpserver/handler/system/audit.go
View File

@@ -4,26 +4,20 @@ import (
"net/http"
"management/internal/db/model/dto"
"management/internal/erpserver/biz"
v1 "management/internal/erpserver/service/v1"
"management/internal/pkg/convertor"
"management/internal/pkg/tpl"
)
type AuditHandler interface {
List(w http.ResponseWriter, r *http.Request)
}
type auditHandler struct {
render tpl.Renderer
biz biz.IBiz
svc v1.AuditLogService
}
var _ AuditHandler = (*auditHandler)(nil)
func NewAuditHandler(render tpl.Renderer, biz biz.IBiz) *auditHandler {
func NewAuditHandler(render tpl.Renderer, svc v1.AuditLogService) *auditHandler {
return &auditHandler{
render: render,
biz: biz,
svc: svc,
}
}
@@ -38,7 +32,7 @@ func (h *auditHandler) List(w http.ResponseWriter, r *http.Request) {
q.SearchEmail = r.PostFormValue("email")
q.Page = convertor.ConvertInt(r.PostFormValue("page"), 1)
q.Rows = convertor.ConvertInt(r.PostFormValue("rows"), 10)
res, count, err := h.biz.SystemV1().AuditBiz().List(r.Context(), q)
res, count, err := h.svc.List(r.Context(), q)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return

91
internal/erpserver/handler/system/config.go
View File

@@ -1,61 +1,41 @@
package system
import (
"encoding/json"
"net/http"
"strings"
"management/internal/db/model/dto"
db "management/internal/db/sqlc"
"management/internal/erpserver/biz"
systemmodel "management/internal/erpserver/model/system"
systemsvc "management/internal/erpserver/service/v1"
"management/internal/pkg/convertor"
"management/internal/pkg/know/pearadmin"
"management/internal/pkg/redis"
"management/internal/pkg/tpl"
)
type ConfigHandler interface {
Add(w http.ResponseWriter, r *http.Request)
Edit(w http.ResponseWriter, r *http.Request)
Save(w http.ResponseWriter, r *http.Request)
List(w http.ResponseWriter, r *http.Request)
Refresh(w http.ResponseWriter, r *http.Request)
ResetPear(w http.ResponseWriter, r *http.Request)
ConfigExpansion
}
type ConfigExpansion interface {
Pear(w http.ResponseWriter, r *http.Request)
}
// configHandler 是 ConfigHandler 接口的实现.
type configHandler struct {
render tpl.Renderer
redis redis.IRedis
biz biz.IBiz
render tpl.Renderer
redis redis.RedisCache
configsvc systemsvc.ConfigService
}
// 确保 userHandler 实现了 ConfigHandler 接口.
var _ ConfigHandler = (*configHandler)(nil)
func NewConfigHandler(render tpl.Renderer, redis redis.IRedis, biz biz.IBiz) *configHandler {
func NewConfigHandler(render tpl.Renderer, redis redis.RedisCache, configsvc systemsvc.ConfigService) *configHandler {
return &configHandler{
render: render,
redis: redis,
biz: biz,
render: render,
redis: redis,
configsvc: configsvc,
}
}
func (h *configHandler) Add(w http.ResponseWriter, r *http.Request) {
h.render.HTML(w, r, "config/edit.tmpl", map[string]any{
"Item": &db.SysConfig{},
"Item": &systemmodel.Config{},
"Result": "",
})
}
type EditSysConfig struct {
*db.SysConfig
*systemmodel.Config
Result string
}
@@ -64,13 +44,13 @@ func (h *configHandler) Edit(w http.ResponseWriter, r *http.Request) {
id := convertor.QueryInt[int32](vars, "id", 0)
vm := &EditSysConfig{}
if id > 0 {
if conf, err := h.biz.SystemV1().ConfigBiz().Get(r.Context(), id); err == nil {
vm.SysConfig = conf
if conf, err := h.configsvc.Get(r.Context(), id); err == nil {
vm.Config = conf
vm.Result = string(conf.Value)
}
}
h.render.HTML(w, r, "config/edit.tmpl", map[string]any{
"Item": vm.SysConfig,
"Item": vm.Config,
"Result": vm.Result,
})
}
@@ -90,11 +70,11 @@ func (h *configHandler) Save(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
if id == 0 {
arg := &db.CreateSysConfigParams{
arg := &systemmodel.Config{
Key: key,
Value: []byte(value),
}
err := h.biz.SystemV1().ConfigBiz().Create(ctx, arg)
err := h.configsvc.Create(ctx, arg)
if err != nil {
if db.IsUniqueViolation(err) {
h.render.JSONERR(w, "数据已存在")
@@ -106,17 +86,14 @@ func (h *configHandler) Save(w http.ResponseWriter, r *http.Request) {
h.render.JSONOK(w, "添加成功")
} else {
res, err := h.biz.SystemV1().ConfigBiz().Get(ctx, id)
res, err := h.configsvc.Get(ctx, id)
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
arg := &db.UpdateSysConfigByKeyParams{
Key: res.Key,
Value: []byte(value),
}
err = h.biz.SystemV1().ConfigBiz().Update(ctx, arg)
res.Value = []byte(value)
err = h.configsvc.Update(ctx, res)
if err != nil {
h.render.JSONERR(w, err.Error())
return
@@ -136,7 +113,7 @@ func (h *configHandler) List(w http.ResponseWriter, r *http.Request) {
q.Page = convertor.ConvertInt(r.PostFormValue("page"), 1)
q.Rows = convertor.ConvertInt(r.PostFormValue("rows"), 10)
ctx := r.Context()
res, count, err := h.biz.SystemV1().ConfigBiz().List(ctx, q)
res, count, err := h.configsvc.List(ctx, q)
if err != nil {
h.render.JSONERR(w, err.Error())
return
@@ -166,25 +143,25 @@ func (h *configHandler) Refresh(w http.ResponseWriter, r *http.Request) {
}
func (h *configHandler) ResetPear(w http.ResponseWriter, r *http.Request) {
b, err := json.Marshal(pearadmin.PearJson)
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
// b, err := json.Marshal(pearadmin.PearJson)
// if err != nil {
// h.render.JSONERR(w, err.Error())
// return
// }
err = h.biz.SystemV1().ConfigBiz().Update(r.Context(), &db.UpdateSysConfigByKeyParams{
Key: pearadmin.PearKey,
Value: b,
})
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
// err = h.configsvc.Update(r.Context(), &db.UpdateSysConfigByKeyParams{
// Key: pearadmin.PearKey,
// Value: b,
// })
// if err != nil {
// h.render.JSONERR(w, err.Error())
// return
// }
h.render.JSONOK(w, "重置成功")
}
func (h *configHandler) Pear(w http.ResponseWriter, r *http.Request) {
pear, err := h.biz.SystemV1().ConfigBiz().Pear(r.Context())
pear, err := h.configsvc.Pear(r.Context())
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return

52
internal/erpserver/handler/system/department.go
View File

@@ -4,36 +4,23 @@ import (
"net/http"
"management/internal/db/model/dto"
db "management/internal/db/sqlc"
"management/internal/erpserver/biz"
"management/internal/erpserver/model/form"
systemmodel "management/internal/erpserver/model/system"
v1 "management/internal/erpserver/service/v1"
"management/internal/pkg/binding"
"management/internal/pkg/convertor"
"management/internal/pkg/tpl"
)
type DepartmentHandler interface {
List(w http.ResponseWriter, r *http.Request)
Add(w http.ResponseWriter, r *http.Request)
AddChildren(w http.ResponseWriter, r *http.Request)
Edit(w http.ResponseWriter, r *http.Request)
Save(w http.ResponseWriter, r *http.Request)
Data(w http.ResponseWriter, r *http.Request)
Refresh(w http.ResponseWriter, r *http.Request)
RebuildParentPath(w http.ResponseWriter, r *http.Request)
}
type departmentHandler struct {
render tpl.Renderer
biz biz.IBiz
svc v1.DepartmentService
}
var _ DepartmentHandler = (*departmentHandler)(nil)
func NewDepartmentHandler(render tpl.Renderer, biz biz.IBiz) *departmentHandler {
func NewDepartmentHandler(render tpl.Renderer, svc v1.DepartmentService) *departmentHandler {
return &departmentHandler{
render: render,
biz: biz,
svc: svc,
}
}
@@ -43,13 +30,14 @@ func (h *departmentHandler) List(w http.ResponseWriter, r *http.Request) {
h.render.HTML(w, r, "department/list.tmpl", nil)
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.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)
res, count, err := h.biz.SystemV1().DepartmentBiz().List(r.Context(), q)
res, count, err := h.svc.List(r.Context(), q)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
@@ -69,14 +57,14 @@ func (h *departmentHandler) List(w http.ResponseWriter, r *http.Request) {
func (h *departmentHandler) Add(w http.ResponseWriter, r *http.Request) {
h.render.HTML(w, r, "department/edit.tmpl", map[string]any{
"Item": &db.SysDepartment{Sort: 6666},
"Item": &systemmodel.Department{Sort: 6666},
})
}
func (h *departmentHandler) AddChildren(w http.ResponseWriter, r *http.Request) {
vars := r.URL.Query()
parentID := convertor.QueryInt(vars, "parentID", 0)
vm := &db.SysDepartment{ParentID: int32(parentID), Sort: 6666}
vm := &systemmodel.Department{ParentID: int32(parentID), Sort: 6666}
h.render.HTML(w, r, "department/edit.tmpl", map[string]any{
"Item": vm,
})
@@ -85,9 +73,9 @@ func (h *departmentHandler) AddChildren(w http.ResponseWriter, r *http.Request)
func (h *departmentHandler) Edit(w http.ResponseWriter, r *http.Request) {
vars := r.URL.Query()
id := convertor.QueryInt[int32](vars, "id", 0)
vm := &db.SysDepartment{Sort: 6666}
vm := &systemmodel.Department{Sort: 6666}
if id > 0 {
vm, _ = h.biz.SystemV1().DepartmentBiz().Get(r.Context(), id)
vm, _ = h.svc.Get(r.Context(), id)
}
h.render.HTML(w, r, "department/edit.tmpl", map[string]any{
"Item": vm,
@@ -103,14 +91,14 @@ func (h *departmentHandler) Save(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
if *req.ID == 0 {
err := h.biz.SystemV1().DepartmentBiz().Create(ctx, &req)
err := h.svc.Create(ctx, &req)
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
h.render.JSONOK(w, "添加成功")
} else {
err := h.biz.SystemV1().DepartmentBiz().Update(ctx, &req)
err := h.svc.Update(ctx, &req)
if err != nil {
h.render.JSONERR(w, err.Error())
return
@@ -125,39 +113,37 @@ func (h *departmentHandler) Data(w http.ResponseWriter, r *http.Request) {
vars := r.URL.Query()
t := vars.Get("type")
if t == "tree" {
res, err := h.biz.SystemV1().DepartmentBiz().Tree(ctx, 0)
res, err := h.svc.Tree(ctx, 0)
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
h.render.JSON(w, res)
return
} else if t == "xmselect_tree" {
res, err := h.biz.SystemV1().DepartmentBiz().XmSelectTree(ctx, 0)
res, err := h.svc.XmSelectTree(ctx, 0)
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
h.render.JSON(w, res)
return
}
}
func (h *departmentHandler) Refresh(w http.ResponseWriter, r *http.Request) {
_, err := h.biz.SystemV1().DepartmentBiz().Refresh(r.Context())
func (h *departmentHandler) RefreshCache(w http.ResponseWriter, r *http.Request) {
err := h.svc.RefreshCache(r.Context())
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
h.render.JSONOK(w, "刷新成功")
h.render.JSONOK(w, "缓存刷新成功")
}
func (h *departmentHandler) RebuildParentPath(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
err := h.biz.SystemV1().DepartmentBiz().RebuildParentPath(ctx)
err := h.svc.RebuildParentPath(ctx)
if err != nil {
h.render.JSONERR(w, err.Error())
return

40
internal/erpserver/handler/system/home.go
View File

@@ -1,11 +1,43 @@
package system
import "net/http"
import (
"net/http"
func (h *systemHandler) Home(w http.ResponseWriter, r *http.Request) {
v1 "management/internal/erpserver/service/v1"
"management/internal/pkg/middleware"
"management/internal/pkg/tpl"
)
type homeHandler struct {
render tpl.Renderer
mi middleware.Middleware
usersvc v1.UserService
loginLogsvc v1.LoginLogService
}
func NewHomeHandler(render tpl.Renderer, mi middleware.Middleware, usersvc v1.UserService, loginLogsvc v1.LoginLogService) *homeHandler {
return &homeHandler{
render: render,
mi: mi,
usersvc: usersvc,
loginLogsvc: loginLogsvc,
}
}
func (h *homeHandler) Home(w http.ResponseWriter, r *http.Request) {
h.render.HTML(w, r, "home/home.tmpl", nil)
}
func (h *systemHandler) Dashboard(w http.ResponseWriter, r *http.Request) {
h.render.HTML(w, r, "home/dashboard.tmpl", nil)
func (h *homeHandler) Dashboard(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
auth := h.mi.AuthUser(ctx)
user, _ := h.usersvc.Get(ctx, auth.ID)
t := h.loginLogsvc.LoginLatestTime(ctx, auth.Email)
c := h.loginLogsvc.LoginCount(ctx, auth.Email)
h.render.HTML(w, r, "home/dashboard.tmpl", map[string]any{
"Auth": auth,
"User": user,
"LastLoginTime": t,
"LoginCount": c,
})
}

17
internal/erpserver/handler/system/login_log.go
View File

@@ -4,26 +4,20 @@ import (
"net/http"
"management/internal/db/model/dto"
"management/internal/erpserver/biz"
v1 "management/internal/erpserver/service/v1"
"management/internal/pkg/convertor"
"management/internal/pkg/tpl"
)
type LoginLogHandler interface {
List(w http.ResponseWriter, r *http.Request)
}
type loginLogHandler struct {
render tpl.Renderer
biz biz.IBiz
svc v1.LoginLogService
}
var _ LoginLogHandler = (*loginLogHandler)(nil)
func NewLoginLogHandler(render tpl.Renderer, biz biz.IBiz) *loginLogHandler {
func NewLoginLogHandler(render tpl.Renderer, svc v1.LoginLogService) *loginLogHandler {
return &loginLogHandler{
render: render,
biz: biz,
svc: svc,
}
}
@@ -34,11 +28,10 @@ func (h *loginLogHandler) List(w http.ResponseWriter, r *http.Request) {
case http.MethodPost:
var q dto.SearchDto
q.SearchTimeBegin, q.SearchTimeEnd = convertor.DefaultStartTimeAndEndTime(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)
res, count, err := h.biz.SystemV1().LoginLogBiz().List(r.Context(), q)
res, count, err := h.svc.List(r.Context(), q)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return

112
internal/erpserver/handler/system/menu.go
View File

@@ -1,18 +1,16 @@
package system
import (
"encoding/json"
"net/http"
"strconv"
"strings"
"time"
"management/internal/db/model/dto"
db "management/internal/db/sqlc"
"management/internal/erpserver/biz"
systemmodel "management/internal/erpserver/model/system"
v1 "management/internal/erpserver/service/v1"
"management/internal/pkg/convertor"
"management/internal/pkg/know"
"management/internal/pkg/session"
"management/internal/pkg/middleware"
"management/internal/pkg/tpl"
"github.com/google/uuid"
@@ -20,47 +18,25 @@ import (
const style = "layui-btn-primary layui-btn-sm"
type MenuHandler interface {
MenuExpansion
}
type MenuExpansion interface {
Menus(w http.ResponseWriter, r *http.Request)
List(w http.ResponseWriter, r *http.Request)
Add(w http.ResponseWriter, r *http.Request)
AddChildren(w http.ResponseWriter, r *http.Request)
Edit(w http.ResponseWriter, r *http.Request)
Save(w http.ResponseWriter, r *http.Request)
Data(w http.ResponseWriter, r *http.Request)
Refresh(w http.ResponseWriter, r *http.Request)
}
type menuHandler struct {
render tpl.Renderer
session session.ISession
biz biz.IBiz
render tpl.Renderer
mi middleware.Middleware
svc v1.MenuService
}
var _ MenuHandler = (*menuHandler)(nil)
func NewMenuHandler(render tpl.Renderer, session session.ISession, biz biz.IBiz) *menuHandler {
func NewMenuHandler(render tpl.Renderer, mi middleware.Middleware, svc v1.MenuService) *menuHandler {
return &menuHandler{
render: render,
session: session,
biz: biz,
render: render,
mi: mi,
svc: svc,
}
}
func (h *menuHandler) Menus(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
b := h.session.GetBytes(ctx, know.StoreName)
var u dto.AuthorizeUser
if err := json.Unmarshal(b, &u); err != nil {
h.render.JSONERR(w, err.Error())
return
}
menus, err := h.biz.SystemV1().MenuBiz().RecursiveSysMenus(ctx, u.RoleID)
user := h.mi.AuthUser(ctx)
menus, err := h.svc.OwerMenus(ctx, user.RoleID)
if err != nil {
h.render.JSONERR(w, err.Error())
return
@@ -74,7 +50,7 @@ func (h *menuHandler) List(w http.ResponseWriter, r *http.Request) {
case http.MethodGet:
h.render.HTML(w, r, "menu/list.tmpl", nil)
case http.MethodPost:
res, err := h.biz.SystemV1().MenuBiz().ListMenuTree(r.Context())
res, err := h.svc.ListMenuTree(r.Context())
if err != nil {
h.render.JSONERR(w, err.Error())
return
@@ -94,15 +70,15 @@ func (h *menuHandler) List(w http.ResponseWriter, r *http.Request) {
func (h *menuHandler) Add(w http.ResponseWriter, r *http.Request) {
h.render.HTML(w, r, "menu/edit.tmpl", map[string]any{
"Item": &db.SysMenu{Style: style, Visible: true, Sort: 6666},
"Item": &systemmodel.Menu{Style: style, Visible: true, Sort: 6666},
})
}
func (h *menuHandler) AddChildren(w http.ResponseWriter, r *http.Request) {
vars := r.URL.Query()
parentID := convertor.QueryInt[int32](vars, "parentID", 0)
vm := &db.SysMenu{ParentID: int32(parentID), Style: style, Visible: true, Sort: 6666}
parent, err := h.biz.SystemV1().MenuBiz().Get(r.Context(), parentID)
vm := &systemmodel.Menu{ParentID: int32(parentID), Style: style, Visible: true, Sort: 6666}
parent, err := h.svc.Get(r.Context(), parentID)
if err == nil {
if parent.Type == "node" {
vm.Type = "menu"
@@ -118,9 +94,9 @@ func (h *menuHandler) AddChildren(w http.ResponseWriter, r *http.Request) {
func (h *menuHandler) Edit(w http.ResponseWriter, r *http.Request) {
vars := r.URL.Query()
id := convertor.QueryInt[int32](vars, "id", 0)
vm := &db.SysMenu{Style: style, Sort: 6666}
vm := &systemmodel.Menu{Style: style, Sort: 6666}
if id > 0 {
vm, _ = h.biz.SystemV1().MenuBiz().Get(r.Context(), id)
vm, _ = h.svc.Get(r.Context(), id)
}
h.render.HTML(w, r, "menu/edit.tmpl", map[string]any{
"Item": vm,
@@ -151,7 +127,7 @@ func (h *menuHandler) Save(w http.ResponseWriter, r *http.Request) {
parentPath := ""
if parentID > 0 {
parent, err := h.biz.SystemV1().MenuBiz().Get(ctx, parentID)
parent, err := h.svc.Get(ctx, parentID)
if err != nil {
h.render.JSONERR(w, err.Error())
return
@@ -161,7 +137,7 @@ func (h *menuHandler) Save(w http.ResponseWriter, r *http.Request) {
}
if id == 0 {
arg := &db.CreateSysMenuParams{
arg := &systemmodel.Menu{
Name: name,
DisplayName: dispalyName,
Url: url,
@@ -177,7 +153,7 @@ func (h *menuHandler) Save(w http.ResponseWriter, r *http.Request) {
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
_, err := h.biz.SystemV1().MenuBiz().Create(ctx, arg)
err := h.svc.Create(ctx, arg)
if err != nil {
if db.IsUniqueViolation(err) {
h.render.JSONERR(w, "菜单已存在")
@@ -189,29 +165,26 @@ func (h *menuHandler) Save(w http.ResponseWriter, r *http.Request) {
h.render.JSONOK(w, "添加成功")
} else {
res, err := h.biz.SystemV1().MenuBiz().Get(ctx, id)
res, err := h.svc.Get(ctx, id)
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
arg := &db.UpdateSysMenuParams{
ID: res.ID,
Name: name,
DisplayName: dispalyName,
Url: url,
Type: t,
ParentID: parentID,
ParentPath: parentPath,
Avatar: avatar,
Style: style,
Visible: visible,
IsList: isList,
Status: status,
Sort: sort,
UpdatedAt: time.Now(),
}
_, err = h.biz.SystemV1().MenuBiz().Update(ctx, arg)
res.Name = name
res.DisplayName = dispalyName
res.Url = url
res.Type = t
res.ParentID = parentID
res.ParentPath = parentPath
res.Avatar = avatar
res.Style = style
res.Visible = visible
res.IsList = isList
res.Status = status
res.Sort = sort
res.UpdatedAt = time.Now()
err = h.svc.Update(ctx, res)
if err != nil {
h.render.JSONERR(w, err.Error())
return
@@ -226,7 +199,7 @@ func (h *menuHandler) Data(w http.ResponseWriter, r *http.Request) {
vars := r.URL.Query()
t := vars.Get("type")
if t == "tree" {
res, err := h.biz.SystemV1().MenuBiz().Tree(ctx, 0)
res, err := h.svc.Tree(ctx, 0)
if err != nil {
h.render.JSONERR(w, err.Error())
return
@@ -235,7 +208,7 @@ func (h *menuHandler) Data(w http.ResponseWriter, r *http.Request) {
h.render.JSON(w, res)
return
} else if t == "xmselect_tree" {
res, err := h.biz.SystemV1().MenuBiz().XmSelectTree(ctx, 0)
res, err := h.svc.XmSelectTree(ctx, 0)
if err != nil {
h.render.JSONERR(w, err.Error())
return
@@ -244,14 +217,15 @@ func (h *menuHandler) Data(w http.ResponseWriter, r *http.Request) {
h.render.JSON(w, res)
return
}
h.render.JSON(w, nil)
}
func (h *menuHandler) Refresh(w http.ResponseWriter, r *http.Request) {
err := h.biz.SystemV1().MenuBiz().RefreshMenus(r.Context())
func (h *menuHandler) RefreshCache(w http.ResponseWriter, r *http.Request) {
err := h.svc.RefreshCache(r.Context())
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
h.render.JSONOK(w, "刷新成功")
h.render.JSONOK(w, "缓存刷新成功")
}

104
internal/erpserver/handler/system/role.go
View File

@@ -5,38 +5,25 @@ import (
"strings"
"management/internal/db/model/dto"
db "management/internal/db/sqlc"
"management/internal/erpserver/biz"
"management/internal/erpserver/model/form"
"management/internal/erpserver/model/system"
v1 "management/internal/erpserver/service/v1"
"management/internal/pkg/binding"
"management/internal/pkg/convertor"
"management/internal/pkg/tpl"
)
type RoleHandler interface {
List(w http.ResponseWriter, r *http.Request)
Add(w http.ResponseWriter, r *http.Request)
AddChildren(w http.ResponseWriter, r *http.Request)
Edit(w http.ResponseWriter, r *http.Request)
Save(w http.ResponseWriter, r *http.Request)
Data(w http.ResponseWriter, r *http.Request)
Refresh(w http.ResponseWriter, r *http.Request)
RebuildParentPath(w http.ResponseWriter, r *http.Request)
RefreshRoleMenus(w http.ResponseWriter, r *http.Request)
SetMenu(w http.ResponseWriter, r *http.Request)
}
type roleHandler struct {
render tpl.Renderer
biz biz.IBiz
render tpl.Renderer
svc v1.RoleService
menusvc v1.MenuService
}
var _ RoleHandler = (*roleHandler)(nil)
func NewRoleHandler(render tpl.Renderer, biz biz.IBiz) *roleHandler {
func NewRoleHandler(render tpl.Renderer, svc v1.RoleService, menusvc v1.MenuService) *roleHandler {
return &roleHandler{
render: render,
biz: biz,
render: render,
svc: svc,
menusvc: menusvc,
}
}
@@ -46,13 +33,14 @@ func (h *roleHandler) List(w http.ResponseWriter, r *http.Request) {
h.render.HTML(w, r, "role/list.tmpl", nil)
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.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)
res, count, err := h.biz.SystemV1().RoleBiz().List(r.Context(), q)
res, count, err := h.svc.List(r.Context(), q)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
@@ -72,14 +60,14 @@ func (h *roleHandler) List(w http.ResponseWriter, r *http.Request) {
func (h *roleHandler) Add(w http.ResponseWriter, r *http.Request) {
h.render.HTML(w, r, "role/edit.tmpl", map[string]any{
"Item": &db.SysRole{Sort: 6666},
"Item": &system.Role{Sort: 6666},
})
}
func (h *roleHandler) AddChildren(w http.ResponseWriter, r *http.Request) {
vars := r.URL.Query()
parentID := convertor.QueryInt(vars, "parentID", 0)
vm := &db.SysRole{ParentID: int32(parentID), Sort: 6666}
vm := &system.Role{ParentID: int32(parentID), Sort: 6666}
h.render.HTML(w, r, "role/edit.tmpl", map[string]any{
"Item": vm,
})
@@ -88,9 +76,9 @@ func (h *roleHandler) AddChildren(w http.ResponseWriter, r *http.Request) {
func (h *roleHandler) Edit(w http.ResponseWriter, r *http.Request) {
vars := r.URL.Query()
id := convertor.QueryInt[int32](vars, "id", 0)
vm := &db.SysRole{Sort: 6666}
vm := &system.Role{Sort: 6666}
if id > 0 {
vm, _ = h.biz.SystemV1().RoleBiz().Get(r.Context(), id)
vm, _ = h.svc.Get(r.Context(), id)
}
h.render.HTML(w, r, "role/edit.tmpl", map[string]any{
"Item": vm,
@@ -106,14 +94,14 @@ func (h *roleHandler) Save(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
if *req.ID == 0 {
err := h.biz.SystemV1().RoleBiz().Create(ctx, &req)
err := h.svc.Create(ctx, &req)
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
h.render.JSONOK(w, "添加成功")
} else {
err := h.biz.SystemV1().RoleBiz().Update(ctx, &req)
err := h.svc.Update(ctx, &req)
if err != nil {
h.render.JSONERR(w, err.Error())
return
@@ -128,7 +116,7 @@ func (h *roleHandler) Data(w http.ResponseWriter, r *http.Request) {
vars := r.URL.Query()
t := vars.Get("type")
if t == "tree" {
res, err := h.biz.SystemV1().RoleBiz().Tree(ctx, 0)
res, err := h.svc.Tree(ctx, 0)
if err != nil {
h.render.JSONERR(w, err.Error())
return
@@ -137,7 +125,7 @@ func (h *roleHandler) Data(w http.ResponseWriter, r *http.Request) {
h.render.JSON(w, res)
return
} else if t == "xmselect_tree" {
res, err := h.biz.SystemV1().RoleBiz().XmSelectTree(ctx, 0)
res, err := h.svc.XmSelectTree(ctx, 0)
if err != nil {
h.render.JSONERR(w, err.Error())
return
@@ -148,19 +136,19 @@ func (h *roleHandler) Data(w http.ResponseWriter, r *http.Request) {
}
}
func (h *roleHandler) Refresh(w http.ResponseWriter, r *http.Request) {
_, err := h.biz.SystemV1().RoleBiz().Refresh(r.Context())
func (h *roleHandler) RefreshCache(w http.ResponseWriter, r *http.Request) {
err := h.svc.RefreshCache(r.Context())
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
h.render.JSONOK(w, "刷新成功")
h.render.JSONOK(w, "缓存刷新成功")
}
func (h *roleHandler) RebuildParentPath(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
err := h.biz.SystemV1().RoleBiz().RebuildParentPath(ctx)
err := h.svc.RebuildParentPath(ctx)
if err != nil {
h.render.JSONERR(w, err.Error())
return
@@ -174,28 +162,28 @@ func (h *roleHandler) RefreshRoleMenus(w http.ResponseWriter, r *http.Request) {
// 获取需要刷新的角色ID
roleID := convertor.ConvertInt[int32](r.PostFormValue("roleID"), 0)
sysRole, err := h.biz.SystemV1().RoleBiz().Get(ctx, int32(roleID))
if err != nil || sysRole == nil {
role, err := h.svc.Get(ctx, int32(roleID))
if err != nil || role == nil {
h.render.JSONERR(w, err.Error())
return
}
// 刷新角色菜单 (角色所拥有的菜单集合)
_, err = h.biz.SystemV1().MenuBiz().SetOwnerListMenuByRoleID(ctx, sysRole.ID)
_, err = h.menusvc.SetListByRoleID(ctx, role.ID)
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
// 刷新角色菜单 (角色所拥有的菜单集合)
_, err = h.biz.SystemV1().MenuBiz().SetOwnerMapMenuByRoleID(ctx, sysRole.ID)
_, err = h.menusvc.SetListByRoleIDToMap(ctx, role.ID)
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
// 刷新角色菜单树 (pear admin layui 使用的格式)
_, err = h.biz.SystemV1().MenuBiz().SetRecursiveSysMenus(ctx, sysRole.ID)
_, err = h.menusvc.SetOwerMenus(ctx, role.ID)
if err != nil {
h.render.JSONERR(w, err.Error())
return
@@ -210,15 +198,15 @@ func (h *roleHandler) SetMenu(w http.ResponseWriter, r *http.Request) {
vars := r.URL.Query()
id := convertor.QueryInt[int32](vars, "id", 0)
vm := struct {
Role *db.SysRole
Role *system.Role
Menus []*dto.SetMenuDto
}{}
if id > 0 {
ctx := r.Context()
var err error
vm.Role, err = h.biz.SystemV1().RoleBiz().Get(ctx, id)
vm.Role, err = h.svc.Get(ctx, id)
if err == nil {
vm.Menus, _ = h.biz.SystemV1().MenuBiz().SetMenuViewData(ctx, vm.Role.ID)
vm.Menus, _ = h.menusvc.MenuViewData(ctx, vm.Role.ID)
}
}
@@ -226,52 +214,52 @@ func (h *roleHandler) SetMenu(w http.ResponseWriter, r *http.Request) {
"Item": vm,
})
case http.MethodPost:
ctx := r.Context()
id := convertor.ConvertInt[int32](r.PostFormValue("ID"), 0)
menus := r.PostFormValue("roleMenu")
if id == 0 {
h.render.JSONERR(w, "角色异常, 请刷新重试")
return
}
if len(menus) == 0 {
h.render.JSONERR(w, "请选择菜单")
return
}
ctx := r.Context()
_, err := h.biz.SystemV1().RoleBiz().Get(ctx, id)
role, err := h.svc.Get(ctx, id)
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
menus := r.PostFormValue("roleMenu")
if len(menus) == 0 {
h.render.JSONERR(w, "请选择菜单")
return
}
menuArr := strings.Split(menus, ",")
if len(menuArr) == 0 {
h.render.JSONERR(w, "请选择菜单")
return
}
var menuList []*db.SysMenu
var rms []*system.RoleMenu
for _, v := range menuArr {
menuID := convertor.ConvertInt(v, 0)
if menuID > 0 {
menu, err := h.biz.SystemV1().MenuBiz().Get(ctx, int32(menuID))
menu, err := h.menusvc.Get(ctx, int32(menuID))
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
menuList = append(menuList, menu)
rms = append(rms, &system.RoleMenu{
RoleID: role.ID,
MenuID: menu.ID,
})
}
}
if len(menuList) == 0 {
if len(rms) == 0 {
h.render.JSONERR(w, "请选择正确的菜单")
return
}
err = h.biz.SystemV1().MenuBiz().SetMenu(ctx, id, menuList)
err = h.menusvc.SetRoleMenu(ctx, id, rms)
if err != nil {
h.render.JSONERR(w, err.Error())
return

76
internal/erpserver/handler/system/system.go
View File

@@ -1,76 +0,0 @@
package system
import (
"net/http"
"management/internal/erpserver/biz"
"management/internal/pkg/middleware"
"management/internal/pkg/redis"
"management/internal/pkg/session"
"management/internal/pkg/tpl"
)
type SystemHandler interface {
Home(w http.ResponseWriter, req *http.Request)
Dashboard(w http.ResponseWriter, req *http.Request)
UserHandler() UserHandler
MenuHandler() MenuHandler
RoleHandler() RoleHandler
DepartmentHandler() DepartmentHandler
ConfigHandler() ConfigHandler
AuditHandler() AuditHandler
LoginLogHandler() LoginLogHandler
CategoryHandler() CategoryHandler
}
type systemHandler struct {
render tpl.Renderer
redis redis.IRedis
session session.ISession
biz biz.IBiz
mi middleware.IMiddleware
}
var _ SystemHandler = (*systemHandler)(nil)
func NewSystemHandler(render tpl.Renderer, redis redis.IRedis, session session.ISession, biz biz.IBiz, mi middleware.IMiddleware) *systemHandler {
return &systemHandler{
render: render,
redis: redis,
session: session,
biz: biz,
mi: mi,
}
}
func (h *systemHandler) UserHandler() UserHandler {
return NewUserHandler(h.render, h.session, h.biz, h.mi)
}
func (h *systemHandler) MenuHandler() MenuHandler {
return NewMenuHandler(h.render, h.session, h.biz)
}
func (h *systemHandler) RoleHandler() RoleHandler {
return NewRoleHandler(h.render, h.biz)
}
func (h *systemHandler) DepartmentHandler() DepartmentHandler {
return NewDepartmentHandler(h.render, h.biz)
}
func (h *systemHandler) ConfigHandler() ConfigHandler {
return NewConfigHandler(h.render, h.redis, h.biz)
}
func (h *systemHandler) AuditHandler() AuditHandler {
return NewAuditHandler(h.render, h.biz)
}
func (h *systemHandler) LoginLogHandler() LoginLogHandler {
return NewLoginLogHandler(h.render, h.biz)
}
func (h *systemHandler) CategoryHandler() CategoryHandler {
return NewCategoryHandler(h.render, h.biz)
}

116
internal/erpserver/handler/system/user.go
View File

@@ -1,57 +1,47 @@
package system
import (
"encoding/json"
"log"
"net/http"
"management/internal/db/model/dto"
db "management/internal/db/sqlc"
"management/internal/erpserver/biz"
"management/internal/erpserver/model/form"
systemmodel "management/internal/erpserver/model/system"
v1 "management/internal/erpserver/service/v1"
"management/internal/pkg/binding"
"management/internal/pkg/convertor"
"management/internal/pkg/know"
"management/internal/pkg/middleware"
"management/internal/pkg/session"
"management/internal/pkg/tpl"
"management/internal/pkg/tpl/html"
"github.com/zhang2092/browser"
)
type UserHandler interface {
Add(w http.ResponseWriter, r *http.Request)
Edit(w http.ResponseWriter, r *http.Request)
Save(w http.ResponseWriter, r *http.Request)
List(w http.ResponseWriter, r *http.Request)
Profile(w http.ResponseWriter, r *http.Request)
Data(w http.ResponseWriter, r *http.Request)
UserExpansion
}
type UserExpansion interface {
Login(w http.ResponseWriter, r *http.Request)
Logout(w http.ResponseWriter, r *http.Request)
}
// userHandler 是 UserHandler 接口的实现.
type userHandler struct {
render tpl.Renderer
session session.ISession
biz biz.IBiz
mi middleware.IMiddleware
render tpl.Renderer
mi middleware.Middleware
captchasvc v1.CaptchaService
usersvc v1.UserService
rolesvc v1.RoleService
departmentsvc v1.DepartmentService
}
// 确保 userHandler 实现了 UserHandler 接口.
var _ UserHandler = (*userHandler)(nil)
func NewUserHandler(render tpl.Renderer, session session.ISession, biz biz.IBiz, mi middleware.IMiddleware) *userHandler {
func NewUserHandler(
render tpl.Renderer,
mi middleware.Middleware,
captchasvc v1.CaptchaService,
usersvc v1.UserService,
rolesvc v1.RoleService,
departmentsvc v1.DepartmentService,
) *userHandler {
return &userHandler{
render: render,
session: session,
biz: biz,
mi: mi,
render: render,
mi: mi,
captchasvc: captchasvc,
usersvc: usersvc,
rolesvc: rolesvc,
departmentsvc: departmentsvc,
}
}
@@ -66,16 +56,16 @@ func (h *userHandler) Add(w http.ResponseWriter, r *http.Request) {
func (h *userHandler) Edit(w http.ResponseWriter, r *http.Request) {
vars := r.URL.Query()
id := convertor.QueryInt[int32](vars, "id", 0)
sysUser := &db.SysUser{}
user := &systemmodel.User{}
if id > 0 {
ctx := r.Context()
if user, err := h.biz.SystemV1().UserBiz().Get(ctx, id); err == nil {
if u, err := h.usersvc.Get(ctx, id); err == nil {
user.HashedPassword = []byte("********")
sysUser = user
user = u
}
}
h.render.HTML(w, r, "user/edit.tmpl", map[string]any{
"Item": sysUser,
"Item": user,
})
}
@@ -88,20 +78,20 @@ func (h *userHandler) Save(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
if req.DepartmentID > 0 {
if _, err := h.biz.SystemV1().DepartmentBiz().Get(ctx, req.DepartmentID); err != nil {
if _, err := h.departmentsvc.Get(ctx, req.DepartmentID); err != nil {
h.render.JSONERR(w, "部门数据错误")
return
}
}
if req.RoleID > 0 {
if _, err := h.biz.SystemV1().RoleBiz().Get(ctx, req.RoleID); err != nil {
if _, err := h.rolesvc.Get(ctx, req.RoleID); err != nil {
h.render.JSONERR(w, "角色数据错误")
return
}
}
if *req.ID == 0 {
err := h.biz.SystemV1().UserBiz().Create(ctx, &req)
err := h.usersvc.Create(ctx, &req)
if err != nil {
h.render.JSONERR(w, err.Error())
return
@@ -109,7 +99,7 @@ func (h *userHandler) Save(w http.ResponseWriter, r *http.Request) {
h.render.JSONOK(w, "添加成功")
} else {
err := h.biz.SystemV1().UserBiz().Update(ctx, &req)
err := h.usersvc.Update(ctx, &req)
if err != nil {
h.render.JSONERR(w, err.Error())
return
@@ -127,13 +117,14 @@ func (h *userHandler) List(w http.ResponseWriter, r *http.Request) {
})
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.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)
res, count, err := h.biz.SystemV1().UserBiz().List(r.Context(), q)
res, count, err := h.usersvc.List(r.Context(), q)
if err != nil {
h.render.JSONERR(w, err.Error())
return
@@ -154,7 +145,7 @@ func (h *userHandler) List(w http.ResponseWriter, r *http.Request) {
func (h *userHandler) Profile(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
user := h.mi.AuthUser(ctx)
vm, _ := h.biz.SystemV1().UserBiz().Get(ctx, user.ID)
vm, _ := h.usersvc.Get(ctx, user.ID)
h.render.HTML(w, r, "user/profile.tmpl", map[string]any{
"Item": vm,
})
@@ -164,7 +155,7 @@ func (h *userHandler) Data(w http.ResponseWriter, r *http.Request) {
vars := r.URL.Query()
t := vars.Get("type")
if t == "xmselect" {
res, err := h.biz.SystemV1().UserBiz().XmSelect(r.Context())
res, err := h.usersvc.XmSelect(r.Context())
if err != nil {
h.render.JSONERR(w, err.Error())
return
@@ -181,17 +172,11 @@ func (h *userHandler) Login(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
switch r.Method {
case http.MethodGet:
var user dto.AuthorizeUser
u := h.session.GetBytes(ctx, know.StoreName)
if err := json.Unmarshal(u, &user); err == nil {
// 判断用户是否登陆, 已经登陆则刷新令牌，跳转到首页
if err := h.session.RenewToken(ctx); err == nil {
h.session.Put(ctx, know.StoreName, u)
http.Redirect(w, r, "/home.html", http.StatusFound)
return
}
if h.mi.IsAuth(ctx) && h.mi.RefreshToken(ctx) {
http.Redirect(w, r, "/home.html", http.StatusFound)
return
}
h.session.Destroy(ctx)
_ = h.mi.Destroy(ctx)
h.render.HTML(w, r, "oauth/login.tmpl", nil)
case http.MethodPost:
defer r.Body.Close()
@@ -202,35 +187,26 @@ func (h *userHandler) Login(w http.ResponseWriter, r *http.Request) {
return
}
if !h.biz.CommonV1().CaptchaBiz().Verify(req.CaptchaID, req.Captcha, true) {
if !h.captchasvc.Verify(req.CaptchaID, req.Captcha, true) {
h.render.JSONERR(w, "验证码错误")
return
}
br, err := browser.NewBrowser(r.Header.Get("User-Agent"))
if err != nil {
h.render.JSONERR(w, "平台信息获取错误")
return
}
req.Ip = r.RemoteAddr
req.Referrer = r.Header.Get("Referer")
req.Url = r.URL.RequestURI()
req.Os = br.Platform().Name()
req.Browser = br.Name()
err = h.biz.SystemV1().UserBiz().Login(ctx, &req)
req = req.SetAttributes(r)
err := h.usersvc.Login(ctx, &req)
if err != nil {
log.Println(err)
h.render.JSONERR(w, err.Error())
return
}
h.render.JSONOK(w, "login successful")
h.render.JSONOK(w, "login successfully")
default:
http.Error(w, "Method Not Allowed", http.StatusMethodNotAllowed)
}
}
func (h *userHandler) Logout(w http.ResponseWriter, r *http.Request) {
h.session.Destroy(r.Context())
h.mi.Destroy(r.Context())
http.Redirect(w, r, "/", http.StatusFound)
}