调整分页

common/page.go

@@ -1,14 +1,14 @@
 package common
 
 type PageParams struct {
-	Page  int  `json:"page"`
-	Num   int  `json:"pageSize"`
-	Total int  `json:"total"`
-	Last  bool `json:"last"`
+	Page  int64 `protobuf:"varint,1,opt,name=page,proto3" json:"page"`
+	Num   int64 `protobuf:"varint,2,opt,name=num,proto3" json:"num"`
+	Total int64 `protobuf:"varint,3,opt,name=total,proto3" json:"total"`
+	Last  bool  `protobuf:"varint,4,opt,name=last,proto3" json:"last"`
 }
 
 //从0开始的分页
-func (this *PageParams) GetPageParams() (pageNum int, start int) {
+func (this *PageParams) GetPageParams() (pageNum int64, start int64) {
 	start = this.Page * this.Num
 	if this.Total <= this.Num {
 		this.Page = 0

third_party/page.pb.go

@@ -1,271 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.26.0
-// 	protoc        v3.15.6
-// source: page.proto
-
-package third_party
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type Page struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Page     int64 `protobuf:"varint,1,opt,name=page,proto3" json:"page,omitempty"`
-	PageSize int64 `protobuf:"varint,2,opt,name=pageSize,proto3" json:"pageSize,omitempty"`
-}
-
-func (x *Page) Reset() {
-	*x = Page{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_page_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Page) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Page) ProtoMessage() {}
-
-func (x *Page) ProtoReflect() protoreflect.Message {
-	mi := &file_page_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Page.ProtoReflect.Descriptor instead.
-func (*Page) Descriptor() ([]byte, []int) {
-	return file_page_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Page) GetPage() int64 {
-	if x != nil {
-		return x.Page
-	}
-	return 0
-}
-
-func (x *Page) GetPageSize() int64 {
-	if x != nil {
-		return x.PageSize
-	}
-	return 0
-}
-
-type PageReply struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Page  int64 `protobuf:"varint,1,opt,name=page,proto3" json:"page,omitempty"`
-	Num   int64 `protobuf:"varint,2,opt,name=num,proto3" json:"num,omitempty"`
-	Total int64 `protobuf:"varint,3,opt,name=total,proto3" json:"total,omitempty"`
-	Last  bool  `protobuf:"varint,4,opt,name=last,proto3" json:"last,omitempty"`
-}
-
-func (x *PageReply) Reset() {
-	*x = PageReply{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_page_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PageReply) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PageReply) ProtoMessage() {}
-
-func (x *PageReply) ProtoReflect() protoreflect.Message {
-	mi := &file_page_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PageReply.ProtoReflect.Descriptor instead.
-func (*PageReply) Descriptor() ([]byte, []int) {
-	return file_page_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *PageReply) GetPage() int64 {
-	if x != nil {
-		return x.Page
-	}
-	return 0
-}
-
-func (x *PageReply) GetNum() int64 {
-	if x != nil {
-		return x.Num
-	}
-	return 0
-}
-
-func (x *PageReply) GetTotal() int64 {
-	if x != nil {
-		return x.Total
-	}
-	return 0
-}
-
-func (x *PageReply) GetLast() bool {
-	if x != nil {
-		return x.Last
-	}
-	return false
-}
-
-func (this *PageReply) GetPageParams() (pageNum int64, start int64) {
-	start = this.Page * this.Num
-	if this.Total <= this.Num {
-		this.Page = 0
-		this.Last = true
-		return this.Total, 0
-	}
-	_start := (this.Page + 1) * this.Num
-
-	if this.Total-_start < 0 {
-		this.Last = true
-		pageCount := this.Total / this.Num
-		this.Page = pageCount
-		num := this.Total - pageCount*this.Num
-		if num == 0 {
-			pageCount = pageCount - 1
-			return this.Num, pageCount * this.Num
-		}
-		return num, pageCount * this.Num
-	} else if this.Total-_start == 0 {
-		this.Last = true
-	}
-	return this.Num, start
-}
-
-var File_page_proto protoreflect.FileDescriptor
-
-var file_page_proto_rawDesc = []byte{
-	0x0a, 0x0a, 0x70, 0x61, 0x67, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0b, 0x74, 0x68,
-	0x69, 0x72, 0x64, 0x5f, 0x70, 0x61, 0x72, 0x74, 0x79, 0x22, 0x3e, 0x0a, 0x04, 0x50, 0x61, 0x67,
-	0x65, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x04, 0x70, 0x61, 0x67, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a,
-	0x65, 0x4a, 0x06, 0x08, 0xc8, 0x01, 0x10, 0xad, 0x02, 0x22, 0x63, 0x0a, 0x09, 0x50, 0x61, 0x67,
-	0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x67, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x70, 0x61, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x75,
-	0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x6e, 0x75, 0x6d, 0x12, 0x14, 0x0a, 0x05,
-	0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x74, 0x6f, 0x74,
-	0x61, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x61, 0x73, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x04, 0x6c, 0x61, 0x73, 0x74, 0x4a, 0x06, 0x08, 0xc8, 0x01, 0x10, 0xad, 0x02, 0x42, 0x4b,
-	0x0a, 0x0b, 0x74, 0x68, 0x69, 0x72, 0x64, 0x5f, 0x70, 0x61, 0x72, 0x74, 0x79, 0x50, 0x01, 0x5a,
-	0x3a, 0x67, 0x69, 0x74, 0x2e, 0x69, 0x6b, 0x75, 0x62, 0x61, 0x6e, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x75, 0x74,
-	0x69, 0x6c, 0x73, 0x2f, 0x74, 0x68, 0x69, 0x72, 0x64, 0x5f, 0x70, 0x61, 0x72, 0x74, 0x79, 0x3b,
-	0x74, 0x68, 0x69, 0x72, 0x64, 0x5f, 0x70, 0x61, 0x72, 0x74, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
-}
-
-var (
-	file_page_proto_rawDescOnce sync.Once
-	file_page_proto_rawDescData = file_page_proto_rawDesc
-)
-
-func file_page_proto_rawDescGZIP() []byte {
-	file_page_proto_rawDescOnce.Do(func() {
-		file_page_proto_rawDescData = protoimpl.X.CompressGZIP(file_page_proto_rawDescData)
-	})
-	return file_page_proto_rawDescData
-}
-
-var file_page_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_page_proto_goTypes = []interface{}{
-	(*Page)(nil),      // 0: third_party.Page
-	(*PageReply)(nil), // 1: third_party.PageReply
-}
-var file_page_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_page_proto_init() }
-func file_page_proto_init() {
-	if File_page_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_page_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Page); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_page_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PageReply); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_page_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   2,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_page_proto_goTypes,
-		DependencyIndexes: file_page_proto_depIdxs,
-		MessageInfos:      file_page_proto_msgTypes,
-	}.Build()
-	File_page_proto = out.File
-	file_page_proto_rawDesc = nil
-	file_page_proto_goTypes = nil
-	file_page_proto_depIdxs = nil
-}

third_party/page.proto

@@ -1,21 +0,0 @@
-syntax = "proto3";
-
-package third_party;
-
-option go_package = "git.ikuban.com/server/kratos-utils/third_party;third_party";
-option java_multiple_files = true;
-option java_package = "third_party";
-
-message Page {
-    int64 page = 1;
-    int64 pageSize = 2;
-    reserved 200 to 300;
-}
-
-message PageReply {
-    int64 page = 1;
-    int64 num = 2;
-    int64 total = 3;
-    bool last = 4;
-    reserved 200 to 300;
-}