change page response

gin/response/response.go

@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"gitlab.wanzhuangkj.com/tush/xpkg/httpcli/entity"
-	"gitlab.wanzhuangkj.com/tush/xpkg/sgorm/query"
 
 	"github.com/gin-gonic/gin"
 
@@ -164,26 +163,51 @@ func Success(c *gin.Context, data ...interface{}) {
 	respJSONWith200(c, errcode.Success.Code(), errcode.Success.Msg(), data...)
 }
 
+// SuccessWithPage return success
+//
+//	func SuccessWithPage[T any](c *gin.Context, list []*T, total int64) {
+//		currPage := 1
+//		pageSize := 10
+//		if req, ok := c.Get("reqbody"); ok {
+//			if pagination, ok := req.(query.IPagination); ok {
+//				currPage = pagination.GetPageIndex()
+//				pageSize = pagination.GetPageSize()
+//			}
+//		}
+//		totalPage := total / int64(pageSize)
+//		if total%int64(pageSize) > 0 {
+//			totalPage = totalPage + 1
+//		}
+//		c.Set(ctxUtils.KeyRspCode, 1)
+//		if list == nil {
+//			list = []*T{}
+//		}
+//		respJSONWith200(c, errcode.Success.Code(), errcode.Success.Msg(), gin.H{
+//			"list": list, "totalCount": total, "currPage": currPage, "pageSize": pageSize, "totalPage": totalPage,
+//		})
+//	}
+//
+
 // SuccessWithPage return success
 func SuccessWithPage[T any](c *gin.Context, list []*T, total int64) {
-	currPage := 1
-	pageSize := 10
-	if req, ok := c.Get("reqbody"); ok {
-		if pagination, ok := req.(query.IPagination); ok {
-			currPage = pagination.GetPageIndex()
-			pageSize = pagination.GetPageSize()
-		}
-	}
-	totalPage := total / int64(pageSize)
-	if total%int64(pageSize) > 0 {
-		totalPage = totalPage + 1
-	}
+	// currPage := 1
+	// pageSize := 10
+	// if req, ok := c.Get("reqbody"); ok {
+	// 	if pagination, ok := req.(query.IPagination); ok {
+	// 		currPage = pagination.GetPageIndex()
+	// 		pageSize = pagination.GetPageSize()
+	// 	}
+	// }
+	// totalPage := total / int64(pageSize)
+	// if total%int64(pageSize) > 0 {
+	// 	totalPage = totalPage + 1
+	// }
 	c.Set(ctxUtils.KeyRspCode, 1)
 	if list == nil {
 		list = []*T{}
 	}
 	respJSONWith200(c, errcode.Success.Code(), errcode.Success.Msg(), gin.H{
-		"list": list, "totalCount": total, "currPage": currPage, "pageSize": pageSize, "totalPage": totalPage,
+		"list": list, "total": total,
 	})
 }