改造成api
This commit is contained in:
@@ -1,37 +0,0 @@
|
||||
package config
|
||||
|
||||
import (
|
||||
v1 "management/internal/erpserver/service/v1"
|
||||
"management/internal/pkg/mid"
|
||||
"management/internal/pkg/render"
|
||||
"management/internal/pkg/session"
|
||||
"management/internal/tasks"
|
||||
|
||||
"github.com/drhin/logger"
|
||||
"github.com/go-chi/chi/v5"
|
||||
)
|
||||
|
||||
type Config struct {
|
||||
Log *logger.Logger
|
||||
Sm session.Manager
|
||||
Render render.Renderer
|
||||
TaskDistributor tasks.TaskDistributor
|
||||
MenuService v1.MenuService
|
||||
ConfigService v1.ConfigService
|
||||
}
|
||||
|
||||
func Routes(r chi.Router, cfg Config) {
|
||||
app := newApp(cfg.Render, cfg.ConfigService)
|
||||
|
||||
r.Get("/pear.json", app.pear)
|
||||
r.Route("/config", func(r chi.Router) {
|
||||
r.Use(mid.Audit(cfg.Sm, cfg.Log, cfg.TaskDistributor))
|
||||
r.Get("/list", app.list)
|
||||
r.Post("/list", app.list)
|
||||
r.Get("/add", app.add)
|
||||
r.Get("/edit", app.edit)
|
||||
r.Post("/save", app.save)
|
||||
r.Post("/refresh_cache", app.refreshCache)
|
||||
r.Post("/reset_pear", app.resetPear)
|
||||
})
|
||||
}
|
||||
@@ -1,6 +1,8 @@
|
||||
package system
|
||||
|
||||
import (
|
||||
"log"
|
||||
|
||||
"management/internal/erpserver/model/system/request"
|
||||
"management/internal/erpserver/service/v1"
|
||||
"management/internal/pkg/gin/gu"
|
||||
@@ -25,6 +27,8 @@ func (a *LoginLogApp) List(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
log.Println("hahaha")
|
||||
|
||||
res, count, err := a.loginLogService.List(c, req)
|
||||
if err != nil {
|
||||
gu.Failed(c, err.Error())
|
||||
|
||||
256
internal/erpserver/handler/system/menu.go
Normal file
256
internal/erpserver/handler/system/menu.go
Normal file
@@ -0,0 +1,256 @@
|
||||
package system
|
||||
|
||||
import (
|
||||
v1 "management/internal/erpserver/service/v1"
|
||||
"management/internal/pkg/gin/gu"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
const style = "layui-btn-primary layui-btn-sm"
|
||||
|
||||
type MenuApp struct {
|
||||
menuService v1.MenuService
|
||||
}
|
||||
|
||||
func NewMenuApp(menuService v1.MenuService) *MenuApp {
|
||||
return &MenuApp{
|
||||
menuService: menuService,
|
||||
}
|
||||
}
|
||||
|
||||
type Menu struct {
|
||||
ID int `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Url string `json:"url"`
|
||||
Icon string `json:"icon"`
|
||||
Child []Menu `json:"child"`
|
||||
}
|
||||
|
||||
func (a *MenuApp) Menus(c *gin.Context) {
|
||||
res := []Menu{
|
||||
{
|
||||
ID: 1,
|
||||
Name: "系统管理",
|
||||
Icon: "setting",
|
||||
Url: "",
|
||||
Child: []Menu{
|
||||
{
|
||||
ID: 11,
|
||||
Name: "菜单管理",
|
||||
Icon: "baseball",
|
||||
Url: "/system/menu",
|
||||
},
|
||||
{
|
||||
ID: 12,
|
||||
Name: "角色管理",
|
||||
Icon: "baseball",
|
||||
Url: "/system/role",
|
||||
},
|
||||
{
|
||||
ID: 12,
|
||||
Name: "部门管理",
|
||||
Icon: "baseball",
|
||||
Url: "/system/department",
|
||||
},
|
||||
{
|
||||
ID: 13,
|
||||
Name: "用户管理",
|
||||
Icon: "baseball",
|
||||
Url: "/system/user",
|
||||
},
|
||||
{
|
||||
ID: 14,
|
||||
Name: "登录日志",
|
||||
Icon: "baseball",
|
||||
Url: "/system/login_log",
|
||||
},
|
||||
{
|
||||
ID: 15,
|
||||
Name: "操作日志",
|
||||
Icon: "baseball",
|
||||
Url: "/system/audit_log",
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
gu.Ok(c, res)
|
||||
}
|
||||
|
||||
//
|
||||
//func (a *MenuApp) list(w http.ResponseWriter, r *http.Request) {
|
||||
// switch r.Method {
|
||||
// case http.MethodGet:
|
||||
// ctx := r.Context()
|
||||
// a.render.Render(ctx, w, menu.List(ctx))
|
||||
// case http.MethodPost:
|
||||
// res, err := a.menuService.ListMenuTree(r.Context())
|
||||
// if err != nil {
|
||||
// a.render.JSONErr(w, err.Error())
|
||||
// return
|
||||
// }
|
||||
// a.render.JSON(w, render.NewResponseList(0, res))
|
||||
// default:
|
||||
// a.render.JSONErr(w, "method not allowed")
|
||||
// }
|
||||
//}
|
||||
//
|
||||
//func (a *MenuApp) add(w http.ResponseWriter, r *http.Request) {
|
||||
// ctx := r.Context()
|
||||
// a.render.Render(ctx, w, menu.Edit(ctx, &systemmodel.Menu{Style: style, Visible: true, Sort: 6666}))
|
||||
//}
|
||||
//
|
||||
//func (a *MenuApp) addChildren(w http.ResponseWriter, r *http.Request) {
|
||||
// ctx := r.Context()
|
||||
// vars := r.URL.Query()
|
||||
// parentID := convertor.QueryInt[int32](vars, "parentID", 0)
|
||||
// vm := &systemmodel.Menu{ParentID: parentID, Style: style, Visible: true, Sort: 6666}
|
||||
// parent, err := a.menuService.Get(ctx, parentID)
|
||||
// if err == nil {
|
||||
// if parent.Type == "node" {
|
||||
// vm.Type = "menu"
|
||||
// } else if parent.Type == "menu" {
|
||||
// vm.Type = "btn"
|
||||
// }
|
||||
// }
|
||||
// a.render.Render(ctx, w, menu.Edit(ctx, vm))
|
||||
//}
|
||||
//
|
||||
//func (a *MenuApp) edit(w http.ResponseWriter, r *http.Request) {
|
||||
// ctx := r.Context()
|
||||
// vars := r.URL.Query()
|
||||
// id := convertor.QueryInt[int32](vars, "id", 0)
|
||||
// vm := &systemmodel.Menu{Style: style, Sort: 6666}
|
||||
// if id > 0 {
|
||||
// vm, _ = a.menuService.Get(r.Context(), id)
|
||||
// }
|
||||
// a.render.Render(ctx, w, menu.Edit(ctx, vm))
|
||||
//}
|
||||
//
|
||||
//func (a *MenuApp) save(w http.ResponseWriter, r *http.Request) {
|
||||
// id := convertor.Int[int32](r.PostFormValue("ID"), 0)
|
||||
// name := r.PostFormValue("Name")
|
||||
// displayName := r.PostFormValue("DisplayName")
|
||||
// t := r.PostFormValue("Type")
|
||||
// url := r.PostFormValue("Url")
|
||||
// if len(url) == 0 {
|
||||
// url = uuid.Must(uuid.NewRandom()).String()
|
||||
// }
|
||||
// avatar := r.PostFormValue("Avatar")
|
||||
// style := r.PostFormValue("Style")
|
||||
// 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 ") {
|
||||
// avatar = "layui-icon " + avatar
|
||||
// }
|
||||
//
|
||||
// parentPath := ""
|
||||
// if parentID > 0 {
|
||||
// parent, err := a.menuService.Get(ctx, parentID)
|
||||
// if err != nil {
|
||||
// a.render.JSONErr(w, err.Error())
|
||||
// return
|
||||
// }
|
||||
// parentPath = parent.ParentPath + "," + strconv.Itoa(int(parentID)) + ","
|
||||
// parentPath = strings.ReplaceAll(parentPath, ",,", ",")
|
||||
// }
|
||||
//
|
||||
// if id == 0 {
|
||||
// arg := &systemmodel.Menu{
|
||||
// Name: name,
|
||||
// DisplayName: displayName,
|
||||
// Url: url,
|
||||
// Type: t,
|
||||
// ParentID: parentID,
|
||||
// ParentPath: parentPath,
|
||||
// Avatar: avatar,
|
||||
// Style: style,
|
||||
// Visible: visible,
|
||||
// IsList: isList,
|
||||
// Status: status,
|
||||
// Sort: sort,
|
||||
// CreatedAt: time.Now(),
|
||||
// UpdatedAt: time.Now(),
|
||||
// }
|
||||
// err := a.menuService.Create(ctx, arg)
|
||||
// if err != nil {
|
||||
// if database.IsUniqueViolation(err) {
|
||||
// a.render.JSONErr(w, "菜单已存在")
|
||||
// return
|
||||
// }
|
||||
// a.render.JSONErr(w, err.Error())
|
||||
// return
|
||||
// }
|
||||
//
|
||||
// a.render.JSONOk(w, "添加成功")
|
||||
// } else {
|
||||
// res, err := a.menuService.Get(ctx, id)
|
||||
// if err != nil {
|
||||
// a.render.JSONErr(w, err.Error())
|
||||
// return
|
||||
// }
|
||||
//
|
||||
// res.Name = name
|
||||
// res.DisplayName = displayName
|
||||
// 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 = a.menuService.Update(ctx, res)
|
||||
// if err != nil {
|
||||
// a.render.JSONErr(w, err.Error())
|
||||
// return
|
||||
// }
|
||||
//
|
||||
// a.render.JSONOk(w, "更新成功")
|
||||
// }
|
||||
//}
|
||||
//
|
||||
//func (a *MenuApp) data(w http.ResponseWriter, r *http.Request) {
|
||||
// ctx := r.Context()
|
||||
// vars := r.URL.Query()
|
||||
// t := vars.Get("type")
|
||||
// if t == "tree" {
|
||||
// res, err := a.menuService.Tree(ctx, 0)
|
||||
// if err != nil {
|
||||
// a.render.JSONErr(w, err.Error())
|
||||
// return
|
||||
// }
|
||||
//
|
||||
// a.render.JSON(w, res)
|
||||
// return
|
||||
// } else if t == "xm_select_tree" {
|
||||
// res, err := a.menuService.XmSelectTree(ctx, 0)
|
||||
// if err != nil {
|
||||
// a.render.JSONErr(w, err.Error())
|
||||
// return
|
||||
// }
|
||||
//
|
||||
// a.render.JSON(w, res)
|
||||
// return
|
||||
// }
|
||||
// a.render.JSON(w, nil)
|
||||
//}
|
||||
//
|
||||
//func (a *MenuApp) refreshCache(w http.ResponseWriter, r *http.Request) {
|
||||
// err := a.menuService.RefreshCache(r.Context())
|
||||
// if err != nil {
|
||||
// a.render.JSONErr(w, err.Error())
|
||||
// return
|
||||
// }
|
||||
//
|
||||
// a.render.JSONOk(w, "缓存刷新成功")
|
||||
//}
|
||||
@@ -1,220 +0,0 @@
|
||||
package menu
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
systemmodel "management/internal/erpserver/model/system"
|
||||
v1 "management/internal/erpserver/service/v1"
|
||||
"management/internal/erpserver/templ/system/menu"
|
||||
"management/internal/pkg/convertor"
|
||||
"management/internal/pkg/database"
|
||||
"management/internal/pkg/mid"
|
||||
"management/internal/pkg/render"
|
||||
|
||||
"github.com/google/uuid"
|
||||
)
|
||||
|
||||
const style = "layui-btn-primary layui-btn-sm"
|
||||
|
||||
type app struct {
|
||||
render render.Renderer
|
||||
menuService v1.MenuService
|
||||
}
|
||||
|
||||
func newApp(render render.Renderer, menuService v1.MenuService) *app {
|
||||
return &app{
|
||||
render: render,
|
||||
menuService: menuService,
|
||||
}
|
||||
}
|
||||
|
||||
func (a *app) menus(w http.ResponseWriter, r *http.Request) {
|
||||
ctx := r.Context()
|
||||
user := mid.GetUser(ctx)
|
||||
menus, err := a.menuService.OwerMenus(ctx, user.RoleID)
|
||||
if err != nil {
|
||||
a.render.JSONErr(w, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
a.render.JSON(w, menus)
|
||||
}
|
||||
|
||||
func (a *app) list(w http.ResponseWriter, r *http.Request) {
|
||||
switch r.Method {
|
||||
case http.MethodGet:
|
||||
ctx := r.Context()
|
||||
a.render.Render(ctx, w, menu.List(ctx))
|
||||
case http.MethodPost:
|
||||
res, err := a.menuService.ListMenuTree(r.Context())
|
||||
if err != nil {
|
||||
a.render.JSONErr(w, err.Error())
|
||||
return
|
||||
}
|
||||
a.render.JSON(w, render.NewResponseList(0, res))
|
||||
default:
|
||||
a.render.JSONErr(w, "method not allowed")
|
||||
}
|
||||
}
|
||||
|
||||
func (a *app) add(w http.ResponseWriter, r *http.Request) {
|
||||
ctx := r.Context()
|
||||
a.render.Render(ctx, w, menu.Edit(ctx, &systemmodel.Menu{Style: style, Visible: true, Sort: 6666}))
|
||||
}
|
||||
|
||||
func (a *app) addChildren(w http.ResponseWriter, r *http.Request) {
|
||||
ctx := r.Context()
|
||||
vars := r.URL.Query()
|
||||
parentID := convertor.QueryInt[int32](vars, "parentID", 0)
|
||||
vm := &systemmodel.Menu{ParentID: parentID, Style: style, Visible: true, Sort: 6666}
|
||||
parent, err := a.menuService.Get(ctx, parentID)
|
||||
if err == nil {
|
||||
if parent.Type == "node" {
|
||||
vm.Type = "menu"
|
||||
} else if parent.Type == "menu" {
|
||||
vm.Type = "btn"
|
||||
}
|
||||
}
|
||||
a.render.Render(ctx, w, menu.Edit(ctx, vm))
|
||||
}
|
||||
|
||||
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.Menu{Style: style, Sort: 6666}
|
||||
if id > 0 {
|
||||
vm, _ = a.menuService.Get(r.Context(), id)
|
||||
}
|
||||
a.render.Render(ctx, w, menu.Edit(ctx, vm))
|
||||
}
|
||||
|
||||
func (a *app) save(w http.ResponseWriter, r *http.Request) {
|
||||
id := convertor.Int[int32](r.PostFormValue("ID"), 0)
|
||||
name := r.PostFormValue("Name")
|
||||
displayName := r.PostFormValue("DisplayName")
|
||||
t := r.PostFormValue("Type")
|
||||
url := r.PostFormValue("Url")
|
||||
if len(url) == 0 {
|
||||
url = uuid.Must(uuid.NewRandom()).String()
|
||||
}
|
||||
avatar := r.PostFormValue("Avatar")
|
||||
style := r.PostFormValue("Style")
|
||||
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 ") {
|
||||
avatar = "layui-icon " + avatar
|
||||
}
|
||||
|
||||
parentPath := ""
|
||||
if parentID > 0 {
|
||||
parent, err := a.menuService.Get(ctx, parentID)
|
||||
if err != nil {
|
||||
a.render.JSONErr(w, err.Error())
|
||||
return
|
||||
}
|
||||
parentPath = parent.ParentPath + "," + strconv.Itoa(int(parentID)) + ","
|
||||
parentPath = strings.ReplaceAll(parentPath, ",,", ",")
|
||||
}
|
||||
|
||||
if id == 0 {
|
||||
arg := &systemmodel.Menu{
|
||||
Name: name,
|
||||
DisplayName: displayName,
|
||||
Url: url,
|
||||
Type: t,
|
||||
ParentID: parentID,
|
||||
ParentPath: parentPath,
|
||||
Avatar: avatar,
|
||||
Style: style,
|
||||
Visible: visible,
|
||||
IsList: isList,
|
||||
Status: status,
|
||||
Sort: sort,
|
||||
CreatedAt: time.Now(),
|
||||
UpdatedAt: time.Now(),
|
||||
}
|
||||
err := a.menuService.Create(ctx, arg)
|
||||
if err != nil {
|
||||
if database.IsUniqueViolation(err) {
|
||||
a.render.JSONErr(w, "菜单已存在")
|
||||
return
|
||||
}
|
||||
a.render.JSONErr(w, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
a.render.JSONOk(w, "添加成功")
|
||||
} else {
|
||||
res, err := a.menuService.Get(ctx, id)
|
||||
if err != nil {
|
||||
a.render.JSONErr(w, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
res.Name = name
|
||||
res.DisplayName = displayName
|
||||
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 = a.menuService.Update(ctx, res)
|
||||
if err != nil {
|
||||
a.render.JSONErr(w, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
a.render.JSONOk(w, "更新成功")
|
||||
}
|
||||
}
|
||||
|
||||
func (a *app) data(w http.ResponseWriter, r *http.Request) {
|
||||
ctx := r.Context()
|
||||
vars := r.URL.Query()
|
||||
t := vars.Get("type")
|
||||
if t == "tree" {
|
||||
res, err := a.menuService.Tree(ctx, 0)
|
||||
if err != nil {
|
||||
a.render.JSONErr(w, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
a.render.JSON(w, res)
|
||||
return
|
||||
} else if t == "xm_select_tree" {
|
||||
res, err := a.menuService.XmSelectTree(ctx, 0)
|
||||
if err != nil {
|
||||
a.render.JSONErr(w, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
a.render.JSON(w, res)
|
||||
return
|
||||
}
|
||||
a.render.JSON(w, nil)
|
||||
}
|
||||
|
||||
func (a *app) refreshCache(w http.ResponseWriter, r *http.Request) {
|
||||
err := a.menuService.RefreshCache(r.Context())
|
||||
if err != nil {
|
||||
a.render.JSONErr(w, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
a.render.JSONOk(w, "缓存刷新成功")
|
||||
}
|
||||
@@ -3,15 +3,19 @@ package system
|
||||
import (
|
||||
v1 "management/internal/erpserver/service/v1"
|
||||
|
||||
"github.com/drhin/logger"
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
type Config struct {
|
||||
MenuService v1.MenuService
|
||||
AuditLogService v1.AuditLogService
|
||||
ConfigService v1.ConfigService
|
||||
LoginLogService v1.LoginLogService
|
||||
RoleService v1.RoleService
|
||||
Log *logger.Logger
|
||||
MenuService v1.MenuService
|
||||
AuditLogService v1.AuditLogService
|
||||
ConfigService v1.ConfigService
|
||||
LoginLogService v1.LoginLogService
|
||||
RoleService v1.RoleService
|
||||
UserService v1.UserService
|
||||
DepartmentService v1.DepartmentService
|
||||
}
|
||||
|
||||
func Routes(r *gin.RouterGroup, cfg Config) {
|
||||
@@ -20,28 +24,42 @@ func Routes(r *gin.RouterGroup, cfg Config) {
|
||||
loginLogApp := NewLoginLogApp(cfg.LoginLogService)
|
||||
configApp := NewConfigApp(cfg.ConfigService)
|
||||
roleApp := NewRoleApp(cfg.RoleService, cfg.MenuService)
|
||||
userApp := NewUserApp(cfg.Log, cfg.UserService, cfg.RoleService, cfg.DepartmentService)
|
||||
menuApp := NewMenuApp(cfg.MenuService)
|
||||
|
||||
r.Group("/system", func(ctx *gin.Context) {
|
||||
systemRouter := r.Group("/system")
|
||||
{
|
||||
// 审计日志
|
||||
r.GET("/audit_log", auditApp.List)
|
||||
systemRouter.GET("/audit_log", auditApp.List)
|
||||
|
||||
// 登陆日志
|
||||
r.GET("/login_log", loginLogApp.List)
|
||||
systemRouter.GET("/login_log", loginLogApp.List)
|
||||
|
||||
// 配置
|
||||
r.POST("/config", configApp.Create)
|
||||
r.PUT("/config/:id", configApp.Update)
|
||||
r.GET("/config/:id", configApp.Get)
|
||||
r.GET("/config", configApp.List)
|
||||
systemRouter.POST("/config", configApp.Create)
|
||||
systemRouter.PUT("/config/:id", configApp.Update)
|
||||
systemRouter.GET("/config/:id", configApp.Get)
|
||||
systemRouter.GET("/config", configApp.List)
|
||||
systemRouter.POST("/refresh_cache", configApp.Refresh)
|
||||
systemRouter.POST("/reset_pear", configApp.ResetPear)
|
||||
|
||||
// 用户
|
||||
systemRouter.POST("/user", userApp.Create)
|
||||
systemRouter.PUT("/user", userApp.Update)
|
||||
systemRouter.GET("/user/:id", userApp.Get)
|
||||
systemRouter.GET("/user", userApp.List)
|
||||
|
||||
// 角色
|
||||
r.POST("/role", roleApp.Create)
|
||||
r.PUT("/role/:id", roleApp.Update)
|
||||
r.GET("/role/:id", roleApp.Get)
|
||||
r.GET("/role", roleApp.List)
|
||||
r.POST("/role/refresh_cache", roleApp.Refresh)
|
||||
r.POST("/role/rebuild_parent_path", roleApp.RebuildParentPath)
|
||||
r.POST("/role/refresh_role_menus", roleApp.RefreshRoleMenus)
|
||||
r.POST("/role/set_menu", roleApp.setMenu)
|
||||
})
|
||||
systemRouter.POST("/role", roleApp.Create)
|
||||
systemRouter.PUT("/role/:id", roleApp.Update)
|
||||
systemRouter.GET("/role/:id", roleApp.Get)
|
||||
systemRouter.GET("/role", roleApp.List)
|
||||
systemRouter.POST("/role/refresh_cache", roleApp.Refresh)
|
||||
systemRouter.POST("/role/rebuild_parent_path", roleApp.RebuildParentPath)
|
||||
systemRouter.POST("/role/refresh_role_menus", roleApp.RefreshRoleMenus)
|
||||
systemRouter.POST("/role/set_menu", roleApp.setMenu)
|
||||
|
||||
// 菜单
|
||||
systemRouter.GET("/permission_menu", menuApp.Menus)
|
||||
}
|
||||
}
|
||||
|
||||
114
internal/erpserver/handler/system/user.go
Normal file
114
internal/erpserver/handler/system/user.go
Normal file
@@ -0,0 +1,114 @@
|
||||
package system
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"net/http"
|
||||
|
||||
"management/internal/erpserver/model/system/request"
|
||||
v1 "management/internal/erpserver/service/v1"
|
||||
"management/internal/pkg/gin/gu"
|
||||
"management/internal/pkg/sqldb"
|
||||
|
||||
"github.com/drhin/logger"
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
type UserApp struct {
|
||||
log *logger.Logger
|
||||
userService v1.UserService
|
||||
roleService v1.RoleService
|
||||
departmentService v1.DepartmentService
|
||||
}
|
||||
|
||||
func NewUserApp(
|
||||
log *logger.Logger,
|
||||
userService v1.UserService,
|
||||
roleService v1.RoleService,
|
||||
departmentService v1.DepartmentService,
|
||||
) *UserApp {
|
||||
return &UserApp{
|
||||
log: log,
|
||||
userService: userService,
|
||||
roleService: roleService,
|
||||
departmentService: departmentService,
|
||||
}
|
||||
}
|
||||
|
||||
func (a *UserApp) Create(c *gin.Context) {
|
||||
var req request.CreateAndUpdateUser
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
gu.ValidatorErrors(c, err)
|
||||
return
|
||||
}
|
||||
|
||||
if err := a.userService.Create(c, &req); err != nil {
|
||||
if errors.Is(err, sqldb.ErrDBDuplicatedEntry) {
|
||||
gu.FailedWithCode(c, http.StatusConflict, "用户已存在")
|
||||
return
|
||||
}
|
||||
|
||||
gu.Failed(c, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
gu.Ok(c, "添加成功")
|
||||
}
|
||||
|
||||
func (a *UserApp) Update(c *gin.Context) {
|
||||
var id request.GetUserID
|
||||
if err := c.ShouldBindUri(&id); err != nil {
|
||||
gu.ValidatorErrors(c, err)
|
||||
return
|
||||
}
|
||||
|
||||
var req request.CreateAndUpdateUser
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
gu.ValidatorErrors(c, err)
|
||||
return
|
||||
}
|
||||
|
||||
req.ID = &id.ID
|
||||
if err := a.userService.Update(c, &req); err != nil {
|
||||
gu.Failed(c, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
gu.Ok(c, "更新成功")
|
||||
}
|
||||
|
||||
func (a *UserApp) Get(c *gin.Context) {
|
||||
var id request.GetUserID
|
||||
if err := c.ShouldBindUri(&id); err != nil {
|
||||
gu.ValidatorErrors(c, err)
|
||||
return
|
||||
}
|
||||
|
||||
user, err := a.userService.Get(c, id.ID)
|
||||
if err != nil {
|
||||
if errors.Is(err, sqldb.ErrDBNotFound) {
|
||||
gu.FailedWithCode(c, http.StatusNotFound, "用户不存在")
|
||||
return
|
||||
}
|
||||
|
||||
gu.Failed(c, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
gu.Ok(c, user)
|
||||
}
|
||||
|
||||
func (a *UserApp) List(c *gin.Context) {
|
||||
var req request.ListUser
|
||||
if err := c.ShouldBindQuery(&req); err != nil {
|
||||
gu.ValidatorErrors(c, err)
|
||||
return
|
||||
}
|
||||
|
||||
res, count, err := a.userService.List(c, req)
|
||||
if err != nil {
|
||||
gu.Failed(c, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
gu.Ok(c, gu.NewPageData(count, req.PageID, req.PageSize, res))
|
||||
}
|
||||
@@ -1,152 +0,0 @@
|
||||
package user
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"management/internal/erpserver/model/dto"
|
||||
"management/internal/erpserver/model/form"
|
||||
systemmodel "management/internal/erpserver/model/system"
|
||||
v1 "management/internal/erpserver/service/v1"
|
||||
"management/internal/erpserver/templ/system/user"
|
||||
"management/internal/pkg/binding"
|
||||
"management/internal/pkg/convertor"
|
||||
"management/internal/pkg/mid"
|
||||
"management/internal/pkg/render"
|
||||
"management/internal/pkg/session"
|
||||
|
||||
"github.com/drhin/logger"
|
||||
)
|
||||
|
||||
type app struct {
|
||||
log *logger.Logger
|
||||
sm session.Manager
|
||||
render render.Renderer
|
||||
userService v1.UserService
|
||||
roleService v1.RoleService
|
||||
departmentService v1.DepartmentService
|
||||
}
|
||||
|
||||
func newApp(
|
||||
log *logger.Logger,
|
||||
sm session.Manager,
|
||||
render render.Renderer,
|
||||
userService v1.UserService,
|
||||
roleService v1.RoleService,
|
||||
departmentService v1.DepartmentService,
|
||||
) *app {
|
||||
return &app{
|
||||
log: log,
|
||||
sm: sm,
|
||||
render: render,
|
||||
userService: userService,
|
||||
roleService: roleService,
|
||||
departmentService: departmentService,
|
||||
}
|
||||
}
|
||||
|
||||
func (a *app) add(w http.ResponseWriter, r *http.Request) {
|
||||
ctx := r.Context()
|
||||
a.render.Render(ctx, w, user.Edit(ctx, &systemmodel.User{HashedPassword: nil}))
|
||||
}
|
||||
|
||||
func (a *app) edit(w http.ResponseWriter, r *http.Request) {
|
||||
ctx := r.Context()
|
||||
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
|
||||
vm.HashedPassword = []byte("********")
|
||||
}
|
||||
}
|
||||
a.render.Render(ctx, w, user.Edit(ctx, vm))
|
||||
}
|
||||
|
||||
func (a *app) save(w http.ResponseWriter, r *http.Request) {
|
||||
var req form.User
|
||||
if err := binding.Form.Bind(r, &req); err != nil {
|
||||
a.render.JSONErr(w, binding.ValidatorErrors(err))
|
||||
return
|
||||
}
|
||||
|
||||
ctx := r.Context()
|
||||
if req.DepartmentID > 0 {
|
||||
if _, err := a.departmentService.Get(ctx, req.DepartmentID); err != nil {
|
||||
a.render.JSONErr(w, "部门数据错误")
|
||||
return
|
||||
}
|
||||
}
|
||||
if req.RoleID > 0 {
|
||||
if _, err := a.roleService.Get(ctx, req.RoleID); err != nil {
|
||||
a.render.JSONErr(w, "角色数据错误")
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if *req.ID == 0 {
|
||||
err := a.userService.Create(ctx, &req)
|
||||
if err != nil {
|
||||
a.render.JSONErr(w, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
a.render.JSONOk(w, "添加成功")
|
||||
} else {
|
||||
err := a.userService.Update(ctx, &req)
|
||||
if err != nil {
|
||||
a.render.JSONErr(w, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
a.render.JSONOk(w, "更新成功")
|
||||
}
|
||||
}
|
||||
|
||||
func (a *app) list(w http.ResponseWriter, r *http.Request) {
|
||||
switch r.Method {
|
||||
case http.MethodGet:
|
||||
ctx := r.Context()
|
||||
a.render.Render(ctx, w, user.List(ctx))
|
||||
case http.MethodPost:
|
||||
var q dto.SearchDto
|
||||
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.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())
|
||||
return
|
||||
}
|
||||
a.render.JSON(w, render.NewResponseList(count, res))
|
||||
default:
|
||||
http.Error(w, "Method Not Allowed", http.StatusMethodNotAllowed)
|
||||
}
|
||||
}
|
||||
|
||||
func (a *app) profile(w http.ResponseWriter, r *http.Request) {
|
||||
ctx := r.Context()
|
||||
u := mid.GetUser(ctx)
|
||||
vm, _ := a.userService.Get(ctx, u.ID)
|
||||
a.render.Render(ctx, w, user.Profile(ctx, vm))
|
||||
}
|
||||
|
||||
func (a *app) data(w http.ResponseWriter, r *http.Request) {
|
||||
vars := r.URL.Query()
|
||||
t := vars.Get("type")
|
||||
if t == "xm_select" {
|
||||
res, err := a.userService.XmSelect(r.Context())
|
||||
if err != nil {
|
||||
a.render.JSONErr(w, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
a.render.JSON(w, res)
|
||||
return
|
||||
}
|
||||
|
||||
a.render.JSON(w, nil)
|
||||
}
|
||||
Reference in New Issue
Block a user