v2_system

This commit is contained in:
2025-03-31 15:06:32 +08:00
parent 6fb06c456c
commit 490630d4c9
17 changed files with 972 additions and 206 deletions

View File

@@ -0,0 +1,239 @@
package system
import (
"fmt"
"net/http"
"strings"
"management/internal/db/model/dto"
db "management/internal/db/sqlc"
"management/internal/erpserver/biz"
"management/internal/pkg/convertor"
"management/internal/pkg/tpl"
"github.com/google/uuid"
"github.com/jackc/pgx/v5/pgtype"
)
type CategoryHandler 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)
Tree(w http.ResponseWriter, r *http.Request)
Refresh(w http.ResponseWriter, r *http.Request)
RebuildParentPath(w http.ResponseWriter, r *http.Request)
}
type categoryHandler struct {
render tpl.Renderer
biz biz.IBiz
}
var _ CategoryHandler = (*categoryHandler)(nil)
func NewCategoryHandler(render tpl.Renderer, biz biz.IBiz) *categoryHandler {
return &categoryHandler{
render: render,
biz: biz,
}
}
func (h *categoryHandler) List(w http.ResponseWriter, r *http.Request) {
switch r.Method {
case http.MethodGet:
h.render.HTML(w, r, "category/list.tmpl", nil)
case http.MethodPost:
var q dto.SearchDto
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().CategoryBiz().List(r.Context(), q)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
data := tpl.ResponseList{
Code: 0,
Message: "ok",
Count: count,
Data: res,
}
h.render.JSON(w, data)
default:
http.Error(w, "Method Not Allowed", http.StatusMethodNotAllowed)
}
}
func (h *categoryHandler) Add(w http.ResponseWriter, r *http.Request) {
h.render.HTML(w, r, "category/edit.tmpl", map[string]any{
"Item": &db.Category{Sort: 6666},
})
}
func (h *categoryHandler) AddChildren(w http.ResponseWriter, r *http.Request) {
vars := r.URL.Query()
parentID := convertor.QueryInt[int32](vars, "parentID", 0)
vm := &db.Category{ParentID: parentID, Sort: 6666}
h.render.HTML(w, r, "category/edit.tmpl", map[string]any{
"Item": vm,
})
}
func (h *categoryHandler) Edit(w http.ResponseWriter, r *http.Request) {
vars := r.URL.Query()
id := convertor.QueryInt[int32](vars, "id", 0)
vm := &db.Category{Sort: 6666}
if id > 0 {
vm, _ = h.biz.SystemV1().CategoryBiz().Get(r.Context(), id)
}
h.render.HTML(w, r, "category/edit.tmpl", map[string]any{
"Item": vm,
})
}
func (h *categoryHandler) Save(w http.ResponseWriter, r *http.Request) {
id := convertor.ConvertInt(r.PostFormValue("ID"), 0)
parentID := convertor.ConvertInt[int32](r.PostFormValue("ParentID"), 0)
name := r.PostFormValue("Name")
icon := r.PostFormValue("File")
if len(icon) > 0 && !strings.HasPrefix(icon, "/") {
icon = "/" + icon
}
description := r.PostFormValue("Description")
letter := r.PostFormValue("Letter")
if len(letter) == 0 {
letter = uuid.New().String()
}
sort := convertor.ConvertInt[int32](r.PostFormValue("Sort"), 6666)
status := convertor.ConvertInt[int16](r.PostFormValue("Status"), 9999)
ctx := r.Context()
var parent *db.Category
if parentID > 0 {
var err error
parent, err = h.biz.SystemV1().CategoryBiz().Get(ctx, parentID)
if err != nil {
h.render.JSONERR(w, "父级节点错误")
return
}
}
path := fmt.Sprintf("%s,%d,", parent.ParentPath, parent.ID)
path = strings.ReplaceAll(path, ",,", ",")
if id == 0 {
arg := &db.CreateCategoryParams{
Name: name,
Icon: icon,
Description: description,
Letter: letter,
ParentID: parentID,
ParentPath: path,
Status: status,
Sort: sort,
}
_, err := h.biz.SystemV1().CategoryBiz().Create(ctx, arg)
if err != nil {
if db.IsUniqueViolation(err) {
h.render.JSONERR(w, "名称已存在")
return
}
h.render.JSONERR(w, err.Error())
return
}
h.render.JSONOK(w, "添加成功")
} else {
arg := &db.UpdateCategoryParams{
ID: int32(id),
Name: pgtype.Text{
String: name,
Valid: true,
},
Icon: pgtype.Text{
String: icon,
Valid: len(icon) > 0,
},
Description: pgtype.Text{
String: description,
Valid: len(description) > 0,
},
Letter: pgtype.Text{
String: letter,
Valid: len(letter) > 0,
},
ParentID: pgtype.Int4{
Int32: parentID,
Valid: true,
},
ParentPath: pgtype.Text{
String: path,
Valid: true,
},
Sort: pgtype.Int4{
Int32: sort,
Valid: true,
},
Status: pgtype.Int2{
Int16: status,
Valid: true,
},
}
_, err := h.biz.SystemV1().CategoryBiz().Update(ctx, arg)
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
h.render.JSONOK(w, "更新成功")
}
}
func (h *categoryHandler) Tree(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
vars := r.URL.Query()
if vars.Get("type") == "xmselect" {
res, err := h.biz.SystemV1().CategoryBiz().XmSelect(ctx, 0)
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
h.render.JSON(w, res)
return
} else {
res, err := h.biz.SystemV1().CategoryBiz().Tree(ctx, 0)
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
h.render.JSON(w, res)
return
}
}
func (h *categoryHandler) Refresh(w http.ResponseWriter, r *http.Request) {
_, err := h.biz.SystemV1().CategoryBiz().Refresh(r.Context())
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
h.render.JSONOK(w, "刷新成功")
}
func (h *categoryHandler) RebuildParentPath(w http.ResponseWriter, r *http.Request) {
err := h.biz.SystemV1().CategoryBiz().RebuildParentPath(r.Context())
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
h.render.JSONOK(w, "重建成功")
}

View File

@@ -1,17 +1,26 @@
package system
import (
"encoding/json"
"net/http"
"strings"
"management/internal/db/model/dto"
db "management/internal/db/sqlc"
"management/internal/erpserver/biz"
"management/internal/global/pearadmin"
"management/internal/pkg/convertor"
"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)
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
}
@@ -23,19 +32,157 @@ type ConfigExpansion interface {
// configHandler 是 ConfigHandler 接口的实现.
type configHandler struct {
render tpl.Renderer
redis redis.IRedis
biz biz.IBiz
}
// 确保 userHandler 实现了 ConfigHandler 接口.
var _ ConfigHandler = (*configHandler)(nil)
func NewConfigHandler(render tpl.Renderer, biz biz.IBiz) *configHandler {
func NewConfigHandler(render tpl.Renderer, redis redis.IRedis, biz biz.IBiz) *configHandler {
return &configHandler{
render: render,
redis: redis,
biz: biz,
}
}
func (h *configHandler) Add(w http.ResponseWriter, r *http.Request) {
h.render.HTML(w, r, "config/edit.tmpl", map[string]any{
"Item": &db.SysConfig{},
"Result": "",
})
}
type EditSysConfig struct {
*db.SysConfig
Result string
}
func (h *configHandler) Edit(w http.ResponseWriter, r *http.Request) {
vars := r.URL.Query()
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
vm.Result = string(conf.Value)
}
}
h.render.HTML(w, r, "config/edit.tmpl", map[string]any{
"Item": vm.SysConfig,
"Result": vm.Result,
})
}
func (h *configHandler) Save(w http.ResponseWriter, r *http.Request) {
id := convertor.ConvertInt[int32](r.PostFormValue("ID"), 0)
key := r.PostFormValue("Key")
value := r.PostFormValue("Value")
if len(key) == 0 {
h.render.JSONERR(w, "Key不能为空")
return
}
if len(value) == 0 {
h.render.JSONERR(w, "Value不能为空")
return
}
ctx := r.Context()
if id == 0 {
arg := &db.CreateSysConfigParams{
Key: key,
Value: []byte(value),
}
err := h.biz.SystemV1().ConfigBiz().Create(ctx, arg)
if err != nil {
if db.IsUniqueViolation(err) {
h.render.JSONERR(w, "数据已存在")
return
}
h.render.JSONERR(w, err.Error())
return
}
h.render.JSONOK(w, "添加成功")
} else {
res, err := h.biz.SystemV1().ConfigBiz().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)
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
h.render.JSONOK(w, "更新成功")
}
}
func (h *configHandler) List(w http.ResponseWriter, r *http.Request) {
switch r.Method {
case http.MethodGet:
h.render.HTML(w, r, "config/list.tmpl", nil)
case http.MethodPost:
var q dto.SearchDto
q.SearchName = r.PostFormValue("name")
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)
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
data := tpl.ResponseList{
Code: 0,
Message: "ok",
Count: count,
Data: res,
}
h.render.JSON(w, data)
default:
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
}
}
func (h *configHandler) Refresh(w http.ResponseWriter, r *http.Request) {
key := r.FormValue("key")
err := h.redis.Del(r.Context(), strings.ToLower(key))
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
h.render.JSONOK(w, "刷新成功")
}
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
}
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
}
h.render.JSONOK(w, "重置成功")
}
func (h *configHandler) Pear(w http.ResponseWriter, r *http.Request) {
pear, err := h.biz.SystemV1().ConfigBiz().Pear(r.Context())
if err != nil {

View File

@@ -3,6 +3,7 @@ package system
import (
"fmt"
"net/http"
"strings"
"time"
"management/internal/db/model/dto"
@@ -10,6 +11,7 @@ import (
"management/internal/erpserver/biz"
"management/internal/pkg/convertor"
"management/internal/pkg/tpl"
"management/internal/router/manage/util"
)
type RoleHandler interface {
@@ -22,6 +24,7 @@ type RoleHandler interface {
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 {
@@ -247,3 +250,82 @@ func (h *roleHandler) RefreshRoleMenus(w http.ResponseWriter, r *http.Request) {
h.render.JSONOK(w, "刷新成功")
}
func (h *roleHandler) SetMenu(w http.ResponseWriter, r *http.Request) {
switch r.Method {
case http.MethodGet:
vars := r.URL.Query()
id := convertor.QueryInt[int32](vars, "id", 0)
vm := struct {
Role *db.SysRole
Menus []*dto.SetMenuDto
}{}
if id > 0 {
ctx := r.Context()
var err error
vm.Role, err = h.biz.SystemV1().RoleBiz().Get(ctx, id)
if err == nil {
vm.Menus, _ = h.biz.SystemV1().MenuBiz().SetMenuViewData(ctx, vm.Role.ID)
}
}
h.render.HTML(w, r, "role/set_menu.tmpl", map[string]any{
"Item": vm,
})
case http.MethodPost:
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)
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
menuArr := strings.Split(menus, ",")
if len(menuArr) == 0 {
h.render.JSONERR(w, "请选择菜单")
return
}
var menuList []*db.SysMenu
for _, v := range menuArr {
menuID := util.ConvertInt(v, 0)
if menuID > 0 {
menu, err := h.biz.SystemV1().MenuBiz().Get(ctx, int32(menuID))
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
menuList = append(menuList, menu)
}
}
if len(menuList) == 0 {
h.render.JSONERR(w, "请选择正确的菜单")
return
}
err = h.biz.SystemV1().MenuBiz().SetMenu(ctx, id, menuList)
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
h.render.JSONOK(w, "设置成功")
default:
http.Error(w, "Method Not Allowed", http.StatusMethodNotAllowed)
}
}

View File

@@ -4,6 +4,7 @@ import (
"net/http"
"management/internal/erpserver/biz"
"management/internal/pkg/redis"
"management/internal/pkg/session"
"management/internal/pkg/tpl"
)
@@ -17,19 +18,22 @@ type SystemHandler interface {
ConfigHandler() ConfigHandler
AuditHandler() AuditHandler
LoginLogHandler() LoginLogHandler
CategoryHandler() CategoryHandler
}
type systemHandler struct {
render tpl.Renderer
redis redis.IRedis
session session.ISession
biz biz.IBiz
}
var _ SystemHandler = (*systemHandler)(nil)
func NewSystemHandler(render tpl.Renderer, session session.ISession, biz biz.IBiz) *systemHandler {
func NewSystemHandler(render tpl.Renderer, redis redis.IRedis, session session.ISession, biz biz.IBiz) *systemHandler {
return &systemHandler{
render: render,
redis: redis,
session: session,
biz: biz,
}
@@ -56,7 +60,7 @@ func (h *systemHandler) DepartmentHandler() DepartmentHandler {
}
func (h *systemHandler) ConfigHandler() ConfigHandler {
return NewConfigHandler(h.render, h.biz)
return NewConfigHandler(h.render, h.redis, h.biz)
}
func (h *systemHandler) AuditHandler() AuditHandler {
@@ -66,3 +70,7 @@ func (h *systemHandler) AuditHandler() AuditHandler {
func (h *systemHandler) LoginLogHandler() LoginLogHandler {
return NewLoginLogHandler(h.render, h.biz)
}
func (h *systemHandler) CategoryHandler() CategoryHandler {
return NewCategoryHandler(h.render, h.biz)
}