pro/olons_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: complete workbench split admin routes

Browse Source
This commit is contained in:
richjohnrambo
2026-09-17 23:37:16 +08:00
parent 7099a33cde
commit 5c805c7b09
6 changed files with 334 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/httpapi/admin.go
+115 -8
View File
@@ -11,6 +11,10 @@ import (
)
func (a *API) adminWorkbenchApps(w http.ResponseWriter, r *http.Request) {
st, ok := a.internalAdminStore(w, r)
if !ok {
return
}
switch r.Method {
case http.MethodGet:
page := queryInt(r, "page", 1)
@@ -21,7 +25,7 @@ func (a *API) adminWorkbenchApps(w http.ResponseWriter, r *http.Request) {
enabled = &value
}
}
items, total, err := a.store.AdminWorkbenchModules(r.Context(), page, perPage, r.URL.Query().Get("code"), r.URL.Query().Get("name"), enabled)
items, total, err := st.AdminWorkbenchModules(r.Context(), page, perPage, r.URL.Query().Get("code"), r.URL.Query().Get("name"), enabled)
if err != nil {
writeStoreError(w, r, err)
return
@@ -32,7 +36,7 @@ func (a *API) adminWorkbenchApps(w http.ResponseWriter, r *http.Request) {
if !decodeJSON(w, r, &body) {
return
}
item, err := a.store.UpsertAdminWorkbenchModule(r.Context(), store.AdminWorkbenchModuleInput{
item, err := st.UpsertAdminWorkbenchModule(r.Context(), store.AdminWorkbenchModuleInput{
ID: body.ID, Code: body.Code, Name: body.Name, IconFileID: body.IconFileID, Route: body.Route,
SortOrder: body.SortOrder, UnreadKey: body.UnreadKey, Enabled: body.Enabled, Permission: body.Permission,
})
@@ -47,6 +51,10 @@ func (a *API) adminWorkbenchApps(w http.ResponseWriter, r *http.Request) {
}
func (a *API) adminWorkbenchAppDisable(w http.ResponseWriter, r *http.Request) {
st, ok := a.internalAdminStore(w, r)
if !ok {
return
}
if r.Method != http.MethodPost {
methodNotAllowed(w, r)
return
@@ -58,7 +66,7 @@ func (a *API) adminWorkbenchAppDisable(w http.ResponseWriter, r *http.Request) {
if !decodeJSON(w, r, &body) {
return
}
if err := a.store.DisableAdminWorkbenchModule(r.Context(), body.ID, body.Code); err != nil {
if err := st.DisableAdminWorkbenchModule(r.Context(), body.ID, body.Code); err != nil {
writeStoreError(w, r, err)
return
}
@@ -66,6 +74,10 @@ func (a *API) adminWorkbenchAppDisable(w http.ResponseWriter, r *http.Request) {
}
func (a *API) adminWorkbenchAppsReorder(w http.ResponseWriter, r *http.Request) {
st, ok := a.internalAdminStore(w, r)
if !ok {
return
}
if r.Method != http.MethodPost {
methodNotAllowed(w, r)
return
@@ -83,17 +95,63 @@ func (a *API) adminWorkbenchAppsReorder(w http.ResponseWriter, r *http.Request)
for _, item := range body.Items {
items = append(items, store.AdminWorkbenchReorderItem{Code: item.Code, SortOrder: item.SortOrder})
}
if err := a.store.ReorderAdminWorkbenchModules(r.Context(), items); err != nil {
if err := st.ReorderAdminWorkbenchModules(r.Context(), items); err != nil {
writeStoreError(w, r, err)
return
}
writeSuccess(w, r, map[string]any{"ok": true})
}
func (a *API) adminOrganizationDepartments(w http.ResponseWriter, r *http.Request) {
st, ok := a.internalAdminStore(w, r)
if !ok {
return
}
if r.Method != http.MethodGet {
methodNotAllowed(w, r)
return
}
page := queryInt(r, "page", 1)
perPage := queryInt(r, "per_page", 20)
items, total, err := st.AdminOrganizationDepartments(r.Context(), page, perPage,
r.URL.Query().Get("parent_id"), r.URL.Query().Get("name"), r.URL.Query().Get("state"))
if err != nil {
writeStoreError(w, r, err)
return
}
writeSuccess(w, r, map[string]any{"items": adminOrganizationDepartmentPayloads(items), "total": total, "page": page, "per_page": perPage})
}
func (a *API) adminOrganizationMembers(w http.ResponseWriter, r *http.Request) {
st, ok := a.internalAdminStore(w, r)
if !ok {
return
}
if r.Method != http.MethodGet {
methodNotAllowed(w, r)
return
}
page := queryInt(r, "page", 1)
perPage := queryInt(r, "per_page", 20)
userID, _ := strconv.ParseInt(strings.TrimSpace(r.URL.Query().Get("user_id")), 10, 64)
items, total, err := st.AdminOrganizationMembers(r.Context(), page, perPage,
r.URL.Query().Get("department_id"), firstNonEmpty(r.URL.Query().Get("q"), r.URL.Query().Get("keyword")),
r.URL.Query().Get("employment_state"), userID)
if err != nil {
writeStoreError(w, r, err)
return
}
writeSuccess(w, r, map[string]any{"items": adminOrganizationMemberPayloads(items), "total": total, "page": page, "per_page": perPage})
}
func (a *API) adminMailboxConfig(w http.ResponseWriter, r *http.Request) {
st, ok := a.internalAdminStore(w, r)
if !ok {
return
}
switch r.Method {
case http.MethodGet:
cfg, err := a.store.AdminMailboxConfig(r.Context())
cfg, err := st.AdminMailboxConfig(r.Context())
if err != nil {
writeStoreError(w, r, err)
return
@@ -104,7 +162,7 @@ func (a *API) adminMailboxConfig(w http.ResponseWriter, r *http.Request) {
if !decodeJSON(w, r, &body) {
return
}
if err := a.store.UpdateAdminMailboxConfig(r.Context(), store.AdminMailboxConfig{
if err := st.UpdateAdminMailboxConfig(r.Context(), store.AdminMailboxConfig{
Enabled: body.Enabled, AllowAnonymous: body.AllowAnonymous, RequiredFields: body.RequiredFields,
MaxLength: body.MaxLength, AttachmentPolicy: body.AttachmentPolicy, NoticeTitle: body.NoticeTitle, NoticeContent: body.NoticeContent,
}); err != nil {
@@ -118,9 +176,13 @@ func (a *API) adminMailboxConfig(w http.ResponseWriter, r *http.Request) {
}
func (a *API) adminFeedbackConfig(w http.ResponseWriter, r *http.Request) {
st, ok := a.internalAdminStore(w, r)
if !ok {
return
}
switch r.Method {
case http.MethodGet:
cfg, err := a.store.AdminFeedbackConfig(r.Context())
cfg, err := st.AdminFeedbackConfig(r.Context())
if err != nil {
writeStoreError(w, r, err)
return
@@ -131,7 +193,7 @@ func (a *API) adminFeedbackConfig(w http.ResponseWriter, r *http.Request) {
if !decodeJSON(w, r, &body) {
return
}
if err := a.store.UpdateAdminFeedbackConfig(r.Context(), store.AdminFeedbackConfig{
if err := st.UpdateAdminFeedbackConfig(r.Context(), store.AdminFeedbackConfig{
Categories: body.Categories, MaxLength: body.MaxLength, AttachmentPolicy: body.AttachmentPolicy,
AllowContact: body.AllowContact, DiagnosticsNotice: body.DiagnosticsNotice,
}); err != nil {
@@ -144,6 +206,17 @@ func (a *API) adminFeedbackConfig(w http.ResponseWriter, r *http.Request) {
}
}
func (a *API) internalAdminStore(w http.ResponseWriter, r *http.Request) (*store.Store, bool) {
tenantID, _ := strconv.ParseInt(firstNonEmpty(r.Header.Get("X-Tenant-ID"), r.URL.Query().Get("tenant_id")), 10, 64)
tenantCode := firstNonEmpty(r.Header.Get("X-Tenant-Code"), r.URL.Query().Get("tenant_code"), "default")
st, err := a.store.ForTenant(r.Context(), tenantID, tenantCode)
if err != nil {
writeStoreError(w, r, err)
return nil, false
}
return st, true
}
type adminWorkbenchModuleRequest struct {
ID int64 `json:"id"`
Code string `json:"code"`
@@ -198,6 +271,40 @@ func adminWorkbenchModulePayload(item store.AdminWorkbenchModule) map[string]any
}
}
func adminOrganizationDepartmentPayloads(items []store.OrganizationDepartment) []map[string]any {
res := make([]map[string]any, 0, len(items))
for _, item := range items {
res = append(res, map[string]any{
"department_id": item.DepartmentID,
"name": item.Name,
"parent_id": item.ParentID,
"child_count": item.ChildCount,
"member_count": item.MemberCount,
"version": item.Version,
})
}
return res
}
func adminOrganizationMemberPayloads(items []store.OrganizationMember) []map[string]any {
res := make([]map[string]any, 0, len(items))
for _, item := range items {
res = append(res, map[string]any{
"user_id": item.UserID,
"department_id": item.DepartmentID,
"display_name": item.DisplayName,
"position": item.Position,
"mobile": item.Mobile,
"email": item.Email,
"avatar_file_id": item.AvatarFileID,
"status": item.Status,
"contactable": item.Contactable,
"version": item.Version,
})
}
return res
}
func adminMailboxConfigPayload(cfg store.AdminMailboxConfig) map[string]any {
return map[string]any{
"id": cfg.ID,
internal/httpapi/api.go
+39 -18
View File
@@ -64,6 +64,8 @@ func (a *API) Register(mux *http.ServeMux) {
mux.HandleFunc("/internal/admin/workbench/apps", a.withInternalAdminAuth(a.adminWorkbenchApps))
mux.HandleFunc("/internal/admin/workbench/apps/disable", a.withInternalAdminAuth(a.adminWorkbenchAppDisable))
mux.HandleFunc("/internal/admin/workbench/apps/reorder", a.withInternalAdminAuth(a.adminWorkbenchAppsReorder))
mux.HandleFunc("/internal/admin/workbench/organization/departments", a.withInternalAdminAuth(a.adminOrganizationDepartments))
mux.HandleFunc("/internal/admin/workbench/organization/members", a.withInternalAdminAuth(a.adminOrganizationMembers))
mux.HandleFunc("/internal/admin/workbench/mailbox-config", a.withInternalAdminAuth(a.adminMailboxConfig))
mux.HandleFunc("/internal/admin/workbench/feedback-config", a.withInternalAdminAuth(a.adminFeedbackConfig))
}
@@ -698,11 +700,6 @@ func (a *API) dailyReportResource(w http.ResponseWriter, r *http.Request, p *aut
writeStoreError(w, r, err)
return
}
if !a.publishWorkbenchEvent(w, r, p, "daily_report", "daily_report.draft.saved", report.ReportID,
[]int64{p.UserID}, "日报", report.ReportDate.Format("2006-01-02"),
map[string]any{"report_id": report.ReportID, "version": report.Version, "status": report.Status}) {
return
}
writeSuccess(w, r, dailyReportPayload(*report))
case tail == "draft" && r.Method == http.MethodPut:
var body struct {
@@ -718,8 +715,8 @@ func (a *API) dailyReportResource(w http.ResponseWriter, r *http.Request, p *aut
writeStoreError(w, r, err)
return
}
if !a.publishWorkbenchEvent(w, r, p, "daily_report", "daily_report.submitted", report.ReportID,
[]int64{p.UserID}, "日报已提交", report.ReportDate.Format("2006-01-02"),
if !a.publishWorkbenchEvent(w, r, p, "daily_report", "daily_report.draft.saved", report.ReportID,
[]int64{p.UserID}, "日报", report.ReportDate.Format("2006-01-02"),
map[string]any{"report_id": report.ReportID, "version": report.Version, "status": report.Status}) {
return
}
@@ -736,6 +733,11 @@ func (a *API) dailyReportResource(w http.ResponseWriter, r *http.Request, p *aut
writeStoreError(w, r, err)
return
}
if !a.publishWorkbenchEvent(w, r, p, "daily_report", "daily_report.submitted", report.ReportID,
[]int64{p.UserID}, "日报已提交", report.ReportDate.Format("2006-01-02"),
map[string]any{"report_id": report.ReportID, "version": report.Version, "status": report.Status}) {
return
}
writeSuccess(w, r, dailyReportPayload(*report))
default:
methodNotAllowed(w, r)
@@ -747,7 +749,17 @@ func (a *API) dailyReportStatistics(w http.ResponseWriter, r *http.Request, p *a
methodNotAllowed(w, r)
return
}
writeSuccess(w, r, map[string]any{"expected_count": 0, "submitted_count": 0, "missing_count": 0, "scope": map[string]any{"department_id": r.URL.Query().Get("department_id")}})
date, err := parseDate(firstNonEmpty(r.URL.Query().Get("date"), time.Now().Format("2006-01-02")))
if err != nil {
writeError(w, r, http.StatusBadRequest, 30000, reasonMalformedRequest, "malformed request", map[string]any{"field": "date"})
return
}
stats, err := st.DailyReportStats(r.Context(), date, r.URL.Query().Get("department_id"))
if err != nil {
writeStoreError(w, r, err)
return
}
writeSuccess(w, r, reportStatsPayload(stats))
}
func (a *API) dailyReportReminders(w http.ResponseWriter, r *http.Request, p *auth.Principal, st *store.Store) {
@@ -819,11 +831,6 @@ func (a *API) monthlyReportResource(w http.ResponseWriter, r *http.Request, p *a
writeStoreError(w, r, err)
return
}
if !a.publishWorkbenchEvent(w, r, p, "monthly_report", "monthly_report.draft.saved", report.ReportID,
[]int64{p.UserID}, "月报", report.Month,
map[string]any{"report_id": report.ReportID, "version": report.Version, "status": report.Status}) {
return
}
writeSuccess(w, r, monthlyReportPayload(*report))
case tail == "draft" && r.Method == http.MethodPut:
var body struct {
@@ -840,8 +847,8 @@ func (a *API) monthlyReportResource(w http.ResponseWriter, r *http.Request, p *a
writeStoreError(w, r, err)
return
}
if !a.publishWorkbenchEvent(w, r, p, "monthly_report", "monthly_report.submitted", report.ReportID,
[]int64{p.UserID}, "月报已提交", report.Month,
if !a.publishWorkbenchEvent(w, r, p, "monthly_report", "monthly_report.draft.saved", report.ReportID,
[]int64{p.UserID}, "月报", report.Month,
map[string]any{"report_id": report.ReportID, "version": report.Version, "status": report.Status}) {
return
}
@@ -858,8 +865,8 @@ func (a *API) monthlyReportResource(w http.ResponseWriter, r *http.Request, p *a
writeStoreError(w, r, err)
return
}
if !a.publishWorkbenchEvent(w, r, p, "monthly_report", "monthly_report.reopened", report.ReportID,
[]int64{p.UserID}, "月报已重开", report.Month,
if !a.publishWorkbenchEvent(w, r, p, "monthly_report", "monthly_report.submitted", report.ReportID,
[]int64{p.UserID}, "月报已提交", report.Month,
map[string]any{"report_id": report.ReportID, "version": report.Version, "status": report.Status}) {
return
}
@@ -876,6 +883,11 @@ func (a *API) monthlyReportResource(w http.ResponseWriter, r *http.Request, p *a
writeStoreError(w, r, err)
return
}
if !a.publishWorkbenchEvent(w, r, p, "monthly_report", "monthly_report.reopened", report.ReportID,
[]int64{p.UserID}, "月报已重开", report.Month,
map[string]any{"report_id": report.ReportID, "version": report.Version, "status": report.Status}) {
return
}
writeSuccess(w, r, monthlyReportPayload(*report))
default:
methodNotAllowed(w, r)
@@ -887,7 +899,16 @@ func (a *API) monthlyReportStatistics(w http.ResponseWriter, r *http.Request, p
methodNotAllowed(w, r)
return
}
writeSuccess(w, r, map[string]any{"expected_count": 0, "submitted_count": 0, "missing_count": 0, "scope": map[string]any{"department_id": r.URL.Query().Get("department_id")}})
month := strings.TrimSpace(r.URL.Query().Get("month"))
if month == "" {
month = time.Now().Format("2006-01")
}
stats, err := st.MonthlyReportStats(r.Context(), month, r.URL.Query().Get("department_id"))
if err != nil {
writeStoreError(w, r, err)
return
}
writeSuccess(w, r, reportStatsPayload(stats))
}
func (a *API) mailboxConfig(w http.ResponseWriter, r *http.Request, p *auth.Principal, st *store.Store) {
internal/httpapi/payload.go
+17
View File
@@ -417,6 +417,23 @@ func monthlyReportPayload(report store.MonthlyReport) map[string]any {
return data
}
func reportStatsPayload(stats *store.ReportStats) map[string]any {
if stats == nil {
return map[string]any{
"expected_count": 0,
"submitted_count": 0,
"missing_count": 0,
"scope": map[string]any{"department_id": ""},
}
}
return map[string]any{
"expected_count": stats.ExpectedCount,
"submitted_count": stats.SubmittedCount,
"missing_count": stats.MissingCount,
"scope": map[string]any{"department_id": stats.DepartmentID},
}
}
func mailboxConfigPayload(config store.MailboxConfig) map[string]any {
return map[string]any{
"enabled": config.Enabled,