优化

2026-08-17 02:12:17 +08:00
parent 560ae46b82
commit 6a05803e08
96 changed files with 2888 additions and 685 deletions
@@ -2,7 +2,6 @@ package handler

 import (
 	"errors"
-	"io"
 	"log/slog"
 	"strconv"
 	"time"
@@ -26,10 +25,23 @@ func NewAudit(service *service.AuditService, recorder *service.AuditRecorder, lo
 	return &Audit{service: service, recorder: recorder, logs: logs, logger: logger}
 }

-func page(c *gin.Context) (int, int) {
-	value, _ := strconv.Atoi(c.Query("page"))
-	size, _ := strconv.Atoi(c.Query("pageSize"))
-	return value, size
+func page(c *gin.Context) (int, int, error) {
+	var value, size int
+	if raw, exists := c.GetQuery("page"); exists && raw != "" {
+		parsed, err := strconv.Atoi(raw)
+		if err != nil {
+			return 0, 0, err
+		}
+		value = parsed
+	}
+	if raw, exists := c.GetQuery("pageSize"); exists && raw != "" {
+		parsed, err := strconv.Atoi(raw)
+		if err != nil {
+			return 0, 0, err
+		}
+		size = parsed
+	}
+	return value, size, nil
 }

 func queryUintValue(c *gin.Context, key string) (uint, bool, error) {
@@ -42,9 +54,6 @@ func queryUintValue(c *gin.Context, key string) (uint, bool, error) {
 }
 func IDsFromQuery(c *gin.Context) []uint {
 	values := c.QueryArray("IDs[]")
-	if len(values) == 0 {
-		values = c.QueryArray("ids[]")
-	}
 	ids := make([]uint, 0, len(values))
 	for _, value := range values {
 		id, _ := strconv.ParseUint(value, 10, 64)
@@ -55,33 +64,6 @@ func IDsFromQuery(c *gin.Context) []uint {
 	return ids
 }

-// auditID accepts both DELETE encodings supported by the administration API:
-// the identifier may be carried in the query string or in a JSON body.
-func auditID(c *gin.Context) (uint, error) {
-	if raw := c.Query("ID"); raw != "" {
-		value, err := strconv.ParseUint(raw, 10, 64)
-		return uint(value), err
-	}
-	var request dto.IDRequest
-	if err := c.ShouldBindJSON(&request); err != nil && !errors.Is(err, io.EOF) {
-		return 0, err
-	}
-	return request.ID, nil
-}
-
-// auditIDs mirrors auditID for bulk deletes and supports both query-array and
-// JSON-body encodings used by compatible administration pages.
-func auditIDs(c *gin.Context) ([]uint, error) {
-	if ids := IDsFromQuery(c); len(ids) > 0 {
-		return ids, nil
-	}
-	var request dto.IDsRequest
-	if err := c.ShouldBindJSON(&request); err != nil && !errors.Is(err, io.EOF) {
-		return nil, err
-	}
-	return request.IDs, nil
-}
-
 func (h *Audit) Operations(c *gin.Context) {
 	var req dto.OperationRecordSearchRequest
 	if err := c.ShouldBindQuery(&req); err != nil {
@@ -113,28 +95,24 @@ func (h *Audit) Operation(c *gin.Context) {
 	httpx.Write(c, httpx.CodeSuccess, gin.H{"reSysOperationRecord": item}, "查询成功")
 }
 func (h *Audit) DeleteOperation(c *gin.Context) {
-	id, err := auditID(c)
-	if err != nil {
+	var req dto.IDRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
 		httpx.Fail(c, err.Error())
 		return
 	}
-	if id == 0 {
-		httpx.Fail(c, "删除失败")
-		return
-	}
-	if err := h.service.DeleteOperations(c.Request.Context(), []uint{id}); err != nil {
+	if err := h.service.DeleteOperations(c.Request.Context(), []uint{req.ID}); err != nil {
 		httpx.Fail(c, "删除失败")
 		return
 	}
 	httpx.Write(c, httpx.CodeSuccess, gin.H{}, "删除成功")
 }
 func (h *Audit) DeleteOperations(c *gin.Context) {
-	ids, err := auditIDs(c)
-	if err != nil {
+	var req dto.IDsRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
 		httpx.Fail(c, err.Error())
 		return
 	}
-	if err := h.service.DeleteOperations(c.Request.Context(), ids); err != nil {
+	if err := h.service.DeleteOperations(c.Request.Context(), req.IDs); err != nil {
 		httpx.Fail(c, "批量删除失败")
 		return
 	}
@@ -168,28 +146,24 @@ func (h *Audit) Login(c *gin.Context) {
 	httpx.Write(c, httpx.CodeSuccess, item, "查询成功")
 }
 func (h *Audit) DeleteLogin(c *gin.Context) {
-	id, err := auditID(c)
-	if err != nil {
+	var req dto.IDRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
 		httpx.Fail(c, err.Error())
 		return
 	}
-	if id == 0 {
-		httpx.Fail(c, "删除失败")
-		return
-	}
-	if err := h.service.DeleteLogins(c.Request.Context(), []uint{id}); err != nil {
+	if err := h.service.DeleteLogins(c.Request.Context(), []uint{req.ID}); err != nil {
 		httpx.Fail(c, "删除失败")
 		return
 	}
 	httpx.Write(c, httpx.CodeSuccess, gin.H{}, "删除成功")
 }
 func (h *Audit) DeleteLogins(c *gin.Context) {
-	ids, err := auditIDs(c)
-	if err != nil {
+	var req dto.IDsRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
 		httpx.Fail(c, err.Error())
 		return
 	}
-	if err := h.service.DeleteLogins(c.Request.Context(), ids); err != nil {
+	if err := h.service.DeleteLogins(c.Request.Context(), req.IDs); err != nil {
 		httpx.Fail(c, "批量删除失败")
 		return
 	}
@@ -298,24 +272,15 @@ func failLogViewer(c *gin.Context, err error, logger *slog.Logger) {
 }

 func (h *Audit) DeleteError(c *gin.Context) {
-	id, err := auditID(c)
-	if err != nil {
-		httpx.Fail(c, err.Error())
-		return
-	}
-	if err := h.service.DeleteErrors(c.Request.Context(), []uint{id}); err != nil {
+	id, _ := strconv.ParseUint(c.Query("ID"), 10, 64)
+	if err := h.service.DeleteErrors(c.Request.Context(), []uint{uint(id)}); err != nil {
 		httpx.Fail(c, "删除失败:"+err.Error())
 		return
 	}
 	httpx.Write(c, httpx.CodeSuccess, gin.H{}, "删除成功")
 }
 func (h *Audit) DeleteErrors(c *gin.Context) {
-	ids, err := auditIDs(c)
-	if err != nil {
-		httpx.Fail(c, err.Error())
-		return
-	}
-	if err := h.service.DeleteErrors(c.Request.Context(), ids); err != nil {
+	if err := h.service.DeleteErrors(c.Request.Context(), IDsFromQuery(c)); err != nil {
 		httpx.Fail(c, "批量删除失败:"+err.Error())
 		return
 	}
@@ -343,7 +308,11 @@ func (h *Audit) Error(c *gin.Context) {
 	httpx.OKWithData(c, item)
 }
 func (h *Audit) Errors(c *gin.Context) {
-	p, size := page(c)
+	p, size, err := page(c)
+	if err != nil {
+		httpx.Fail(c, err.Error())
+		return
+	}
 	createdAtRange := make([]time.Time, 0, 2)
 	for _, raw := range c.QueryArray("createdAtRange[]") {
 		value, parseErr := time.Parse(time.RFC3339, raw)