v1
This commit is contained in:
@@ -3,7 +3,7 @@ package system
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"management/internal/db/model/dto"
|
||||
"management/internal/erpserver/model/dto"
|
||||
v1 "management/internal/erpserver/service/v1"
|
||||
"management/internal/pkg/convertor"
|
||||
"management/internal/pkg/tpl"
|
||||
|
||||
@@ -1,173 +0,0 @@
|
||||
package system
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"management/internal/db/model/dto"
|
||||
db "management/internal/db/sqlc"
|
||||
"management/internal/erpserver/biz"
|
||||
"management/internal/erpserver/model/form"
|
||||
"management/internal/pkg/binding"
|
||||
"management/internal/pkg/convertor"
|
||||
"management/internal/pkg/tpl"
|
||||
)
|
||||
|
||||
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)
|
||||
Data(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) {
|
||||
var req form.Category
|
||||
if err := binding.Form.Bind(r, &req); err != nil {
|
||||
h.render.JSONERR(w, binding.ValidatorErrors(err))
|
||||
return
|
||||
}
|
||||
|
||||
if *req.ID == 0 {
|
||||
err := h.biz.SystemV1().CategoryBiz().Create(r.Context(), &req)
|
||||
if err != nil {
|
||||
h.render.JSONERR(w, err.Error())
|
||||
return
|
||||
}
|
||||
h.render.JSONOK(w, "添加成功")
|
||||
} else {
|
||||
err := h.biz.SystemV1().CategoryBiz().Update(r.Context(), &req)
|
||||
if err != nil {
|
||||
h.render.JSONERR(w, err.Error())
|
||||
return
|
||||
}
|
||||
h.render.JSONOK(w, "更新成功")
|
||||
}
|
||||
}
|
||||
|
||||
func (h *categoryHandler) Data(w http.ResponseWriter, r *http.Request) {
|
||||
ctx := r.Context()
|
||||
vars := r.URL.Query()
|
||||
t := vars.Get("type")
|
||||
if t == "tree" {
|
||||
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
|
||||
} else if t == "xmselect_tree" {
|
||||
res, err := h.biz.SystemV1().CategoryBiz().XmSelectTree(ctx, 0)
|
||||
if err != nil {
|
||||
h.render.JSONERR(w, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
h.render.JSON(w, res)
|
||||
return
|
||||
} else if t == "xmselect" {
|
||||
res, err := h.biz.SystemV1().CategoryBiz().XmSelect(ctx, vars.Get("letter"))
|
||||
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, "重建成功")
|
||||
}
|
||||
@@ -4,11 +4,11 @@ import (
|
||||
"net/http"
|
||||
"strings"
|
||||
|
||||
"management/internal/db/model/dto"
|
||||
db "management/internal/db/sqlc"
|
||||
"management/internal/erpserver/model/dto"
|
||||
systemmodel "management/internal/erpserver/model/system"
|
||||
systemsvc "management/internal/erpserver/service/v1"
|
||||
"management/internal/pkg/convertor"
|
||||
"management/internal/pkg/database"
|
||||
"management/internal/pkg/redis"
|
||||
"management/internal/pkg/tpl"
|
||||
)
|
||||
@@ -76,7 +76,7 @@ func (h *configHandler) Save(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
err := h.configsvc.Create(ctx, arg)
|
||||
if err != nil {
|
||||
if db.IsUniqueViolation(err) {
|
||||
if database.IsUniqueViolation(err) {
|
||||
h.render.JSONERR(w, "数据已存在")
|
||||
return
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ package system
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"management/internal/db/model/dto"
|
||||
"management/internal/erpserver/model/dto"
|
||||
"management/internal/erpserver/model/form"
|
||||
systemmodel "management/internal/erpserver/model/system"
|
||||
v1 "management/internal/erpserver/service/v1"
|
||||
|
||||
@@ -3,7 +3,7 @@ package system
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"management/internal/db/model/dto"
|
||||
"management/internal/erpserver/model/dto"
|
||||
v1 "management/internal/erpserver/service/v1"
|
||||
"management/internal/pkg/convertor"
|
||||
"management/internal/pkg/tpl"
|
||||
|
||||
@@ -6,10 +6,10 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
db "management/internal/db/sqlc"
|
||||
systemmodel "management/internal/erpserver/model/system"
|
||||
v1 "management/internal/erpserver/service/v1"
|
||||
"management/internal/pkg/convertor"
|
||||
"management/internal/pkg/database"
|
||||
"management/internal/pkg/middleware"
|
||||
"management/internal/pkg/tpl"
|
||||
|
||||
@@ -155,7 +155,7 @@ func (h *menuHandler) Save(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
err := h.svc.Create(ctx, arg)
|
||||
if err != nil {
|
||||
if db.IsUniqueViolation(err) {
|
||||
if database.IsUniqueViolation(err) {
|
||||
h.render.JSONERR(w, "菜单已存在")
|
||||
return
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"net/http"
|
||||
"strings"
|
||||
|
||||
"management/internal/db/model/dto"
|
||||
"management/internal/erpserver/model/dto"
|
||||
"management/internal/erpserver/model/form"
|
||||
"management/internal/erpserver/model/system"
|
||||
v1 "management/internal/erpserver/service/v1"
|
||||
|
||||
@@ -4,8 +4,7 @@ import (
|
||||
"log"
|
||||
"net/http"
|
||||
|
||||
"management/internal/db/model/dto"
|
||||
db "management/internal/db/sqlc"
|
||||
"management/internal/erpserver/model/dto"
|
||||
"management/internal/erpserver/model/form"
|
||||
systemmodel "management/internal/erpserver/model/system"
|
||||
v1 "management/internal/erpserver/service/v1"
|
||||
@@ -47,7 +46,7 @@ func NewUserHandler(
|
||||
|
||||
func (h *userHandler) Add(w http.ResponseWriter, r *http.Request) {
|
||||
h.render.HTML(w, r, "user/edit.tmpl", map[string]any{
|
||||
"Item": &db.SysUser{
|
||||
"Item": &systemmodel.User{
|
||||
HashedPassword: nil,
|
||||
},
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user