diff --git a/rpc/equipment/equipment.pb b/rpc/equipment/equipment.pb index 5415bf1..4b63f20 100644 Binary files a/rpc/equipment/equipment.pb and b/rpc/equipment/equipment.pb differ diff --git a/rpc/equipment/equipment.proto b/rpc/equipment/equipment.proto index fe29b17..4c4cb93 100644 --- a/rpc/equipment/equipment.proto +++ b/rpc/equipment/equipment.proto @@ -76,10 +76,12 @@ message BeansItemsRequest { message ApiBindAddRequest { string host_nickname = 1; string host_code = 2; + int32 type = 3; } message ApiUnBindRequest { string host_code = 1; + int32 type = 2; } message EmptyRequest { @@ -89,9 +91,11 @@ message EmptyRequest { message ApiBindExpiryRequest { string host_code = 1; int32 type = 2; + int32 equipment_type = 3; } message ApiBindExpiryGetRequest { string host_code = 1; + int32 type = 2; } message ApiBeansItemsRequest { int32 page = 1; diff --git a/rpc/equipment/pb/equipment.pb.go b/rpc/equipment/pb/equipment.pb.go index 6d32a42..e61ceb2 100644 --- a/rpc/equipment/pb/equipment.pb.go +++ b/rpc/equipment/pb/equipment.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.11 -// protoc v3.19.4 +// protoc v4.25.8 // source: equipment/equipment.proto package equipment @@ -666,6 +666,7 @@ type ApiBindAddRequest struct { state protoimpl.MessageState `protogen:"open.v1"` HostNickname string `protobuf:"bytes,1,opt,name=host_nickname,json=hostNickname,proto3" json:"host_nickname,omitempty"` HostCode string `protobuf:"bytes,2,opt,name=host_code,json=hostCode,proto3" json:"host_code,omitempty"` + Type int32 `protobuf:"varint,3,opt,name=type,proto3" json:"type,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -714,9 +715,17 @@ func (x *ApiBindAddRequest) GetHostCode() string { return "" } +func (x *ApiBindAddRequest) GetType() int32 { + if x != nil { + return x.Type + } + return 0 +} + type ApiUnBindRequest struct { state protoimpl.MessageState `protogen:"open.v1"` HostCode string `protobuf:"bytes,1,opt,name=host_code,json=hostCode,proto3" json:"host_code,omitempty"` + Type int32 `protobuf:"varint,2,opt,name=type,proto3" json:"type,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -758,6 +767,13 @@ func (x *ApiUnBindRequest) GetHostCode() string { return "" } +func (x *ApiUnBindRequest) GetType() int32 { + if x != nil { + return x.Type + } + return 0 +} + type EmptyRequest struct { state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields @@ -798,6 +814,7 @@ type ApiBindExpiryRequest struct { state protoimpl.MessageState `protogen:"open.v1"` HostCode string `protobuf:"bytes,1,opt,name=host_code,json=hostCode,proto3" json:"host_code,omitempty"` Type int32 `protobuf:"varint,2,opt,name=type,proto3" json:"type,omitempty"` + EquipmentType int32 `protobuf:"varint,3,opt,name=equipment_type,json=equipmentType,proto3" json:"equipment_type,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -846,9 +863,17 @@ func (x *ApiBindExpiryRequest) GetType() int32 { return 0 } +func (x *ApiBindExpiryRequest) GetEquipmentType() int32 { + if x != nil { + return x.EquipmentType + } + return 0 +} + type ApiBindExpiryGetRequest struct { state protoimpl.MessageState `protogen:"open.v1"` HostCode string `protobuf:"bytes,1,opt,name=host_code,json=hostCode,proto3" json:"host_code,omitempty"` + Type int32 `protobuf:"varint,2,opt,name=type,proto3" json:"type,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -890,6 +915,13 @@ func (x *ApiBindExpiryGetRequest) GetHostCode() string { return "" } +func (x *ApiBindExpiryGetRequest) GetType() int32 { + if x != nil { + return x.Type + } + return 0 +} + type ApiBeansItemsRequest struct { state protoimpl.MessageState `protogen:"open.v1"` Page int32 `protobuf:"varint,1,opt,name=page,proto3" json:"page,omitempty"` @@ -1473,18 +1505,22 @@ const file_equipment_equipment_proto_rawDesc = "" + "\x04page\x18\x01 \x01(\x05R\x04page\x12\x12\n" + "\x04size\x18\x02 \x01(\x05R\x04size\x12\x12\n" + "\x04name\x18\x03 \x01(\tR\x04name\x12\x12\n" + - "\x04time\x18\x04 \x03(\tR\x04time\"U\n" + + "\x04time\x18\x04 \x03(\tR\x04time\"i\n" + "\x11ApiBindAddRequest\x12#\n" + "\rhost_nickname\x18\x01 \x01(\tR\fhostNickname\x12\x1b\n" + - "\thost_code\x18\x02 \x01(\tR\bhostCode\"/\n" + + "\thost_code\x18\x02 \x01(\tR\bhostCode\x12\x12\n" + + "\x04type\x18\x03 \x01(\x05R\x04type\"C\n" + "\x10ApiUnBindRequest\x12\x1b\n" + - "\thost_code\x18\x01 \x01(\tR\bhostCode\"\x0e\n" + - "\fEmptyRequest\"G\n" + + "\thost_code\x18\x01 \x01(\tR\bhostCode\x12\x12\n" + + "\x04type\x18\x02 \x01(\x05R\x04type\"\x0e\n" + + "\fEmptyRequest\"n\n" + "\x14ApiBindExpiryRequest\x12\x1b\n" + "\thost_code\x18\x01 \x01(\tR\bhostCode\x12\x12\n" + - "\x04type\x18\x02 \x01(\x05R\x04type\"6\n" + + "\x04type\x18\x02 \x01(\x05R\x04type\x12%\n" + + "\x0eequipment_type\x18\x03 \x01(\x05R\requipmentType\"J\n" + "\x17ApiBindExpiryGetRequest\x12\x1b\n" + - "\thost_code\x18\x01 \x01(\tR\bhostCode\">\n" + + "\thost_code\x18\x01 \x01(\tR\bhostCode\x12\x12\n" + + "\x04type\x18\x02 \x01(\x05R\x04type\">\n" + "\x14ApiBeansItemsRequest\x12\x12\n" + "\x04page\x18\x01 \x01(\x05R\x04page\x12\x12\n" + "\x04size\x18\x02 \x01(\x05R\x04size\":\n" + diff --git a/rpc/equipment/pb/equipment_grpc.pb.go b/rpc/equipment/pb/equipment_grpc.pb.go index 20cba85..f80fb3d 100644 --- a/rpc/equipment/pb/equipment_grpc.pb.go +++ b/rpc/equipment/pb/equipment_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.6.2 -// - protoc v3.19.4 +// - protoc v4.25.8 // source: equipment/equipment.proto package equipment diff --git a/rpc/express/express.pb b/rpc/express/express.pb index e51ddf0..0f0f6d3 100644 Binary files a/rpc/express/express.pb and b/rpc/express/express.pb differ diff --git a/rpc/express/express.proto b/rpc/express/express.proto index 7341045..fc95140 100644 --- a/rpc/express/express.proto +++ b/rpc/express/express.proto @@ -100,6 +100,40 @@ message IdApiRequest { int32 type=2; } +message ApiPrintBarCodeRequest { + int32 number = 1; + int64 product_id = 2; +} + +message ApiPrintBarCodePrintRequest { + int64 id = 1; +} + +message ApiPrintExpressRequest { + int32 status = 1; + string order_sn = 2; + string time = 3; +} + +message ApiPrintExpressPrintRequest { + int64 id = 1; + int64 transit_id = 2; +} + +message ApiPrintExpressTransitRequest { + string company = 1; +} + +message ApiLoginRequest { + string username = 1; + string password = 2; +} + +message ApiPrintBindRequest { + string transit_sn = 1; + string transit_name = 2; +} + message DeliveryInfoResponse { string transit_name = 1; string transit_sn = 2; @@ -170,6 +204,27 @@ service Express { }; }; + rpc ExpressAdminCancel(IdRequest) returns(Response){ + option (google.api.http) = { + get: "/admin/v3/express/cancel" + body: "*" + }; + }; + rpc ExpressAdminQuery(IdRequest) returns(Response){ + option (google.api.http) = { + get: "/admin/v3/express/query" + body: "*" + }; + }; + + rpc ExpressAdminEstimated(IdRequest) returns(Response){ + option (google.api.http) = { + get: "/admin/v3/express/estimated" + body: "*" + }; + }; + + /*****************API***********************/ rpc ExpressSfBack(EmtpyRequest) returns(SfResponse){ option (google.api.http) = { post: "/api/v3/express/sf" @@ -189,12 +244,6 @@ service Express { body: "*" }; }; - rpc ExpressAdminQuery(IdRequest) returns(Response){ - option (google.api.http) = { - get: "/admin/v3/express/query" - body: "*" - }; - }; rpc ExpressApiEstimated(IdApiRequest) returns(Response){ option (google.api.http) = { @@ -202,12 +251,6 @@ service Express { body: "*" }; }; - rpc ExpressAdminEstimated(IdRequest) returns(Response){ - option (google.api.http) = { - get: "/admin/v3/express/estimated" - body: "*" - }; - }; rpc ExpressApiCancel(IdApiRequest) returns(Response){ option (google.api.http) = { @@ -215,12 +258,57 @@ service Express { body: "*" }; }; - rpc ExpressAdminCancel(IdRequest) returns(Response){ + rpc ApiPrintBarCode(ApiPrintBarCodeRequest) returns(Response){ option (google.api.http) = { - get: "/admin/v3/express/cancel" + get: "/api/v3/print/bar/code" body: "*" }; }; + rpc ApiPrintBarCodePrint(ApiPrintBarCodePrintRequest) returns(Response){ + option (google.api.http) = { + get: "/api/v3/print/bar/code/print" + body: "*" + }; + }; + rpc ApiPrintExpress(ApiPrintExpressRequest) returns(Response){ + option (google.api.http) = { + get: "/api/v3/print/express" + body: "*" + }; + }; + rpc ApiPrintExpressTransit(ApiPrintExpressTransitRequest) returns(Response){ + option (google.api.http) = { + get: "/api/v3/print/express/transit" + body: "*" + }; + }; + rpc ApiPrintExpressPrint(ApiPrintExpressPrintRequest) returns(Response){ + option (google.api.http) = { + get: "/api/v3/print/express/print" + body: "*" + }; + }; + rpc ApiPrintProduct(EmtpyRequest) returns(Response){ + option (google.api.http) = { + get: "/api/v3/print/express/product" + body: "*" + }; + }; + rpc ApiLogin(ApiLoginRequest) returns(Response){ + option (google.api.http) = { + get: "/api/v3/print/login" + body: "*" + }; + }; + + //不需要登录 + rpc ApiPrintBind(ApiPrintBindRequest) returns(Response){ + option (google.api.http) = { + get: "/api/v3/transit/bind" + body: "*" + }; + }; + //添加生成订单的发货信息 rpc DeliveryOrderCreate(DeliveryOrderCreateRequest) returns(IdResponse); diff --git a/rpc/express/pb/express.pb.go b/rpc/express/pb/express.pb.go index d9d6867..e33023e 100644 --- a/rpc/express/pb/express.pb.go +++ b/rpc/express/pb/express.pb.go @@ -958,6 +958,362 @@ func (x *IdApiRequest) GetType() int32 { return 0 } +type ApiPrintBarCodeRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + Number int32 `protobuf:"varint,1,opt,name=number,proto3" json:"number,omitempty"` + ProductId int64 `protobuf:"varint,2,opt,name=product_id,json=productId,proto3" json:"product_id,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ApiPrintBarCodeRequest) Reset() { + *x = ApiPrintBarCodeRequest{} + mi := &file_express_express_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ApiPrintBarCodeRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ApiPrintBarCodeRequest) ProtoMessage() {} + +func (x *ApiPrintBarCodeRequest) ProtoReflect() protoreflect.Message { + mi := &file_express_express_proto_msgTypes[14] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ApiPrintBarCodeRequest.ProtoReflect.Descriptor instead. +func (*ApiPrintBarCodeRequest) Descriptor() ([]byte, []int) { + return file_express_express_proto_rawDescGZIP(), []int{14} +} + +func (x *ApiPrintBarCodeRequest) GetNumber() int32 { + if x != nil { + return x.Number + } + return 0 +} + +func (x *ApiPrintBarCodeRequest) GetProductId() int64 { + if x != nil { + return x.ProductId + } + return 0 +} + +type ApiPrintBarCodePrintRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ApiPrintBarCodePrintRequest) Reset() { + *x = ApiPrintBarCodePrintRequest{} + mi := &file_express_express_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ApiPrintBarCodePrintRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ApiPrintBarCodePrintRequest) ProtoMessage() {} + +func (x *ApiPrintBarCodePrintRequest) ProtoReflect() protoreflect.Message { + mi := &file_express_express_proto_msgTypes[15] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ApiPrintBarCodePrintRequest.ProtoReflect.Descriptor instead. +func (*ApiPrintBarCodePrintRequest) Descriptor() ([]byte, []int) { + return file_express_express_proto_rawDescGZIP(), []int{15} +} + +func (x *ApiPrintBarCodePrintRequest) GetId() int64 { + if x != nil { + return x.Id + } + return 0 +} + +type ApiPrintExpressRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + Status int32 `protobuf:"varint,1,opt,name=status,proto3" json:"status,omitempty"` + OrderSn string `protobuf:"bytes,2,opt,name=order_sn,json=orderSn,proto3" json:"order_sn,omitempty"` + Time string `protobuf:"bytes,3,opt,name=time,proto3" json:"time,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ApiPrintExpressRequest) Reset() { + *x = ApiPrintExpressRequest{} + mi := &file_express_express_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ApiPrintExpressRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ApiPrintExpressRequest) ProtoMessage() {} + +func (x *ApiPrintExpressRequest) ProtoReflect() protoreflect.Message { + mi := &file_express_express_proto_msgTypes[16] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ApiPrintExpressRequest.ProtoReflect.Descriptor instead. +func (*ApiPrintExpressRequest) Descriptor() ([]byte, []int) { + return file_express_express_proto_rawDescGZIP(), []int{16} +} + +func (x *ApiPrintExpressRequest) GetStatus() int32 { + if x != nil { + return x.Status + } + return 0 +} + +func (x *ApiPrintExpressRequest) GetOrderSn() string { + if x != nil { + return x.OrderSn + } + return "" +} + +func (x *ApiPrintExpressRequest) GetTime() string { + if x != nil { + return x.Time + } + return "" +} + +type ApiPrintExpressPrintRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + TransitId int64 `protobuf:"varint,2,opt,name=transit_id,json=transitId,proto3" json:"transit_id,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ApiPrintExpressPrintRequest) Reset() { + *x = ApiPrintExpressPrintRequest{} + mi := &file_express_express_proto_msgTypes[17] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ApiPrintExpressPrintRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ApiPrintExpressPrintRequest) ProtoMessage() {} + +func (x *ApiPrintExpressPrintRequest) ProtoReflect() protoreflect.Message { + mi := &file_express_express_proto_msgTypes[17] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ApiPrintExpressPrintRequest.ProtoReflect.Descriptor instead. +func (*ApiPrintExpressPrintRequest) Descriptor() ([]byte, []int) { + return file_express_express_proto_rawDescGZIP(), []int{17} +} + +func (x *ApiPrintExpressPrintRequest) GetId() int64 { + if x != nil { + return x.Id + } + return 0 +} + +func (x *ApiPrintExpressPrintRequest) GetTransitId() int64 { + if x != nil { + return x.TransitId + } + return 0 +} + +type ApiPrintExpressTransitRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + Company string `protobuf:"bytes,1,opt,name=company,proto3" json:"company,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ApiPrintExpressTransitRequest) Reset() { + *x = ApiPrintExpressTransitRequest{} + mi := &file_express_express_proto_msgTypes[18] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ApiPrintExpressTransitRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ApiPrintExpressTransitRequest) ProtoMessage() {} + +func (x *ApiPrintExpressTransitRequest) ProtoReflect() protoreflect.Message { + mi := &file_express_express_proto_msgTypes[18] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ApiPrintExpressTransitRequest.ProtoReflect.Descriptor instead. +func (*ApiPrintExpressTransitRequest) Descriptor() ([]byte, []int) { + return file_express_express_proto_rawDescGZIP(), []int{18} +} + +func (x *ApiPrintExpressTransitRequest) GetCompany() string { + if x != nil { + return x.Company + } + return "" +} + +type ApiLoginRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"` + Password string `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ApiLoginRequest) Reset() { + *x = ApiLoginRequest{} + mi := &file_express_express_proto_msgTypes[19] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ApiLoginRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ApiLoginRequest) ProtoMessage() {} + +func (x *ApiLoginRequest) ProtoReflect() protoreflect.Message { + mi := &file_express_express_proto_msgTypes[19] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ApiLoginRequest.ProtoReflect.Descriptor instead. +func (*ApiLoginRequest) Descriptor() ([]byte, []int) { + return file_express_express_proto_rawDescGZIP(), []int{19} +} + +func (x *ApiLoginRequest) GetUsername() string { + if x != nil { + return x.Username + } + return "" +} + +func (x *ApiLoginRequest) GetPassword() string { + if x != nil { + return x.Password + } + return "" +} + +type ApiPrintBindRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + TransitSn string `protobuf:"bytes,1,opt,name=transit_sn,json=transitSn,proto3" json:"transit_sn,omitempty"` + TransitName string `protobuf:"bytes,2,opt,name=transit_name,json=transitName,proto3" json:"transit_name,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ApiPrintBindRequest) Reset() { + *x = ApiPrintBindRequest{} + mi := &file_express_express_proto_msgTypes[20] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ApiPrintBindRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ApiPrintBindRequest) ProtoMessage() {} + +func (x *ApiPrintBindRequest) ProtoReflect() protoreflect.Message { + mi := &file_express_express_proto_msgTypes[20] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ApiPrintBindRequest.ProtoReflect.Descriptor instead. +func (*ApiPrintBindRequest) Descriptor() ([]byte, []int) { + return file_express_express_proto_rawDescGZIP(), []int{20} +} + +func (x *ApiPrintBindRequest) GetTransitSn() string { + if x != nil { + return x.TransitSn + } + return "" +} + +func (x *ApiPrintBindRequest) GetTransitName() string { + if x != nil { + return x.TransitName + } + return "" +} + type DeliveryInfoResponse struct { state protoimpl.MessageState `protogen:"open.v1"` TransitName string `protobuf:"bytes,1,opt,name=transit_name,json=transitName,proto3" json:"transit_name,omitempty"` @@ -972,7 +1328,7 @@ type DeliveryInfoResponse struct { func (x *DeliveryInfoResponse) Reset() { *x = DeliveryInfoResponse{} - mi := &file_express_express_proto_msgTypes[14] + mi := &file_express_express_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -984,7 +1340,7 @@ func (x *DeliveryInfoResponse) String() string { func (*DeliveryInfoResponse) ProtoMessage() {} func (x *DeliveryInfoResponse) ProtoReflect() protoreflect.Message { - mi := &file_express_express_proto_msgTypes[14] + mi := &file_express_express_proto_msgTypes[21] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -997,7 +1353,7 @@ func (x *DeliveryInfoResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use DeliveryInfoResponse.ProtoReflect.Descriptor instead. func (*DeliveryInfoResponse) Descriptor() ([]byte, []int) { - return file_express_express_proto_rawDescGZIP(), []int{14} + return file_express_express_proto_rawDescGZIP(), []int{21} } func (x *DeliveryInfoResponse) GetTransitName() string { @@ -1124,7 +1480,30 @@ const file_express_express_proto_rawDesc = "" + "\x04code\x18\x01 \x01(\tR\x04code\"2\n" + "\fIdApiRequest\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x12\n" + - "\x04type\x18\x02 \x01(\x05R\x04type\"\xcc\x01\n" + + "\x04type\x18\x02 \x01(\x05R\x04type\"O\n" + + "\x16ApiPrintBarCodeRequest\x12\x16\n" + + "\x06number\x18\x01 \x01(\x05R\x06number\x12\x1d\n" + + "\n" + + "product_id\x18\x02 \x01(\x03R\tproductId\"-\n" + + "\x1bApiPrintBarCodePrintRequest\x12\x0e\n" + + "\x02id\x18\x01 \x01(\x03R\x02id\"_\n" + + "\x16ApiPrintExpressRequest\x12\x16\n" + + "\x06status\x18\x01 \x01(\x05R\x06status\x12\x19\n" + + "\border_sn\x18\x02 \x01(\tR\aorderSn\x12\x12\n" + + "\x04time\x18\x03 \x01(\tR\x04time\"L\n" + + "\x1bApiPrintExpressPrintRequest\x12\x0e\n" + + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1d\n" + + "\n" + + "transit_id\x18\x02 \x01(\x03R\ttransitId\"9\n" + + "\x1dApiPrintExpressTransitRequest\x12\x18\n" + + "\acompany\x18\x01 \x01(\tR\acompany\"I\n" + + "\x0fApiLoginRequest\x12\x1a\n" + + "\busername\x18\x01 \x01(\tR\busername\x12\x1a\n" + + "\bpassword\x18\x02 \x01(\tR\bpassword\"W\n" + + "\x13ApiPrintBindRequest\x12\x1d\n" + + "\n" + + "transit_sn\x18\x01 \x01(\tR\ttransitSn\x12!\n" + + "\ftransit_name\x18\x02 \x01(\tR\vtransitName\"\xcc\x01\n" + "\x14DeliveryInfoResponse\x12!\n" + "\ftransit_name\x18\x01 \x01(\tR\vtransitName\x12\x1d\n" + "\n" + @@ -1132,7 +1511,7 @@ const file_express_express_proto_rawDesc = "" + "\x0eestimated_time\x18\x03 \x01(\tR\restimatedTime\x12#\n" + "\rtransit_query\x18\x04 \x01(\tR\ftransitQuery\x12\x16\n" + "\x06status\x18\x05 \x01(\x05R\x06status\x12\x0e\n" + - "\x02id\x18\x06 \x01(\x03R\x02id2\xb7\x0e\n" + + "\x02id\x18\x06 \x01(\x03R\x02id2\x9e\x15\n" + "\aExpress\x12U\n" + "\x05Items\x12\x15.express.EmtpyRequest\x1a\x11.express.Response\"\"\x82\xd3\xe4\x93\x02\x1c:\x01*\x12\x17/admin/v3/express/items\x12X\n" + "\x06Create\x12\x16.express.CreateRequest\x1a\x11.express.Response\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\"\x18/admin/v3/express/create\x12T\n" + @@ -1142,15 +1521,23 @@ const file_express_express_proto_rawDesc = "" + "\x06Status\x12\x16.express.StatusRequest\x1a\x11.express.Response\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\"\x18/admin/v3/express/status\x12\\\n" + "\aHistory\x12\x17.express.HistoryRequest\x1a\x11.express.Response\"%\x82\xd3\xe4\x93\x02\x1f:\x01*\x12\x1a/admin/v3/delivery/history\x12i\n" + "\x0eExpressCompany\x12\x1e.express.ExpressCompanyRequest\x1a\x11.express.Response\"$\x82\xd3\xe4\x93\x02\x1e:\x01*\x12\x19/admin/v3/express/company\x12k\n" + - "\x11ExpressDelivering\x12\x1a.express.DeliveringRequest\x1a\x11.express.Response\"'\x82\xd3\xe4\x93\x02!:\x01*\"\x1c/admin/v3/express/delivering\x12Z\n" + + "\x11ExpressDelivering\x12\x1a.express.DeliveringRequest\x1a\x11.express.Response\"'\x82\xd3\xe4\x93\x02!:\x01*\"\x1c/admin/v3/express/delivering\x12`\n" + + "\x12ExpressAdminCancel\x12\x12.express.IdRequest\x1a\x11.express.Response\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\x12\x18/admin/v3/express/cancel\x12^\n" + + "\x11ExpressAdminQuery\x12\x12.express.IdRequest\x1a\x11.express.Response\"\"\x82\xd3\xe4\x93\x02\x1c:\x01*\x12\x17/admin/v3/express/query\x12f\n" + + "\x15ExpressAdminEstimated\x12\x12.express.IdRequest\x1a\x11.express.Response\"&\x82\xd3\xe4\x93\x02 :\x01*\x12\x1b/admin/v3/express/estimated\x12Z\n" + "\rExpressSfBack\x12\x15.express.EmtpyRequest\x1a\x13.express.SfResponse\"\x1d\x82\xd3\xe4\x93\x02\x17:\x01*\"\x12/api/v3/express/sf\x12W\n" + "\rExpressJdBack\x12\x12.express.JdRequest\x1a\x13.express.SfResponse\"\x1d\x82\xd3\xe4\x93\x02\x17:\x01*\"\x12/api/v3/express/jd\x12]\n" + - "\x0fExpressApiQuery\x12\x15.express.IdApiRequest\x1a\x11.express.Response\" \x82\xd3\xe4\x93\x02\x1a:\x01*\x12\x15/api/v3/express/query\x12^\n" + - "\x11ExpressAdminQuery\x12\x12.express.IdRequest\x1a\x11.express.Response\"\"\x82\xd3\xe4\x93\x02\x1c:\x01*\x12\x17/admin/v3/express/query\x12e\n" + - "\x13ExpressApiEstimated\x12\x15.express.IdApiRequest\x1a\x11.express.Response\"$\x82\xd3\xe4\x93\x02\x1e:\x01*\x12\x19/api/v3/express/estimated\x12f\n" + - "\x15ExpressAdminEstimated\x12\x12.express.IdRequest\x1a\x11.express.Response\"&\x82\xd3\xe4\x93\x02 :\x01*\x12\x1b/admin/v3/express/estimated\x12_\n" + - "\x10ExpressApiCancel\x12\x15.express.IdApiRequest\x1a\x11.express.Response\"!\x82\xd3\xe4\x93\x02\x1b:\x01*\x12\x16/api/v3/express/cancel\x12`\n" + - "\x12ExpressAdminCancel\x12\x12.express.IdRequest\x1a\x11.express.Response\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\x12\x18/admin/v3/express/cancel\x12O\n" + + "\x0fExpressApiQuery\x12\x15.express.IdApiRequest\x1a\x11.express.Response\" \x82\xd3\xe4\x93\x02\x1a:\x01*\x12\x15/api/v3/express/query\x12e\n" + + "\x13ExpressApiEstimated\x12\x15.express.IdApiRequest\x1a\x11.express.Response\"$\x82\xd3\xe4\x93\x02\x1e:\x01*\x12\x19/api/v3/express/estimated\x12_\n" + + "\x10ExpressApiCancel\x12\x15.express.IdApiRequest\x1a\x11.express.Response\"!\x82\xd3\xe4\x93\x02\x1b:\x01*\x12\x16/api/v3/express/cancel\x12h\n" + + "\x0fApiPrintBarCode\x12\x1f.express.ApiPrintBarCodeRequest\x1a\x11.express.Response\"!\x82\xd3\xe4\x93\x02\x1b:\x01*\x12\x16/api/v3/print/bar/code\x12x\n" + + "\x14ApiPrintBarCodePrint\x12$.express.ApiPrintBarCodePrintRequest\x1a\x11.express.Response\"'\x82\xd3\xe4\x93\x02!:\x01*\x12\x1c/api/v3/print/bar/code/print\x12g\n" + + "\x0fApiPrintExpress\x12\x1f.express.ApiPrintExpressRequest\x1a\x11.express.Response\" \x82\xd3\xe4\x93\x02\x1a:\x01*\x12\x15/api/v3/print/express\x12}\n" + + "\x16ApiPrintExpressTransit\x12&.express.ApiPrintExpressTransitRequest\x1a\x11.express.Response\"(\x82\xd3\xe4\x93\x02\":\x01*\x12\x1d/api/v3/print/express/transit\x12w\n" + + "\x14ApiPrintExpressPrint\x12$.express.ApiPrintExpressPrintRequest\x1a\x11.express.Response\"&\x82\xd3\xe4\x93\x02 :\x01*\x12\x1b/api/v3/print/express/print\x12e\n" + + "\x0fApiPrintProduct\x12\x15.express.EmtpyRequest\x1a\x11.express.Response\"(\x82\xd3\xe4\x93\x02\":\x01*\x12\x1d/api/v3/print/express/product\x12W\n" + + "\bApiLogin\x12\x18.express.ApiLoginRequest\x1a\x11.express.Response\"\x1e\x82\xd3\xe4\x93\x02\x18:\x01*\x12\x13/api/v3/print/login\x12`\n" + + "\fApiPrintBind\x12\x1c.express.ApiPrintBindRequest\x1a\x11.express.Response\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\x12\x14/api/v3/transit/bind\x12O\n" + "\x13DeliveryOrderCreate\x12#.express.DeliveryOrderCreateRequest\x1a\x13.express.IdResponse\x12I\n" + "\x14GetDeliveryByOrderId\x12\x12.express.IdRequest\x1a\x1d.express.DeliveryInfoResponse\x12J\n" + "\x15GetDeliveryBySupplyId\x12\x12.express.IdRequest\x1a\x1d.express.DeliveryInfoResponseB\vZ\t./expressb\x06proto3" @@ -1167,23 +1554,30 @@ func file_express_express_proto_rawDescGZIP() []byte { return file_express_express_proto_rawDescData } -var file_express_express_proto_msgTypes = make([]protoimpl.MessageInfo, 15) +var file_express_express_proto_msgTypes = make([]protoimpl.MessageInfo, 22) var file_express_express_proto_goTypes = []any{ - (*Response)(nil), // 0: express.Response - (*SfResponse)(nil), // 1: express.SfResponse - (*IdResponse)(nil), // 2: express.IdResponse - (*EmtpyRequest)(nil), // 3: express.EmtpyRequest - (*JdRequest)(nil), // 4: express.JdRequest - (*CreateRequest)(nil), // 5: express.CreateRequest - (*IdRequest)(nil), // 6: express.IdRequest - (*StatusRequest)(nil), // 7: express.StatusRequest - (*HistoryRequest)(nil), // 8: express.HistoryRequest - (*DeliveryOrderCreateRequest)(nil), // 9: express.DeliveryOrderCreateRequest - (*DeliverOrderProductInfo)(nil), // 10: express.DeliverOrderProductInfo - (*DeliveringRequest)(nil), // 11: express.DeliveringRequest - (*ExpressCompanyRequest)(nil), // 12: express.ExpressCompanyRequest - (*IdApiRequest)(nil), // 13: express.IdApiRequest - (*DeliveryInfoResponse)(nil), // 14: express.DeliveryInfoResponse + (*Response)(nil), // 0: express.Response + (*SfResponse)(nil), // 1: express.SfResponse + (*IdResponse)(nil), // 2: express.IdResponse + (*EmtpyRequest)(nil), // 3: express.EmtpyRequest + (*JdRequest)(nil), // 4: express.JdRequest + (*CreateRequest)(nil), // 5: express.CreateRequest + (*IdRequest)(nil), // 6: express.IdRequest + (*StatusRequest)(nil), // 7: express.StatusRequest + (*HistoryRequest)(nil), // 8: express.HistoryRequest + (*DeliveryOrderCreateRequest)(nil), // 9: express.DeliveryOrderCreateRequest + (*DeliverOrderProductInfo)(nil), // 10: express.DeliverOrderProductInfo + (*DeliveringRequest)(nil), // 11: express.DeliveringRequest + (*ExpressCompanyRequest)(nil), // 12: express.ExpressCompanyRequest + (*IdApiRequest)(nil), // 13: express.IdApiRequest + (*ApiPrintBarCodeRequest)(nil), // 14: express.ApiPrintBarCodeRequest + (*ApiPrintBarCodePrintRequest)(nil), // 15: express.ApiPrintBarCodePrintRequest + (*ApiPrintExpressRequest)(nil), // 16: express.ApiPrintExpressRequest + (*ApiPrintExpressPrintRequest)(nil), // 17: express.ApiPrintExpressPrintRequest + (*ApiPrintExpressTransitRequest)(nil), // 18: express.ApiPrintExpressTransitRequest + (*ApiLoginRequest)(nil), // 19: express.ApiLoginRequest + (*ApiPrintBindRequest)(nil), // 20: express.ApiPrintBindRequest + (*DeliveryInfoResponse)(nil), // 21: express.DeliveryInfoResponse } var file_express_express_proto_depIdxs = []int32{ 10, // 0: express.DeliveryOrderCreateRequest.product_info:type_name -> express.DeliverOrderProductInfo @@ -1196,39 +1590,55 @@ var file_express_express_proto_depIdxs = []int32{ 8, // 7: express.Express.History:input_type -> express.HistoryRequest 12, // 8: express.Express.ExpressCompany:input_type -> express.ExpressCompanyRequest 11, // 9: express.Express.ExpressDelivering:input_type -> express.DeliveringRequest - 3, // 10: express.Express.ExpressSfBack:input_type -> express.EmtpyRequest - 4, // 11: express.Express.ExpressJdBack:input_type -> express.JdRequest - 13, // 12: express.Express.ExpressApiQuery:input_type -> express.IdApiRequest - 6, // 13: express.Express.ExpressAdminQuery:input_type -> express.IdRequest - 13, // 14: express.Express.ExpressApiEstimated:input_type -> express.IdApiRequest - 6, // 15: express.Express.ExpressAdminEstimated:input_type -> express.IdRequest - 13, // 16: express.Express.ExpressApiCancel:input_type -> express.IdApiRequest - 6, // 17: express.Express.ExpressAdminCancel:input_type -> express.IdRequest - 9, // 18: express.Express.DeliveryOrderCreate:input_type -> express.DeliveryOrderCreateRequest - 6, // 19: express.Express.GetDeliveryByOrderId:input_type -> express.IdRequest - 6, // 20: express.Express.GetDeliveryBySupplyId:input_type -> express.IdRequest - 0, // 21: express.Express.Items:output_type -> express.Response - 0, // 22: express.Express.Create:output_type -> express.Response - 0, // 23: express.Express.Edit:output_type -> express.Response - 0, // 24: express.Express.Info:output_type -> express.Response - 0, // 25: express.Express.Names:output_type -> express.Response - 0, // 26: express.Express.Status:output_type -> express.Response - 0, // 27: express.Express.History:output_type -> express.Response - 0, // 28: express.Express.ExpressCompany:output_type -> express.Response - 0, // 29: express.Express.ExpressDelivering:output_type -> express.Response - 1, // 30: express.Express.ExpressSfBack:output_type -> express.SfResponse - 1, // 31: express.Express.ExpressJdBack:output_type -> express.SfResponse - 0, // 32: express.Express.ExpressApiQuery:output_type -> express.Response - 0, // 33: express.Express.ExpressAdminQuery:output_type -> express.Response - 0, // 34: express.Express.ExpressApiEstimated:output_type -> express.Response - 0, // 35: express.Express.ExpressAdminEstimated:output_type -> express.Response - 0, // 36: express.Express.ExpressApiCancel:output_type -> express.Response - 0, // 37: express.Express.ExpressAdminCancel:output_type -> express.Response - 2, // 38: express.Express.DeliveryOrderCreate:output_type -> express.IdResponse - 14, // 39: express.Express.GetDeliveryByOrderId:output_type -> express.DeliveryInfoResponse - 14, // 40: express.Express.GetDeliveryBySupplyId:output_type -> express.DeliveryInfoResponse - 21, // [21:41] is the sub-list for method output_type - 1, // [1:21] is the sub-list for method input_type + 6, // 10: express.Express.ExpressAdminCancel:input_type -> express.IdRequest + 6, // 11: express.Express.ExpressAdminQuery:input_type -> express.IdRequest + 6, // 12: express.Express.ExpressAdminEstimated:input_type -> express.IdRequest + 3, // 13: express.Express.ExpressSfBack:input_type -> express.EmtpyRequest + 4, // 14: express.Express.ExpressJdBack:input_type -> express.JdRequest + 13, // 15: express.Express.ExpressApiQuery:input_type -> express.IdApiRequest + 13, // 16: express.Express.ExpressApiEstimated:input_type -> express.IdApiRequest + 13, // 17: express.Express.ExpressApiCancel:input_type -> express.IdApiRequest + 14, // 18: express.Express.ApiPrintBarCode:input_type -> express.ApiPrintBarCodeRequest + 15, // 19: express.Express.ApiPrintBarCodePrint:input_type -> express.ApiPrintBarCodePrintRequest + 16, // 20: express.Express.ApiPrintExpress:input_type -> express.ApiPrintExpressRequest + 18, // 21: express.Express.ApiPrintExpressTransit:input_type -> express.ApiPrintExpressTransitRequest + 17, // 22: express.Express.ApiPrintExpressPrint:input_type -> express.ApiPrintExpressPrintRequest + 3, // 23: express.Express.ApiPrintProduct:input_type -> express.EmtpyRequest + 19, // 24: express.Express.ApiLogin:input_type -> express.ApiLoginRequest + 20, // 25: express.Express.ApiPrintBind:input_type -> express.ApiPrintBindRequest + 9, // 26: express.Express.DeliveryOrderCreate:input_type -> express.DeliveryOrderCreateRequest + 6, // 27: express.Express.GetDeliveryByOrderId:input_type -> express.IdRequest + 6, // 28: express.Express.GetDeliveryBySupplyId:input_type -> express.IdRequest + 0, // 29: express.Express.Items:output_type -> express.Response + 0, // 30: express.Express.Create:output_type -> express.Response + 0, // 31: express.Express.Edit:output_type -> express.Response + 0, // 32: express.Express.Info:output_type -> express.Response + 0, // 33: express.Express.Names:output_type -> express.Response + 0, // 34: express.Express.Status:output_type -> express.Response + 0, // 35: express.Express.History:output_type -> express.Response + 0, // 36: express.Express.ExpressCompany:output_type -> express.Response + 0, // 37: express.Express.ExpressDelivering:output_type -> express.Response + 0, // 38: express.Express.ExpressAdminCancel:output_type -> express.Response + 0, // 39: express.Express.ExpressAdminQuery:output_type -> express.Response + 0, // 40: express.Express.ExpressAdminEstimated:output_type -> express.Response + 1, // 41: express.Express.ExpressSfBack:output_type -> express.SfResponse + 1, // 42: express.Express.ExpressJdBack:output_type -> express.SfResponse + 0, // 43: express.Express.ExpressApiQuery:output_type -> express.Response + 0, // 44: express.Express.ExpressApiEstimated:output_type -> express.Response + 0, // 45: express.Express.ExpressApiCancel:output_type -> express.Response + 0, // 46: express.Express.ApiPrintBarCode:output_type -> express.Response + 0, // 47: express.Express.ApiPrintBarCodePrint:output_type -> express.Response + 0, // 48: express.Express.ApiPrintExpress:output_type -> express.Response + 0, // 49: express.Express.ApiPrintExpressTransit:output_type -> express.Response + 0, // 50: express.Express.ApiPrintExpressPrint:output_type -> express.Response + 0, // 51: express.Express.ApiPrintProduct:output_type -> express.Response + 0, // 52: express.Express.ApiLogin:output_type -> express.Response + 0, // 53: express.Express.ApiPrintBind:output_type -> express.Response + 2, // 54: express.Express.DeliveryOrderCreate:output_type -> express.IdResponse + 21, // 55: express.Express.GetDeliveryByOrderId:output_type -> express.DeliveryInfoResponse + 21, // 56: express.Express.GetDeliveryBySupplyId:output_type -> express.DeliveryInfoResponse + 29, // [29:57] is the sub-list for method output_type + 1, // [1:29] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name 1, // [1:1] is the sub-list for extension extendee 0, // [0:1] is the sub-list for field type_name @@ -1245,7 +1655,7 @@ func file_express_express_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: unsafe.Slice(unsafe.StringData(file_express_express_proto_rawDesc), len(file_express_express_proto_rawDesc)), NumEnums: 0, - NumMessages: 15, + NumMessages: 22, NumExtensions: 0, NumServices: 1, }, diff --git a/rpc/express/pb/express_grpc.pb.go b/rpc/express/pb/express_grpc.pb.go index 80f3c88..0d2d17a 100644 --- a/rpc/express/pb/express_grpc.pb.go +++ b/rpc/express/pb/express_grpc.pb.go @@ -19,26 +19,34 @@ import ( const _ = grpc.SupportPackageIsVersion9 const ( - Express_Items_FullMethodName = "/express.Express/Items" - Express_Create_FullMethodName = "/express.Express/Create" - Express_Edit_FullMethodName = "/express.Express/Edit" - Express_Info_FullMethodName = "/express.Express/Info" - Express_Names_FullMethodName = "/express.Express/Names" - Express_Status_FullMethodName = "/express.Express/Status" - Express_History_FullMethodName = "/express.Express/History" - Express_ExpressCompany_FullMethodName = "/express.Express/ExpressCompany" - Express_ExpressDelivering_FullMethodName = "/express.Express/ExpressDelivering" - Express_ExpressSfBack_FullMethodName = "/express.Express/ExpressSfBack" - Express_ExpressJdBack_FullMethodName = "/express.Express/ExpressJdBack" - Express_ExpressApiQuery_FullMethodName = "/express.Express/ExpressApiQuery" - Express_ExpressAdminQuery_FullMethodName = "/express.Express/ExpressAdminQuery" - Express_ExpressApiEstimated_FullMethodName = "/express.Express/ExpressApiEstimated" - Express_ExpressAdminEstimated_FullMethodName = "/express.Express/ExpressAdminEstimated" - Express_ExpressApiCancel_FullMethodName = "/express.Express/ExpressApiCancel" - Express_ExpressAdminCancel_FullMethodName = "/express.Express/ExpressAdminCancel" - Express_DeliveryOrderCreate_FullMethodName = "/express.Express/DeliveryOrderCreate" - Express_GetDeliveryByOrderId_FullMethodName = "/express.Express/GetDeliveryByOrderId" - Express_GetDeliveryBySupplyId_FullMethodName = "/express.Express/GetDeliveryBySupplyId" + Express_Items_FullMethodName = "/express.Express/Items" + Express_Create_FullMethodName = "/express.Express/Create" + Express_Edit_FullMethodName = "/express.Express/Edit" + Express_Info_FullMethodName = "/express.Express/Info" + Express_Names_FullMethodName = "/express.Express/Names" + Express_Status_FullMethodName = "/express.Express/Status" + Express_History_FullMethodName = "/express.Express/History" + Express_ExpressCompany_FullMethodName = "/express.Express/ExpressCompany" + Express_ExpressDelivering_FullMethodName = "/express.Express/ExpressDelivering" + Express_ExpressAdminCancel_FullMethodName = "/express.Express/ExpressAdminCancel" + Express_ExpressAdminQuery_FullMethodName = "/express.Express/ExpressAdminQuery" + Express_ExpressAdminEstimated_FullMethodName = "/express.Express/ExpressAdminEstimated" + Express_ExpressSfBack_FullMethodName = "/express.Express/ExpressSfBack" + Express_ExpressJdBack_FullMethodName = "/express.Express/ExpressJdBack" + Express_ExpressApiQuery_FullMethodName = "/express.Express/ExpressApiQuery" + Express_ExpressApiEstimated_FullMethodName = "/express.Express/ExpressApiEstimated" + Express_ExpressApiCancel_FullMethodName = "/express.Express/ExpressApiCancel" + Express_ApiPrintBarCode_FullMethodName = "/express.Express/ApiPrintBarCode" + Express_ApiPrintBarCodePrint_FullMethodName = "/express.Express/ApiPrintBarCodePrint" + Express_ApiPrintExpress_FullMethodName = "/express.Express/ApiPrintExpress" + Express_ApiPrintExpressTransit_FullMethodName = "/express.Express/ApiPrintExpressTransit" + Express_ApiPrintExpressPrint_FullMethodName = "/express.Express/ApiPrintExpressPrint" + Express_ApiPrintProduct_FullMethodName = "/express.Express/ApiPrintProduct" + Express_ApiLogin_FullMethodName = "/express.Express/ApiLogin" + Express_ApiPrintBind_FullMethodName = "/express.Express/ApiPrintBind" + Express_DeliveryOrderCreate_FullMethodName = "/express.Express/DeliveryOrderCreate" + Express_GetDeliveryByOrderId_FullMethodName = "/express.Express/GetDeliveryByOrderId" + Express_GetDeliveryBySupplyId_FullMethodName = "/express.Express/GetDeliveryBySupplyId" ) // ExpressClient is the client API for Express service. @@ -56,14 +64,24 @@ type ExpressClient interface { ExpressCompany(ctx context.Context, in *ExpressCompanyRequest, opts ...grpc.CallOption) (*Response, error) // 发货 ExpressDelivering(ctx context.Context, in *DeliveringRequest, opts ...grpc.CallOption) (*Response, error) + ExpressAdminCancel(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) + ExpressAdminQuery(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) + ExpressAdminEstimated(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) + // ****************API********************** ExpressSfBack(ctx context.Context, in *EmtpyRequest, opts ...grpc.CallOption) (*SfResponse, error) ExpressJdBack(ctx context.Context, in *JdRequest, opts ...grpc.CallOption) (*SfResponse, error) ExpressApiQuery(ctx context.Context, in *IdApiRequest, opts ...grpc.CallOption) (*Response, error) - ExpressAdminQuery(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) ExpressApiEstimated(ctx context.Context, in *IdApiRequest, opts ...grpc.CallOption) (*Response, error) - ExpressAdminEstimated(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) ExpressApiCancel(ctx context.Context, in *IdApiRequest, opts ...grpc.CallOption) (*Response, error) - ExpressAdminCancel(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) + ApiPrintBarCode(ctx context.Context, in *ApiPrintBarCodeRequest, opts ...grpc.CallOption) (*Response, error) + ApiPrintBarCodePrint(ctx context.Context, in *ApiPrintBarCodePrintRequest, opts ...grpc.CallOption) (*Response, error) + ApiPrintExpress(ctx context.Context, in *ApiPrintExpressRequest, opts ...grpc.CallOption) (*Response, error) + ApiPrintExpressTransit(ctx context.Context, in *ApiPrintExpressTransitRequest, opts ...grpc.CallOption) (*Response, error) + ApiPrintExpressPrint(ctx context.Context, in *ApiPrintExpressPrintRequest, opts ...grpc.CallOption) (*Response, error) + ApiPrintProduct(ctx context.Context, in *EmtpyRequest, opts ...grpc.CallOption) (*Response, error) + ApiLogin(ctx context.Context, in *ApiLoginRequest, opts ...grpc.CallOption) (*Response, error) + // 不需要登录 + ApiPrintBind(ctx context.Context, in *ApiPrintBindRequest, opts ...grpc.CallOption) (*Response, error) // 添加生成订单的发货信息 DeliveryOrderCreate(ctx context.Context, in *DeliveryOrderCreateRequest, opts ...grpc.CallOption) (*IdResponse, error) GetDeliveryByOrderId(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*DeliveryInfoResponse, error) @@ -168,6 +186,36 @@ func (c *expressClient) ExpressDelivering(ctx context.Context, in *DeliveringReq return out, nil } +func (c *expressClient) ExpressAdminCancel(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Express_ExpressAdminCancel_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *expressClient) ExpressAdminQuery(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Express_ExpressAdminQuery_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *expressClient) ExpressAdminEstimated(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Express_ExpressAdminEstimated_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *expressClient) ExpressSfBack(ctx context.Context, in *EmtpyRequest, opts ...grpc.CallOption) (*SfResponse, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(SfResponse) @@ -198,16 +246,6 @@ func (c *expressClient) ExpressApiQuery(ctx context.Context, in *IdApiRequest, o return out, nil } -func (c *expressClient) ExpressAdminQuery(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(Response) - err := c.cc.Invoke(ctx, Express_ExpressAdminQuery_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *expressClient) ExpressApiEstimated(ctx context.Context, in *IdApiRequest, opts ...grpc.CallOption) (*Response, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(Response) @@ -218,16 +256,6 @@ func (c *expressClient) ExpressApiEstimated(ctx context.Context, in *IdApiReques return out, nil } -func (c *expressClient) ExpressAdminEstimated(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(Response) - err := c.cc.Invoke(ctx, Express_ExpressAdminEstimated_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *expressClient) ExpressApiCancel(ctx context.Context, in *IdApiRequest, opts ...grpc.CallOption) (*Response, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(Response) @@ -238,10 +266,80 @@ func (c *expressClient) ExpressApiCancel(ctx context.Context, in *IdApiRequest, return out, nil } -func (c *expressClient) ExpressAdminCancel(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) { +func (c *expressClient) ApiPrintBarCode(ctx context.Context, in *ApiPrintBarCodeRequest, opts ...grpc.CallOption) (*Response, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(Response) - err := c.cc.Invoke(ctx, Express_ExpressAdminCancel_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, Express_ApiPrintBarCode_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *expressClient) ApiPrintBarCodePrint(ctx context.Context, in *ApiPrintBarCodePrintRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Express_ApiPrintBarCodePrint_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *expressClient) ApiPrintExpress(ctx context.Context, in *ApiPrintExpressRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Express_ApiPrintExpress_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *expressClient) ApiPrintExpressTransit(ctx context.Context, in *ApiPrintExpressTransitRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Express_ApiPrintExpressTransit_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *expressClient) ApiPrintExpressPrint(ctx context.Context, in *ApiPrintExpressPrintRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Express_ApiPrintExpressPrint_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *expressClient) ApiPrintProduct(ctx context.Context, in *EmtpyRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Express_ApiPrintProduct_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *expressClient) ApiLogin(ctx context.Context, in *ApiLoginRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Express_ApiLogin_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *expressClient) ApiPrintBind(ctx context.Context, in *ApiPrintBindRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Express_ApiPrintBind_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -293,14 +391,24 @@ type ExpressServer interface { ExpressCompany(context.Context, *ExpressCompanyRequest) (*Response, error) // 发货 ExpressDelivering(context.Context, *DeliveringRequest) (*Response, error) + ExpressAdminCancel(context.Context, *IdRequest) (*Response, error) + ExpressAdminQuery(context.Context, *IdRequest) (*Response, error) + ExpressAdminEstimated(context.Context, *IdRequest) (*Response, error) + // ****************API********************** ExpressSfBack(context.Context, *EmtpyRequest) (*SfResponse, error) ExpressJdBack(context.Context, *JdRequest) (*SfResponse, error) ExpressApiQuery(context.Context, *IdApiRequest) (*Response, error) - ExpressAdminQuery(context.Context, *IdRequest) (*Response, error) ExpressApiEstimated(context.Context, *IdApiRequest) (*Response, error) - ExpressAdminEstimated(context.Context, *IdRequest) (*Response, error) ExpressApiCancel(context.Context, *IdApiRequest) (*Response, error) - ExpressAdminCancel(context.Context, *IdRequest) (*Response, error) + ApiPrintBarCode(context.Context, *ApiPrintBarCodeRequest) (*Response, error) + ApiPrintBarCodePrint(context.Context, *ApiPrintBarCodePrintRequest) (*Response, error) + ApiPrintExpress(context.Context, *ApiPrintExpressRequest) (*Response, error) + ApiPrintExpressTransit(context.Context, *ApiPrintExpressTransitRequest) (*Response, error) + ApiPrintExpressPrint(context.Context, *ApiPrintExpressPrintRequest) (*Response, error) + ApiPrintProduct(context.Context, *EmtpyRequest) (*Response, error) + ApiLogin(context.Context, *ApiLoginRequest) (*Response, error) + // 不需要登录 + ApiPrintBind(context.Context, *ApiPrintBindRequest) (*Response, error) // 添加生成订单的发货信息 DeliveryOrderCreate(context.Context, *DeliveryOrderCreateRequest) (*IdResponse, error) GetDeliveryByOrderId(context.Context, *IdRequest) (*DeliveryInfoResponse, error) @@ -342,6 +450,15 @@ func (UnimplementedExpressServer) ExpressCompany(context.Context, *ExpressCompan func (UnimplementedExpressServer) ExpressDelivering(context.Context, *DeliveringRequest) (*Response, error) { return nil, status.Error(codes.Unimplemented, "method ExpressDelivering not implemented") } +func (UnimplementedExpressServer) ExpressAdminCancel(context.Context, *IdRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method ExpressAdminCancel not implemented") +} +func (UnimplementedExpressServer) ExpressAdminQuery(context.Context, *IdRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method ExpressAdminQuery not implemented") +} +func (UnimplementedExpressServer) ExpressAdminEstimated(context.Context, *IdRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method ExpressAdminEstimated not implemented") +} func (UnimplementedExpressServer) ExpressSfBack(context.Context, *EmtpyRequest) (*SfResponse, error) { return nil, status.Error(codes.Unimplemented, "method ExpressSfBack not implemented") } @@ -351,20 +468,35 @@ func (UnimplementedExpressServer) ExpressJdBack(context.Context, *JdRequest) (*S func (UnimplementedExpressServer) ExpressApiQuery(context.Context, *IdApiRequest) (*Response, error) { return nil, status.Error(codes.Unimplemented, "method ExpressApiQuery not implemented") } -func (UnimplementedExpressServer) ExpressAdminQuery(context.Context, *IdRequest) (*Response, error) { - return nil, status.Error(codes.Unimplemented, "method ExpressAdminQuery not implemented") -} func (UnimplementedExpressServer) ExpressApiEstimated(context.Context, *IdApiRequest) (*Response, error) { return nil, status.Error(codes.Unimplemented, "method ExpressApiEstimated not implemented") } -func (UnimplementedExpressServer) ExpressAdminEstimated(context.Context, *IdRequest) (*Response, error) { - return nil, status.Error(codes.Unimplemented, "method ExpressAdminEstimated not implemented") -} func (UnimplementedExpressServer) ExpressApiCancel(context.Context, *IdApiRequest) (*Response, error) { return nil, status.Error(codes.Unimplemented, "method ExpressApiCancel not implemented") } -func (UnimplementedExpressServer) ExpressAdminCancel(context.Context, *IdRequest) (*Response, error) { - return nil, status.Error(codes.Unimplemented, "method ExpressAdminCancel not implemented") +func (UnimplementedExpressServer) ApiPrintBarCode(context.Context, *ApiPrintBarCodeRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method ApiPrintBarCode not implemented") +} +func (UnimplementedExpressServer) ApiPrintBarCodePrint(context.Context, *ApiPrintBarCodePrintRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method ApiPrintBarCodePrint not implemented") +} +func (UnimplementedExpressServer) ApiPrintExpress(context.Context, *ApiPrintExpressRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method ApiPrintExpress not implemented") +} +func (UnimplementedExpressServer) ApiPrintExpressTransit(context.Context, *ApiPrintExpressTransitRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method ApiPrintExpressTransit not implemented") +} +func (UnimplementedExpressServer) ApiPrintExpressPrint(context.Context, *ApiPrintExpressPrintRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method ApiPrintExpressPrint not implemented") +} +func (UnimplementedExpressServer) ApiPrintProduct(context.Context, *EmtpyRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method ApiPrintProduct not implemented") +} +func (UnimplementedExpressServer) ApiLogin(context.Context, *ApiLoginRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method ApiLogin not implemented") +} +func (UnimplementedExpressServer) ApiPrintBind(context.Context, *ApiPrintBindRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method ApiPrintBind not implemented") } func (UnimplementedExpressServer) DeliveryOrderCreate(context.Context, *DeliveryOrderCreateRequest) (*IdResponse, error) { return nil, status.Error(codes.Unimplemented, "method DeliveryOrderCreate not implemented") @@ -558,6 +690,60 @@ func _Express_ExpressDelivering_Handler(srv interface{}, ctx context.Context, de return interceptor(ctx, in, info, handler) } +func _Express_ExpressAdminCancel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(IdRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ExpressServer).ExpressAdminCancel(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Express_ExpressAdminCancel_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ExpressServer).ExpressAdminCancel(ctx, req.(*IdRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Express_ExpressAdminQuery_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(IdRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ExpressServer).ExpressAdminQuery(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Express_ExpressAdminQuery_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ExpressServer).ExpressAdminQuery(ctx, req.(*IdRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Express_ExpressAdminEstimated_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(IdRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ExpressServer).ExpressAdminEstimated(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Express_ExpressAdminEstimated_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ExpressServer).ExpressAdminEstimated(ctx, req.(*IdRequest)) + } + return interceptor(ctx, in, info, handler) +} + func _Express_ExpressSfBack_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(EmtpyRequest) if err := dec(in); err != nil { @@ -612,24 +798,6 @@ func _Express_ExpressApiQuery_Handler(srv interface{}, ctx context.Context, dec return interceptor(ctx, in, info, handler) } -func _Express_ExpressAdminQuery_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(IdRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(ExpressServer).ExpressAdminQuery(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: Express_ExpressAdminQuery_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ExpressServer).ExpressAdminQuery(ctx, req.(*IdRequest)) - } - return interceptor(ctx, in, info, handler) -} - func _Express_ExpressApiEstimated_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(IdApiRequest) if err := dec(in); err != nil { @@ -648,24 +816,6 @@ func _Express_ExpressApiEstimated_Handler(srv interface{}, ctx context.Context, return interceptor(ctx, in, info, handler) } -func _Express_ExpressAdminEstimated_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(IdRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(ExpressServer).ExpressAdminEstimated(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: Express_ExpressAdminEstimated_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ExpressServer).ExpressAdminEstimated(ctx, req.(*IdRequest)) - } - return interceptor(ctx, in, info, handler) -} - func _Express_ExpressApiCancel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(IdApiRequest) if err := dec(in); err != nil { @@ -684,20 +834,146 @@ func _Express_ExpressApiCancel_Handler(srv interface{}, ctx context.Context, dec return interceptor(ctx, in, info, handler) } -func _Express_ExpressAdminCancel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(IdRequest) +func _Express_ApiPrintBarCode_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ApiPrintBarCodeRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ExpressServer).ExpressAdminCancel(ctx, in) + return srv.(ExpressServer).ApiPrintBarCode(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: Express_ExpressAdminCancel_FullMethodName, + FullMethod: Express_ApiPrintBarCode_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ExpressServer).ExpressAdminCancel(ctx, req.(*IdRequest)) + return srv.(ExpressServer).ApiPrintBarCode(ctx, req.(*ApiPrintBarCodeRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Express_ApiPrintBarCodePrint_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ApiPrintBarCodePrintRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ExpressServer).ApiPrintBarCodePrint(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Express_ApiPrintBarCodePrint_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ExpressServer).ApiPrintBarCodePrint(ctx, req.(*ApiPrintBarCodePrintRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Express_ApiPrintExpress_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ApiPrintExpressRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ExpressServer).ApiPrintExpress(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Express_ApiPrintExpress_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ExpressServer).ApiPrintExpress(ctx, req.(*ApiPrintExpressRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Express_ApiPrintExpressTransit_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ApiPrintExpressTransitRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ExpressServer).ApiPrintExpressTransit(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Express_ApiPrintExpressTransit_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ExpressServer).ApiPrintExpressTransit(ctx, req.(*ApiPrintExpressTransitRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Express_ApiPrintExpressPrint_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ApiPrintExpressPrintRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ExpressServer).ApiPrintExpressPrint(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Express_ApiPrintExpressPrint_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ExpressServer).ApiPrintExpressPrint(ctx, req.(*ApiPrintExpressPrintRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Express_ApiPrintProduct_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(EmtpyRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ExpressServer).ApiPrintProduct(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Express_ApiPrintProduct_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ExpressServer).ApiPrintProduct(ctx, req.(*EmtpyRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Express_ApiLogin_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ApiLoginRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ExpressServer).ApiLogin(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Express_ApiLogin_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ExpressServer).ApiLogin(ctx, req.(*ApiLoginRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Express_ApiPrintBind_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ApiPrintBindRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ExpressServer).ApiPrintBind(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Express_ApiPrintBind_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ExpressServer).ApiPrintBind(ctx, req.(*ApiPrintBindRequest)) } return interceptor(ctx, in, info, handler) } @@ -799,6 +1075,18 @@ var Express_ServiceDesc = grpc.ServiceDesc{ MethodName: "ExpressDelivering", Handler: _Express_ExpressDelivering_Handler, }, + { + MethodName: "ExpressAdminCancel", + Handler: _Express_ExpressAdminCancel_Handler, + }, + { + MethodName: "ExpressAdminQuery", + Handler: _Express_ExpressAdminQuery_Handler, + }, + { + MethodName: "ExpressAdminEstimated", + Handler: _Express_ExpressAdminEstimated_Handler, + }, { MethodName: "ExpressSfBack", Handler: _Express_ExpressSfBack_Handler, @@ -811,25 +1099,45 @@ var Express_ServiceDesc = grpc.ServiceDesc{ MethodName: "ExpressApiQuery", Handler: _Express_ExpressApiQuery_Handler, }, - { - MethodName: "ExpressAdminQuery", - Handler: _Express_ExpressAdminQuery_Handler, - }, { MethodName: "ExpressApiEstimated", Handler: _Express_ExpressApiEstimated_Handler, }, - { - MethodName: "ExpressAdminEstimated", - Handler: _Express_ExpressAdminEstimated_Handler, - }, { MethodName: "ExpressApiCancel", Handler: _Express_ExpressApiCancel_Handler, }, { - MethodName: "ExpressAdminCancel", - Handler: _Express_ExpressAdminCancel_Handler, + MethodName: "ApiPrintBarCode", + Handler: _Express_ApiPrintBarCode_Handler, + }, + { + MethodName: "ApiPrintBarCodePrint", + Handler: _Express_ApiPrintBarCodePrint_Handler, + }, + { + MethodName: "ApiPrintExpress", + Handler: _Express_ApiPrintExpress_Handler, + }, + { + MethodName: "ApiPrintExpressTransit", + Handler: _Express_ApiPrintExpressTransit_Handler, + }, + { + MethodName: "ApiPrintExpressPrint", + Handler: _Express_ApiPrintExpressPrint_Handler, + }, + { + MethodName: "ApiPrintProduct", + Handler: _Express_ApiPrintProduct_Handler, + }, + { + MethodName: "ApiLogin", + Handler: _Express_ApiLogin_Handler, + }, + { + MethodName: "ApiPrintBind", + Handler: _Express_ApiPrintBind_Handler, }, { MethodName: "DeliveryOrderCreate", diff --git a/rpc/percutaneous/pb/percutaneous.pb.go b/rpc/percutaneous/pb/percutaneous.pb.go new file mode 100644 index 0000000..de9da7b --- /dev/null +++ b/rpc/percutaneous/pb/percutaneous.pb.go @@ -0,0 +1,388 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.36.11 +// protoc v4.25.8 +// source: percutaneous/percutaneous.proto + +package percutaneous + +import ( + _ "google.golang.org/genproto/googleapis/api/annotations" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" + unsafe "unsafe" +) + +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 WifiCheckRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + HostCode string `protobuf:"bytes,1,opt,name=host_code,json=hostCode,proto3" json:"host_code,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *WifiCheckRequest) Reset() { + *x = WifiCheckRequest{} + mi := &file_percutaneous_percutaneous_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *WifiCheckRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*WifiCheckRequest) ProtoMessage() {} + +func (x *WifiCheckRequest) ProtoReflect() protoreflect.Message { + mi := &file_percutaneous_percutaneous_proto_msgTypes[0] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use WifiCheckRequest.ProtoReflect.Descriptor instead. +func (*WifiCheckRequest) Descriptor() ([]byte, []int) { + return file_percutaneous_percutaneous_proto_rawDescGZIP(), []int{0} +} + +func (x *WifiCheckRequest) GetHostCode() string { + if x != nil { + return x.HostCode + } + return "" +} + +type WifiSetRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + HostCode string `protobuf:"bytes,1,opt,name=host_code,json=hostCode,proto3" json:"host_code,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *WifiSetRequest) Reset() { + *x = WifiSetRequest{} + mi := &file_percutaneous_percutaneous_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *WifiSetRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*WifiSetRequest) ProtoMessage() {} + +func (x *WifiSetRequest) ProtoReflect() protoreflect.Message { + mi := &file_percutaneous_percutaneous_proto_msgTypes[1] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use WifiSetRequest.ProtoReflect.Descriptor instead. +func (*WifiSetRequest) Descriptor() ([]byte, []int) { + return file_percutaneous_percutaneous_proto_rawDescGZIP(), []int{1} +} + +func (x *WifiSetRequest) GetHostCode() string { + if x != nil { + return x.HostCode + } + return "" +} + +type UseRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + HostCode string `protobuf:"bytes,1,opt,name=host_code,json=hostCode,proto3" json:"host_code,omitempty"` + UserId int64 `protobuf:"varint,2,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"` + Data string `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"` + Stamp string `protobuf:"bytes,4,opt,name=stamp,proto3" json:"stamp,omitempty"` + Position int32 `protobuf:"varint,5,opt,name=position,proto3" json:"position,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *UseRequest) Reset() { + *x = UseRequest{} + mi := &file_percutaneous_percutaneous_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *UseRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UseRequest) ProtoMessage() {} + +func (x *UseRequest) ProtoReflect() protoreflect.Message { + mi := &file_percutaneous_percutaneous_proto_msgTypes[2] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UseRequest.ProtoReflect.Descriptor instead. +func (*UseRequest) Descriptor() ([]byte, []int) { + return file_percutaneous_percutaneous_proto_rawDescGZIP(), []int{2} +} + +func (x *UseRequest) GetHostCode() string { + if x != nil { + return x.HostCode + } + return "" +} + +func (x *UseRequest) GetUserId() int64 { + if x != nil { + return x.UserId + } + return 0 +} + +func (x *UseRequest) GetData() string { + if x != nil { + return x.Data + } + return "" +} + +func (x *UseRequest) GetStamp() string { + if x != nil { + return x.Stamp + } + return "" +} + +func (x *UseRequest) GetPosition() int32 { + if x != nil { + return x.Position + } + return 0 +} + +type UsedLogRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + Page int32 `protobuf:"varint,1,opt,name=page,proto3" json:"page,omitempty"` + Size int32 `protobuf:"varint,2,opt,name=size,proto3" json:"size,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *UsedLogRequest) Reset() { + *x = UsedLogRequest{} + mi := &file_percutaneous_percutaneous_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *UsedLogRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UsedLogRequest) ProtoMessage() {} + +func (x *UsedLogRequest) ProtoReflect() protoreflect.Message { + mi := &file_percutaneous_percutaneous_proto_msgTypes[3] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UsedLogRequest.ProtoReflect.Descriptor instead. +func (*UsedLogRequest) Descriptor() ([]byte, []int) { + return file_percutaneous_percutaneous_proto_rawDescGZIP(), []int{3} +} + +func (x *UsedLogRequest) GetPage() int32 { + if x != nil { + return x.Page + } + return 0 +} + +func (x *UsedLogRequest) GetSize() int32 { + if x != nil { + return x.Size + } + return 0 +} + +type Response struct { + state protoimpl.MessageState `protogen:"open.v1"` + Code int32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` + Msg string `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg,omitempty"` + Data string `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *Response) Reset() { + *x = Response{} + mi := &file_percutaneous_percutaneous_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *Response) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Response) ProtoMessage() {} + +func (x *Response) ProtoReflect() protoreflect.Message { + mi := &file_percutaneous_percutaneous_proto_msgTypes[4] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Response.ProtoReflect.Descriptor instead. +func (*Response) Descriptor() ([]byte, []int) { + return file_percutaneous_percutaneous_proto_rawDescGZIP(), []int{4} +} + +func (x *Response) GetCode() int32 { + if x != nil { + return x.Code + } + return 0 +} + +func (x *Response) GetMsg() string { + if x != nil { + return x.Msg + } + return "" +} + +func (x *Response) GetData() string { + if x != nil { + return x.Data + } + return "" +} + +var File_percutaneous_percutaneous_proto protoreflect.FileDescriptor + +const file_percutaneous_percutaneous_proto_rawDesc = "" + + "\n" + + "\x1fpercutaneous/percutaneous.proto\x12\fpercutaneous\x1a\x1cgoogle/api/annotations.proto\"/\n" + + "\x10WifiCheckRequest\x12\x1b\n" + + "\thost_code\x18\x01 \x01(\tR\bhostCode\"-\n" + + "\x0eWifiSetRequest\x12\x1b\n" + + "\thost_code\x18\x01 \x01(\tR\bhostCode\"\x88\x01\n" + + "\n" + + "UseRequest\x12\x1b\n" + + "\thost_code\x18\x01 \x01(\tR\bhostCode\x12\x17\n" + + "\auser_id\x18\x02 \x01(\x03R\x06userId\x12\x12\n" + + "\x04data\x18\x03 \x01(\tR\x04data\x12\x14\n" + + "\x05stamp\x18\x04 \x01(\tR\x05stamp\x12\x1a\n" + + "\bposition\x18\x05 \x01(\x05R\bposition\"8\n" + + "\x0eUsedLogRequest\x12\x12\n" + + "\x04page\x18\x01 \x01(\x05R\x04page\x12\x12\n" + + "\x04size\x18\x02 \x01(\x05R\x04size\"D\n" + + "\bResponse\x12\x12\n" + + "\x04code\x18\x01 \x01(\x05R\x04code\x12\x10\n" + + "\x03msg\x18\x02 \x01(\tR\x03msg\x12\x12\n" + + "\x04data\x18\x03 \x01(\tR\x04data2\xb3\x03\n" + + "\fPercutaneous\x12o\n" + + "\tWifiCheck\x12\x1e.percutaneous.WifiCheckRequest\x1a\x16.percutaneous.Response\"*\x82\xd3\xe4\x93\x02$:\x01*\x12\x1f/api/v3/percutaneous/wifi/check\x12i\n" + + "\aWifiSet\x12\x1c.percutaneous.WifiSetRequest\x1a\x16.percutaneous.Response\"(\x82\xd3\xe4\x93\x02\":\x01*\"\x1d/api/v3/percutaneous/wifi/set\x12\\\n" + + "\x03Use\x12\x18.percutaneous.UseRequest\x1a\x16.percutaneous.Response\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\"\x18/api/v3/percutaneous/use\x12i\n" + + "\aUsedLog\x12\x1c.percutaneous.UsedLogRequest\x1a\x16.percutaneous.Response\"(\x82\xd3\xe4\x93\x02\":\x01*\x12\x1d/api/v3/percutaneous/used/logB\x10Z\x0e./percutaneousb\x06proto3" + +var ( + file_percutaneous_percutaneous_proto_rawDescOnce sync.Once + file_percutaneous_percutaneous_proto_rawDescData []byte +) + +func file_percutaneous_percutaneous_proto_rawDescGZIP() []byte { + file_percutaneous_percutaneous_proto_rawDescOnce.Do(func() { + file_percutaneous_percutaneous_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_percutaneous_percutaneous_proto_rawDesc), len(file_percutaneous_percutaneous_proto_rawDesc))) + }) + return file_percutaneous_percutaneous_proto_rawDescData +} + +var file_percutaneous_percutaneous_proto_msgTypes = make([]protoimpl.MessageInfo, 5) +var file_percutaneous_percutaneous_proto_goTypes = []any{ + (*WifiCheckRequest)(nil), // 0: percutaneous.WifiCheckRequest + (*WifiSetRequest)(nil), // 1: percutaneous.WifiSetRequest + (*UseRequest)(nil), // 2: percutaneous.UseRequest + (*UsedLogRequest)(nil), // 3: percutaneous.UsedLogRequest + (*Response)(nil), // 4: percutaneous.Response +} +var file_percutaneous_percutaneous_proto_depIdxs = []int32{ + 0, // 0: percutaneous.Percutaneous.WifiCheck:input_type -> percutaneous.WifiCheckRequest + 1, // 1: percutaneous.Percutaneous.WifiSet:input_type -> percutaneous.WifiSetRequest + 2, // 2: percutaneous.Percutaneous.Use:input_type -> percutaneous.UseRequest + 3, // 3: percutaneous.Percutaneous.UsedLog:input_type -> percutaneous.UsedLogRequest + 4, // 4: percutaneous.Percutaneous.WifiCheck:output_type -> percutaneous.Response + 4, // 5: percutaneous.Percutaneous.WifiSet:output_type -> percutaneous.Response + 4, // 6: percutaneous.Percutaneous.Use:output_type -> percutaneous.Response + 4, // 7: percutaneous.Percutaneous.UsedLog:output_type -> percutaneous.Response + 4, // [4:8] is the sub-list for method output_type + 0, // [0:4] 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_percutaneous_percutaneous_proto_init() } +func file_percutaneous_percutaneous_proto_init() { + if File_percutaneous_percutaneous_proto != nil { + return + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_percutaneous_percutaneous_proto_rawDesc), len(file_percutaneous_percutaneous_proto_rawDesc)), + NumEnums: 0, + NumMessages: 5, + NumExtensions: 0, + NumServices: 1, + }, + GoTypes: file_percutaneous_percutaneous_proto_goTypes, + DependencyIndexes: file_percutaneous_percutaneous_proto_depIdxs, + MessageInfos: file_percutaneous_percutaneous_proto_msgTypes, + }.Build() + File_percutaneous_percutaneous_proto = out.File + file_percutaneous_percutaneous_proto_goTypes = nil + file_percutaneous_percutaneous_proto_depIdxs = nil +} diff --git a/rpc/percutaneous/pb/percutaneous_grpc.pb.go b/rpc/percutaneous/pb/percutaneous_grpc.pb.go new file mode 100644 index 0000000..3204c5a --- /dev/null +++ b/rpc/percutaneous/pb/percutaneous_grpc.pb.go @@ -0,0 +1,235 @@ +// Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.6.2 +// - protoc v4.25.8 +// source: percutaneous/percutaneous.proto + +package percutaneous + +import ( + context "context" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" +) + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 + +const ( + Percutaneous_WifiCheck_FullMethodName = "/percutaneous.Percutaneous/WifiCheck" + Percutaneous_WifiSet_FullMethodName = "/percutaneous.Percutaneous/WifiSet" + Percutaneous_Use_FullMethodName = "/percutaneous.Percutaneous/Use" + Percutaneous_UsedLog_FullMethodName = "/percutaneous.Percutaneous/UsedLog" +) + +// PercutaneousClient is the client API for Percutaneous service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. +type PercutaneousClient interface { + WifiCheck(ctx context.Context, in *WifiCheckRequest, opts ...grpc.CallOption) (*Response, error) + WifiSet(ctx context.Context, in *WifiSetRequest, opts ...grpc.CallOption) (*Response, error) + Use(ctx context.Context, in *UseRequest, opts ...grpc.CallOption) (*Response, error) + UsedLog(ctx context.Context, in *UsedLogRequest, opts ...grpc.CallOption) (*Response, error) +} + +type percutaneousClient struct { + cc grpc.ClientConnInterface +} + +func NewPercutaneousClient(cc grpc.ClientConnInterface) PercutaneousClient { + return &percutaneousClient{cc} +} + +func (c *percutaneousClient) WifiCheck(ctx context.Context, in *WifiCheckRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Percutaneous_WifiCheck_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *percutaneousClient) WifiSet(ctx context.Context, in *WifiSetRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Percutaneous_WifiSet_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *percutaneousClient) Use(ctx context.Context, in *UseRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Percutaneous_Use_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *percutaneousClient) UsedLog(ctx context.Context, in *UsedLogRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Percutaneous_UsedLog_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +// PercutaneousServer is the server API for Percutaneous service. +// All implementations must embed UnimplementedPercutaneousServer +// for forward compatibility. +type PercutaneousServer interface { + WifiCheck(context.Context, *WifiCheckRequest) (*Response, error) + WifiSet(context.Context, *WifiSetRequest) (*Response, error) + Use(context.Context, *UseRequest) (*Response, error) + UsedLog(context.Context, *UsedLogRequest) (*Response, error) + mustEmbedUnimplementedPercutaneousServer() +} + +// UnimplementedPercutaneousServer must be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedPercutaneousServer struct{} + +func (UnimplementedPercutaneousServer) WifiCheck(context.Context, *WifiCheckRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method WifiCheck not implemented") +} +func (UnimplementedPercutaneousServer) WifiSet(context.Context, *WifiSetRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method WifiSet not implemented") +} +func (UnimplementedPercutaneousServer) Use(context.Context, *UseRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method Use not implemented") +} +func (UnimplementedPercutaneousServer) UsedLog(context.Context, *UsedLogRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method UsedLog not implemented") +} +func (UnimplementedPercutaneousServer) mustEmbedUnimplementedPercutaneousServer() {} +func (UnimplementedPercutaneousServer) testEmbeddedByValue() {} + +// UnsafePercutaneousServer may be embedded to opt out of forward compatibility for this service. +// Use of this interface is not recommended, as added methods to PercutaneousServer will +// result in compilation errors. +type UnsafePercutaneousServer interface { + mustEmbedUnimplementedPercutaneousServer() +} + +func RegisterPercutaneousServer(s grpc.ServiceRegistrar, srv PercutaneousServer) { + // If the following call panics, it indicates UnimplementedPercutaneousServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } + s.RegisterService(&Percutaneous_ServiceDesc, srv) +} + +func _Percutaneous_WifiCheck_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(WifiCheckRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(PercutaneousServer).WifiCheck(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Percutaneous_WifiCheck_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(PercutaneousServer).WifiCheck(ctx, req.(*WifiCheckRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Percutaneous_WifiSet_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(WifiSetRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(PercutaneousServer).WifiSet(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Percutaneous_WifiSet_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(PercutaneousServer).WifiSet(ctx, req.(*WifiSetRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Percutaneous_Use_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UseRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(PercutaneousServer).Use(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Percutaneous_Use_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(PercutaneousServer).Use(ctx, req.(*UseRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Percutaneous_UsedLog_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UsedLogRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(PercutaneousServer).UsedLog(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Percutaneous_UsedLog_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(PercutaneousServer).UsedLog(ctx, req.(*UsedLogRequest)) + } + return interceptor(ctx, in, info, handler) +} + +// Percutaneous_ServiceDesc is the grpc.ServiceDesc for Percutaneous service. +// It's only intended for direct use with grpc.RegisterService, +// and not to be introspected or modified (even as a copy) +var Percutaneous_ServiceDesc = grpc.ServiceDesc{ + ServiceName: "percutaneous.Percutaneous", + HandlerType: (*PercutaneousServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "WifiCheck", + Handler: _Percutaneous_WifiCheck_Handler, + }, + { + MethodName: "WifiSet", + Handler: _Percutaneous_WifiSet_Handler, + }, + { + MethodName: "Use", + Handler: _Percutaneous_Use_Handler, + }, + { + MethodName: "UsedLog", + Handler: _Percutaneous_UsedLog_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "percutaneous/percutaneous.proto", +} diff --git a/rpc/percutaneous/percutaneous.pb b/rpc/percutaneous/percutaneous.pb new file mode 100644 index 0000000..fea715a Binary files /dev/null and b/rpc/percutaneous/percutaneous.pb differ diff --git a/rpc/percutaneous/percutaneous.proto b/rpc/percutaneous/percutaneous.proto new file mode 100644 index 0000000..e631ec0 --- /dev/null +++ b/rpc/percutaneous/percutaneous.proto @@ -0,0 +1,65 @@ +syntax = "proto3"; + +package percutaneous; +option go_package="./percutaneous"; +import "google/api/annotations.proto"; + + +message WifiCheckRequest { + string host_code = 1; +} + +message WifiSetRequest { + string host_code = 1; +} + +message UseRequest { + string host_code = 1; + int64 user_id = 2; + string data = 3; + string stamp = 4; + int32 position = 5; +} + +message UsedLogRequest { + int32 page = 1; + int32 size = 2; +} + +message Response { + int32 code = 1; + string msg = 2; + string data = 3; +} + +message WsStreamFrame { + bytes data = 1; +} + +service Percutaneous { + rpc WifiCheck(WifiCheckRequest) returns (Response) { + option (google.api.http) = { + get: "/api/v3/percutaneous/wifi/check" + body: "*" + }; + } + rpc WifiSet(WifiSetRequest) returns (Response) { + option (google.api.http) = { + post: "/api/v3/percutaneous/wifi/set" + body: "*" + }; + } + rpc Use(UseRequest) returns (Response) { + option (google.api.http) = { + post: "/api/v3/percutaneous/use" + body: "*" + }; + } + rpc UsedLog(UsedLogRequest) returns (Response) { + option (google.api.http) = { + get: "/api/v3/percutaneous/used/log" + body: "*" + }; + } + rpc WsTunnelStream(stream WsStreamFrame) returns (stream Response); +} diff --git a/services/equipment/equipmentclient/equipment.go b/services/equipment/equipmentclient/equipment.go index 2658ebf..f49829d 100644 --- a/services/equipment/equipmentclient/equipment.go +++ b/services/equipment/equipmentclient/equipment.go @@ -1,5 +1,5 @@ // Code generated by goctl. DO NOT EDIT. -// goctl 1.10.1 +// goctl 1.10.2 // Source: equipment.proto package equipmentClient diff --git a/services/equipment/internal/dao/bind.go b/services/equipment/internal/dao/bind.go index 0e3d9c8..058bd8d 100644 --- a/services/equipment/internal/dao/bind.go +++ b/services/equipment/internal/dao/bind.go @@ -10,6 +10,7 @@ type BindCreate struct { HostNickname string `gorm:"column:host_nickname;type:varchar(128);comment:主机昵称;NOT NULL" json:"host_nickname"` UserId int64 `gorm:"column:user_id;type:int(11);comment:用户ID;NOT NULL" json:"user_id"` UserNickname string `gorm:"column:user_nickname;type:varchar(128);comment:用户昵称;NOT NULL" json:"user_nickname"` + Type int32 `json:"type" gorm:"type"` // 类型。1为圆屏，2为卵型屏，3为皮肤分析仪，4为经皮湿水仪，5为AI化妆盒，6为软水机，7为制氧机 Image string `gorm:"column:image;type:varchar(128);comment:图片地址;NOT NULL" json:"image"` IsSpeciality int32 `gorm:"column:is_speciality;type:tinyint(1);default:0;comment:1是专业版;NOT NULL" json:"is_speciality"` Status int32 `gorm:"column:status;type:tinyint(1);default:1;comment:状态，1为正常，2为禁用" json:"status"` @@ -23,6 +24,7 @@ type BindInfo struct { UserId int64 `gorm:"column:user_id;type:int(11);comment:用户ID;NOT NULL" json:"user_id"` UserNickname string `gorm:"column:user_nickname;type:varchar(128);comment:用户昵称;NOT NULL" json:"user_nickname"` Image string `gorm:"column:image;type:varchar(128);comment:图片地址;NOT NULL" json:"image"` + Type int32 `json:"type" gorm:"type"` // 类型。1为圆屏，2为卵型屏，3为皮肤分析仪，4为经皮湿水仪，5为AI化妆盒，6为软水机，7为制氧机 IsSpeciality int32 `gorm:"column:is_speciality;type:tinyint(1);default:0;comment:1是专业版;NOT NULL" json:"is_speciality"` ExpiryTime string `gorm:"column:expiry_time;type:char(11);comment:过期时间" json:"expiry_time"` Status uint8 `gorm:"column:status;type:tinyint(1);default:1;comment:状态，1为正常，2为禁用" json:"status"` diff --git a/services/equipment/internal/dao/bindHistory.go b/services/equipment/internal/dao/bindHistory.go index 6d267a0..b54d123 100644 --- a/services/equipment/internal/dao/bindHistory.go +++ b/services/equipment/internal/dao/bindHistory.go @@ -3,6 +3,7 @@ package dao type BindHistoryCreate struct { Id int64 `gorm:"column:id;type:int(11);primary_key;AUTO_INCREMENT" json:"id"` HostCode string `gorm:"column:host_code;type:varchar(128);comment:设备昵称;NOT NULL" json:"host_code"` + Type int32 `json:"type" gorm:"type"` // 类型。1为圆屏，2为卵型屏，3为皮肤分析仪，4为经皮湿水仪，5为AI化妆盒，6为软水机，7为制氧机 Status int32 `gorm:"column:status;type:tinyint(1);default:2;comment:1为绑定，2为解绑;NOT NULL" json:"status"` UserId int64 `gorm:"column:user_id;type:int(11)" json:"user_id"` } diff --git a/services/equipment/internal/logic/apiBindAddLogic.go b/services/equipment/internal/logic/apiBindAddLogic.go index 079cc58..4f6a7a1 100644 --- a/services/equipment/internal/logic/apiBindAddLogic.go +++ b/services/equipment/internal/logic/apiBindAddLogic.go @@ -42,8 +42,10 @@ func (l *ApiBindAddLogic) ApiBindAdd(in *equipment.ApiBindAddRequest) (*equipmen } w := modelbase.Params{ - Eq: map[string]string{"host_code": v.HostCode, - "status": utils.StringStatusOk}, + Eq: map[string]string{ + "host_code": v.HostCode, + "status": utils.StringStatusOk, + "type": strconv.Itoa(int(in.Type))}, } var info dao.BindCreate modelObj := model.BindModel{}.Init() @@ -61,8 +63,14 @@ func (l *ApiBindAddLogic) ApiBindAdd(in *equipment.ApiBindAddRequest) (*equipmen } w = modelbase.Params{Eq: map[string]string{ "host_code": v.HostCode, - "user_id": strconv.FormatInt(adminInfo.ID, utils.NumberTen)}} - _ = modelObj.GetOne(w, &info) + "user_id": strconv.FormatInt(adminInfo.ID, utils.NumberTen), + "type": strconv.Itoa(int(in.Type))}, + } + err = modelObj.GetOne(w, &info) + if err != nil { + l.Logger.Error(err) + return l.fail(utils.Fail) + } info.Status = utils.StatusOk info.UserId = adminInfo.ID @@ -70,6 +78,7 @@ func (l *ApiBindAddLogic) ApiBindAdd(in *equipment.ApiBindAddRequest) (*equipmen info.HostCode = v.HostCode info.HostNickname = v.HostNickname info.BindTime = utils.Now() + info.Type = in.Type w = modelbase.Params{ Eq: map[string]string{"id": strconv.FormatInt(info.Id, utils.NumberTen)}, @@ -92,6 +101,7 @@ func (l *ApiBindAddLogic) ApiBindAdd(in *equipment.ApiBindAddRequest) (*equipmen HostCode: v.HostCode, UserId: adminInfo.ID, Status: utils.StatusOk, + Type: in.Type, } err = model.BindHistoryModel{}.Init().Create(&host) if err != nil { diff --git a/services/equipment/internal/logic/apiBindExpiryGetLogic.go b/services/equipment/internal/logic/apiBindExpiryGetLogic.go index ea389a7..ba9bdc4 100644 --- a/services/equipment/internal/logic/apiBindExpiryGetLogic.go +++ b/services/equipment/internal/logic/apiBindExpiryGetLogic.go @@ -45,7 +45,8 @@ func (l *ApiBindExpiryGetLogic) ApiBindExpiryGet(in *equipment.ApiBindExpiryGetR Eq: map[string]string{ "host_code": v.HostCode, "user_id": strconv.Itoa(int(adminInfo.ID)), - "status": utils.StringStatusOk}, + "status": utils.StringStatusOk, + "type": strconv.Itoa(int(in.Type))}, } modelObj := model.BindModel{}.Init() diff --git a/services/equipment/internal/logic/apiBindExpiryLogic.go b/services/equipment/internal/logic/apiBindExpiryLogic.go index 6fce248..6d3f5ef 100644 --- a/services/equipment/internal/logic/apiBindExpiryLogic.go +++ b/services/equipment/internal/logic/apiBindExpiryLogic.go @@ -44,9 +44,10 @@ func (l *ApiBindExpiryLogic) ApiBindExpiry(in *equipment.ApiBindExpiryRequest) ( var info dao.BindExpiry w := modelbase.Params{ Eq: map[string]string{ - "host_code": v.HostCode, + "host_code": in.HostCode, "user_id": strconv.FormatInt(adminInfo.ID, utils.NumberTen), - "status": utils.StringStatusOk}, + "status": utils.StringStatusOk, + "type": strconv.Itoa(int(in.EquipmentType))}, } modelObj := model.BindModel{}.Init() @@ -79,7 +80,7 @@ func (l *ApiBindExpiryLogic) ApiBindExpiry(in *equipment.ApiBindExpiryRequest) ( } if info2.Id < utils.NumberOne { - if v.Type == utils.NumberOne { + if in.Type == utils.NumberOne { info.ExpiryTime = "9999-12-31" } else { now := time.Now() diff --git a/services/equipment/internal/server/equipmentServer.go b/services/equipment/internal/server/equipmentServer.go index 8cfe27e..a64f3f4 100644 --- a/services/equipment/internal/server/equipmentServer.go +++ b/services/equipment/internal/server/equipmentServer.go @@ -1,5 +1,5 @@ // Code generated by goctl. DO NOT EDIT. -// goctl 1.10.1 +// goctl 1.10.2 // Source: equipment.proto package server diff --git a/services/equipment/validator/bind.go b/services/equipment/validator/bind.go index a81233c..c364162 100644 --- a/services/equipment/validator/bind.go +++ b/services/equipment/validator/bind.go @@ -5,10 +5,11 @@ import "lone-services/pkg/validate" type BindItemsValidator struct { Page int `form:"page" json:"page"` Size int `form:"size" json:"size"` - Status uint8 `form:"status" json:"status"` + Status int32 `form:"status" json:"status"` NickName string `form:"nick_name" json:"nick_name"` Code string `form:"code" json:"code"` Time []string `form:"time" json:"time"` + Type int32 `form:"type" json:"type"` } // GetMessage 提示消息 @@ -33,6 +34,7 @@ func (p BindSetExpiryValidator) GetMessage() validate.ValidatorMessages { type BindValidator struct { HostNickname string `form:"host_nickname" json:"host_nickname" validate:"required"` HostCode string `form:"host_code" json:"host_code" validate:"required"` + Type int32 `form:"type" json:"type"` } // GetMessage 提示消息 @@ -55,26 +57,30 @@ func (p BindUnbindValidator) GetMessage() validate.ValidatorMessages { } type BindExpiryValidator struct { - HostCode string `form:"host_code" json:"host_code" binding:"required"` - Type uint8 `form:"type" json:"type" binding:"required,oneof=1 2"` + HostCode string `form:"host_code" json:"host_code" binding:"required"` + Type int32 `form:"type" json:"type" binding:"required,oneof=1 2"` + EquipmentType int32 `form:"equipment_type" json:"equipment_type" binding:"required"` } // GetMessage 提示消息 func (p BindExpiryValidator) GetMessage() validate.ValidatorMessages { return validate.ValidatorMessages{ - "HostCode.required": "缺少设备编码", - "Type.required": "缺少设备类型", - "Type.oneof": "设备类型错误", + "HostCode.required": "缺少设备编码", + "Type.required": "缺少类型", + "Type.oneof": "类型错误", + "EquipmentType.required": "设备类型错误", } } type BindGetExpiryValidator struct { HostCode string `form:"host_code" json:"host_code" binding:"required"` + Type int32 `form:"type" json:"ype" binding:"required"` } // GetMessage 提示消息 func (p BindGetExpiryValidator) GetMessage() validate.ValidatorMessages { return validate.ValidatorMessages{ "HostCode.required": "缺少设备编码", + "Type.required": "缺少类型", } } diff --git a/services/express/expressclient/express.go b/services/express/expressclient/express.go index 89c9eba..e27d8dc 100644 --- a/services/express/expressclient/express.go +++ b/services/express/expressclient/express.go @@ -14,21 +14,28 @@ import ( ) type ( - CreateRequest = express.CreateRequest - DeliverOrderProductInfo = express.DeliverOrderProductInfo - DeliveringRequest = express.DeliveringRequest - DeliveryInfoResponse = express.DeliveryInfoResponse - DeliveryOrderCreateRequest = express.DeliveryOrderCreateRequest - EmtpyRequest = express.EmtpyRequest - ExpressCompanyRequest = express.ExpressCompanyRequest - HistoryRequest = express.HistoryRequest - IdApiRequest = express.IdApiRequest - IdRequest = express.IdRequest - IdResponse = express.IdResponse - JdRequest = express.JdRequest - Response = express.Response - SfResponse = express.SfResponse - StatusRequest = express.StatusRequest + ApiLoginRequest = express.ApiLoginRequest + ApiPrintBarCodePrintRequest = express.ApiPrintBarCodePrintRequest + ApiPrintBarCodeRequest = express.ApiPrintBarCodeRequest + ApiPrintBindRequest = express.ApiPrintBindRequest + ApiPrintExpressPrintRequest = express.ApiPrintExpressPrintRequest + ApiPrintExpressRequest = express.ApiPrintExpressRequest + ApiPrintExpressTransitRequest = express.ApiPrintExpressTransitRequest + CreateRequest = express.CreateRequest + DeliverOrderProductInfo = express.DeliverOrderProductInfo + DeliveringRequest = express.DeliveringRequest + DeliveryInfoResponse = express.DeliveryInfoResponse + DeliveryOrderCreateRequest = express.DeliveryOrderCreateRequest + EmtpyRequest = express.EmtpyRequest + ExpressCompanyRequest = express.ExpressCompanyRequest + HistoryRequest = express.HistoryRequest + IdApiRequest = express.IdApiRequest + IdRequest = express.IdRequest + IdResponse = express.IdResponse + JdRequest = express.JdRequest + Response = express.Response + SfResponse = express.SfResponse + StatusRequest = express.StatusRequest Express interface { Items(ctx context.Context, in *EmtpyRequest, opts ...grpc.CallOption) (*Response, error) @@ -42,14 +49,24 @@ type ( ExpressCompany(ctx context.Context, in *ExpressCompanyRequest, opts ...grpc.CallOption) (*Response, error) // 发货 ExpressDelivering(ctx context.Context, in *DeliveringRequest, opts ...grpc.CallOption) (*Response, error) + ExpressAdminCancel(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) + ExpressAdminQuery(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) + ExpressAdminEstimated(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) + // API ExpressSfBack(ctx context.Context, in *EmtpyRequest, opts ...grpc.CallOption) (*SfResponse, error) ExpressJdBack(ctx context.Context, in *JdRequest, opts ...grpc.CallOption) (*SfResponse, error) ExpressApiQuery(ctx context.Context, in *IdApiRequest, opts ...grpc.CallOption) (*Response, error) - ExpressAdminQuery(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) ExpressApiEstimated(ctx context.Context, in *IdApiRequest, opts ...grpc.CallOption) (*Response, error) - ExpressAdminEstimated(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) ExpressApiCancel(ctx context.Context, in *IdApiRequest, opts ...grpc.CallOption) (*Response, error) - ExpressAdminCancel(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) + ApiPrintBarCode(ctx context.Context, in *ApiPrintBarCodeRequest, opts ...grpc.CallOption) (*Response, error) + ApiPrintBarCodePrint(ctx context.Context, in *ApiPrintBarCodePrintRequest, opts ...grpc.CallOption) (*Response, error) + ApiPrintExpress(ctx context.Context, in *ApiPrintExpressRequest, opts ...grpc.CallOption) (*Response, error) + ApiPrintExpressTransit(ctx context.Context, in *ApiPrintExpressTransitRequest, opts ...grpc.CallOption) (*Response, error) + ApiPrintExpressPrint(ctx context.Context, in *ApiPrintExpressPrintRequest, opts ...grpc.CallOption) (*Response, error) + ApiPrintProduct(ctx context.Context, in *EmtpyRequest, opts ...grpc.CallOption) (*Response, error) + ApiLogin(ctx context.Context, in *ApiLoginRequest, opts ...grpc.CallOption) (*Response, error) + // 不需要登录 + ApiPrintBind(ctx context.Context, in *ApiPrintBindRequest, opts ...grpc.CallOption) (*Response, error) // 添加生成订单的发货信息 DeliveryOrderCreate(ctx context.Context, in *DeliveryOrderCreateRequest, opts ...grpc.CallOption) (*IdResponse, error) GetDeliveryByOrderId(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*DeliveryInfoResponse, error) @@ -114,6 +131,22 @@ func (m *defaultExpress) ExpressDelivering(ctx context.Context, in *DeliveringRe return client.ExpressDelivering(ctx, in, opts...) } +func (m *defaultExpress) ExpressAdminCancel(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) { + client := express.NewExpressClient(m.cli.Conn()) + return client.ExpressAdminCancel(ctx, in, opts...) +} + +func (m *defaultExpress) ExpressAdminQuery(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) { + client := express.NewExpressClient(m.cli.Conn()) + return client.ExpressAdminQuery(ctx, in, opts...) +} + +func (m *defaultExpress) ExpressAdminEstimated(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) { + client := express.NewExpressClient(m.cli.Conn()) + return client.ExpressAdminEstimated(ctx, in, opts...) +} + +// API func (m *defaultExpress) ExpressSfBack(ctx context.Context, in *EmtpyRequest, opts ...grpc.CallOption) (*SfResponse, error) { client := express.NewExpressClient(m.cli.Conn()) return client.ExpressSfBack(ctx, in, opts...) @@ -129,29 +162,55 @@ func (m *defaultExpress) ExpressApiQuery(ctx context.Context, in *IdApiRequest, return client.ExpressApiQuery(ctx, in, opts...) } -func (m *defaultExpress) ExpressAdminQuery(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) { - client := express.NewExpressClient(m.cli.Conn()) - return client.ExpressAdminQuery(ctx, in, opts...) -} - func (m *defaultExpress) ExpressApiEstimated(ctx context.Context, in *IdApiRequest, opts ...grpc.CallOption) (*Response, error) { client := express.NewExpressClient(m.cli.Conn()) return client.ExpressApiEstimated(ctx, in, opts...) } -func (m *defaultExpress) ExpressAdminEstimated(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) { - client := express.NewExpressClient(m.cli.Conn()) - return client.ExpressAdminEstimated(ctx, in, opts...) -} - func (m *defaultExpress) ExpressApiCancel(ctx context.Context, in *IdApiRequest, opts ...grpc.CallOption) (*Response, error) { client := express.NewExpressClient(m.cli.Conn()) return client.ExpressApiCancel(ctx, in, opts...) } -func (m *defaultExpress) ExpressAdminCancel(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) { +func (m *defaultExpress) ApiPrintBarCode(ctx context.Context, in *ApiPrintBarCodeRequest, opts ...grpc.CallOption) (*Response, error) { client := express.NewExpressClient(m.cli.Conn()) - return client.ExpressAdminCancel(ctx, in, opts...) + return client.ApiPrintBarCode(ctx, in, opts...) +} + +func (m *defaultExpress) ApiPrintBarCodePrint(ctx context.Context, in *ApiPrintBarCodePrintRequest, opts ...grpc.CallOption) (*Response, error) { + client := express.NewExpressClient(m.cli.Conn()) + return client.ApiPrintBarCodePrint(ctx, in, opts...) +} + +func (m *defaultExpress) ApiPrintExpress(ctx context.Context, in *ApiPrintExpressRequest, opts ...grpc.CallOption) (*Response, error) { + client := express.NewExpressClient(m.cli.Conn()) + return client.ApiPrintExpress(ctx, in, opts...) +} + +func (m *defaultExpress) ApiPrintExpressTransit(ctx context.Context, in *ApiPrintExpressTransitRequest, opts ...grpc.CallOption) (*Response, error) { + client := express.NewExpressClient(m.cli.Conn()) + return client.ApiPrintExpressTransit(ctx, in, opts...) +} + +func (m *defaultExpress) ApiPrintExpressPrint(ctx context.Context, in *ApiPrintExpressPrintRequest, opts ...grpc.CallOption) (*Response, error) { + client := express.NewExpressClient(m.cli.Conn()) + return client.ApiPrintExpressPrint(ctx, in, opts...) +} + +func (m *defaultExpress) ApiPrintProduct(ctx context.Context, in *EmtpyRequest, opts ...grpc.CallOption) (*Response, error) { + client := express.NewExpressClient(m.cli.Conn()) + return client.ApiPrintProduct(ctx, in, opts...) +} + +func (m *defaultExpress) ApiLogin(ctx context.Context, in *ApiLoginRequest, opts ...grpc.CallOption) (*Response, error) { + client := express.NewExpressClient(m.cli.Conn()) + return client.ApiLogin(ctx, in, opts...) +} + +// 不需要登录 +func (m *defaultExpress) ApiPrintBind(ctx context.Context, in *ApiPrintBindRequest, opts ...grpc.CallOption) (*Response, error) { + client := express.NewExpressClient(m.cli.Conn()) + return client.ApiPrintBind(ctx, in, opts...) } // 添加生成订单的发货信息 diff --git a/services/express/internal/dao/code.go b/services/express/internal/dao/code.go new file mode 100644 index 0000000..33cfebf --- /dev/null +++ b/services/express/internal/dao/code.go @@ -0,0 +1,21 @@ +package dao + +const ( + CodeStatusBind = 3 //为绑定 +) + +type CodeCreate struct { + Id int `gorm:"column:id;type:int(11);primary_key;AUTO_INCREMENT" json:"id"` + ProductId int `gorm:"column:product_id;type:int(11);comment:产品ID" json:"product_id"` + Code string `gorm:"column:code;type:varchar(255);comment:姓名" json:"code"` + Status uint8 `gorm:"column:status;type:tinyint(1);default:2;comment:状态，1为打印，2为未打印，3为已绑定" json:"status"` + AdminId int `gorm:"column:admin_id;type:int(11)" json:"admin_id"` + AdminName string `gorm:"column:admin_name;type:varchar(255)" json:"admin_name"` +} + +type CodeInfo struct { + Id int `gorm:"column:id;type:int(11);primary_key;AUTO_INCREMENT" json:"id"` + ProductId int `gorm:"column:product_id;type:int(11);comment:产品ID" json:"product_id"` + Code string `gorm:"column:code;type:varchar(255);comment:姓名" json:"code"` + Status uint8 `gorm:"column:status;type:tinyint(1);default:2;comment:状态，1为打印，2为未打印，3为已绑定" json:"status"` +} diff --git a/services/express/internal/logic/apiLoginLogic.go b/services/express/internal/logic/apiLoginLogic.go new file mode 100644 index 0000000..3c61feb --- /dev/null +++ b/services/express/internal/logic/apiLoginLogic.go @@ -0,0 +1,40 @@ +package logic + +import ( + "context" + "lone-services/pkg/utils" + "lone-services/services/express/validator" + + "lone-services/rpc/express/pb" + "lone-services/services/express/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" +) + +type ApiLoginLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger + BaseLogic +} + +func NewApiLoginLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ApiLoginLogic { + return &ApiLoginLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *ApiLoginLogic) ApiLogin(in *express.ApiLoginRequest) (*express.Response, error) { + var v validator.PrintLoginValidator + if fail := l.checkParams(in, &v); fail != nil { + return fail, nil + } + adminInfo := utils.GetUserFromCtx(l.ctx) + if adminInfo.ID < utils.NumberOne { + return l.fail(utils.ErrorNoLoginInfo) + } + + return l.ok(nil) +} diff --git a/services/express/internal/logic/apiPrintBarCodeLogic.go b/services/express/internal/logic/apiPrintBarCodeLogic.go new file mode 100644 index 0000000..ff1f135 --- /dev/null +++ b/services/express/internal/logic/apiPrintBarCodeLogic.go @@ -0,0 +1,40 @@ +package logic + +import ( + "context" + "lone-services/pkg/utils" + "lone-services/services/express/validator" + + "lone-services/rpc/express/pb" + "lone-services/services/express/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" +) + +type ApiPrintBarCodeLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger + BaseLogic +} + +func NewApiPrintBarCodeLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ApiPrintBarCodeLogic { + return &ApiPrintBarCodeLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *ApiPrintBarCodeLogic) ApiPrintBarCode(in *express.ApiPrintBarCodeRequest) (*express.Response, error) { + var v validator.PrintBarCodeValidator + if fail := l.checkParams(in, &v); fail != nil { + return fail, nil + } + adminInfo := utils.GetUserFromCtx(l.ctx) + if adminInfo.ID < utils.NumberOne { + return l.fail(utils.ErrorNoLoginInfo) + } + + return l.ok(nil) +} diff --git a/services/express/internal/logic/apiPrintBarCodePrintLogic.go b/services/express/internal/logic/apiPrintBarCodePrintLogic.go new file mode 100644 index 0000000..c40318e --- /dev/null +++ b/services/express/internal/logic/apiPrintBarCodePrintLogic.go @@ -0,0 +1,40 @@ +package logic + +import ( + "context" + "lone-services/pkg/utils" + "lone-services/services/express/validator" + + "lone-services/rpc/express/pb" + "lone-services/services/express/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" +) + +type ApiPrintBarCodePrintLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger + BaseLogic +} + +func NewApiPrintBarCodePrintLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ApiPrintBarCodePrintLogic { + return &ApiPrintBarCodePrintLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *ApiPrintBarCodePrintLogic) ApiPrintBarCodePrint(in *express.ApiPrintBarCodePrintRequest) (*express.Response, error) { + var v validator.PrintBarCodeUseValidator + if fail := l.checkParams(in, &v); fail != nil { + return fail, nil + } + adminInfo := utils.GetUserFromCtx(l.ctx) + if adminInfo.ID < utils.NumberOne { + return l.fail(utils.ErrorNoLoginInfo) + } + + return l.ok(nil) +} diff --git a/services/express/internal/logic/apiPrintBindLogic.go b/services/express/internal/logic/apiPrintBindLogic.go new file mode 100644 index 0000000..43c6e8e --- /dev/null +++ b/services/express/internal/logic/apiPrintBindLogic.go @@ -0,0 +1,41 @@ +package logic + +import ( + "context" + "lone-services/pkg/utils" + "lone-services/services/express/validator" + + "lone-services/rpc/express/pb" + "lone-services/services/express/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" +) + +type ApiPrintBindLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger + BaseLogic +} + +func NewApiPrintBindLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ApiPrintBindLogic { + return &ApiPrintBindLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +// 不需要登录 +func (l *ApiPrintBindLogic) ApiPrintBind(in *express.ApiPrintBindRequest) (*express.Response, error) { + var v validator.PrintETransitBindValidator + if fail := l.checkParams(in, &v); fail != nil { + return fail, nil + } + adminInfo := utils.GetUserFromCtx(l.ctx) + if adminInfo.ID < utils.NumberOne { + return l.fail(utils.ErrorNoLoginInfo) + } + + return l.ok(nil) +} diff --git a/services/express/internal/logic/apiPrintExpressLogic.go b/services/express/internal/logic/apiPrintExpressLogic.go new file mode 100644 index 0000000..51923c1 --- /dev/null +++ b/services/express/internal/logic/apiPrintExpressLogic.go @@ -0,0 +1,40 @@ +package logic + +import ( + "context" + "lone-services/pkg/utils" + "lone-services/services/express/validator" + + "lone-services/rpc/express/pb" + "lone-services/services/express/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" +) + +type ApiPrintExpressLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger + BaseLogic +} + +func NewApiPrintExpressLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ApiPrintExpressLogic { + return &ApiPrintExpressLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *ApiPrintExpressLogic) ApiPrintExpress(in *express.ApiPrintExpressRequest) (*express.Response, error) { + var v validator.PrintOrderValidator + if fail := l.checkParams(in, &v); fail != nil { + return fail, nil + } + adminInfo := utils.GetUserFromCtx(l.ctx) + if adminInfo.ID < utils.NumberOne { + return l.fail(utils.ErrorNoLoginInfo) + } + + return l.ok(nil) +} diff --git a/services/express/internal/logic/apiPrintExpressPrintLogic.go b/services/express/internal/logic/apiPrintExpressPrintLogic.go new file mode 100644 index 0000000..36b8a32 --- /dev/null +++ b/services/express/internal/logic/apiPrintExpressPrintLogic.go @@ -0,0 +1,39 @@ +package logic + +import ( + "context" + "lone-services/pkg/utils" + "lone-services/rpc/express/pb" + "lone-services/services/express/internal/svc" + "lone-services/services/express/validator" + + "github.com/zeromicro/go-zero/core/logx" +) + +type ApiPrintExpressPrintLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger + BaseLogic +} + +func NewApiPrintExpressPrintLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ApiPrintExpressPrintLogic { + return &ApiPrintExpressPrintLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *ApiPrintExpressPrintLogic) ApiPrintExpressPrint(in *express.ApiPrintExpressPrintRequest) (*express.Response, error) { + var v validator.PrintOrderUseValidator + if fail := l.checkParams(in, &v); fail != nil { + return fail, nil + } + adminInfo := utils.GetUserFromCtx(l.ctx) + if adminInfo.ID < utils.NumberOne { + return l.fail(utils.ErrorNoLoginInfo) + } + + return l.ok(nil) +} diff --git a/services/express/internal/logic/apiPrintExpressTransitLogic.go b/services/express/internal/logic/apiPrintExpressTransitLogic.go new file mode 100644 index 0000000..7ac6953 --- /dev/null +++ b/services/express/internal/logic/apiPrintExpressTransitLogic.go @@ -0,0 +1,54 @@ +package logic + +import ( + "context" + "lone-services/pkg/utils" + "lone-services/rpc/express/pb" + "lone-services/services/express/internal/svc" + "lone-services/services/express/validator" + + "github.com/zeromicro/go-zero/core/logx" +) + +type ApiPrintExpressTransitLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger + BaseLogic +} + +func NewApiPrintExpressTransitLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ApiPrintExpressTransitLogic { + return &ApiPrintExpressTransitLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *ApiPrintExpressTransitLogic) ApiPrintExpressTransit(in *express.ApiPrintExpressTransitRequest) (*express.Response, error) { + var v validator.PrintExpressTransitValidator + if fail := l.checkParams(in, &v); fail != nil { + return fail, nil + } + adminInfo := utils.GetUserFromCtx(l.ctx) + if adminInfo.ID < utils.NumberOne { + return l.fail(utils.ErrorNoLoginInfo) + } + + sf := utils.GetConfigInt("transit.sf_send_code_" + in.Company) + jd := utils.GetConfigInt("transit.jd_send_code_" + in.Company) + type retData struct { + Name string `json:"name"` + Id int `json:"id"` + } + var data []retData + data = append(data, retData{ + Name: "顺丰", + Id: sf, + }) + data = append(data, retData{ + Name: "京东", + Id: jd, + }) + return l.ok(data) +} diff --git a/services/express/internal/logic/apiPrintProductLogic.go b/services/express/internal/logic/apiPrintProductLogic.go new file mode 100644 index 0000000..8b8eaef --- /dev/null +++ b/services/express/internal/logic/apiPrintProductLogic.go @@ -0,0 +1,34 @@ +package logic + +import ( + "context" + "lone-services/pkg/utils" + "lone-services/rpc/express/pb" + "lone-services/services/express/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" +) + +type ApiPrintProductLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger + BaseLogic +} + +func NewApiPrintProductLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ApiPrintProductLogic { + return &ApiPrintProductLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *ApiPrintProductLogic) ApiPrintProduct(in *express.EmtpyRequest) (*express.Response, error) { + adminInfo := utils.GetUserFromCtx(l.ctx) + if adminInfo.ID < utils.NumberOne { + return l.fail(utils.ErrorNoLoginInfo) + } + + return l.ok(nil) +} diff --git a/services/express/internal/model/code.go b/services/express/internal/model/code.go new file mode 100644 index 0000000..b314167 --- /dev/null +++ b/services/express/internal/model/code.go @@ -0,0 +1,23 @@ +package model + +import ( + "lone-services/pkg/modelbase" + "lone-services/services/express/internal/dao" +) + +type CodeModel struct { + modelbase.Base +} + +func (m CodeModel) TableName() string { + return modelbase.Prefix() + "code" +} + +func (m CodeModel) Init() CodeModel { + m.Table = m.TableName() + return m +} + +func (m CodeModel) Create(data *dao.CodeCreate) error { + return m.Base.Create(data) +} diff --git a/services/express/internal/server/expressServer.go b/services/express/internal/server/expressServer.go index cc9a331..403d9d4 100644 --- a/services/express/internal/server/expressServer.go +++ b/services/express/internal/server/expressServer.go @@ -70,6 +70,22 @@ func (s *ExpressServer) ExpressDelivering(ctx context.Context, in *express.Deliv return l.ExpressDelivering(in) } +func (s *ExpressServer) ExpressAdminCancel(ctx context.Context, in *express.IdRequest) (*express.Response, error) { + l := logic.NewExpressAdminCancelLogic(ctx, s.svcCtx) + return l.ExpressAdminCancel(in) +} + +func (s *ExpressServer) ExpressAdminQuery(ctx context.Context, in *express.IdRequest) (*express.Response, error) { + l := logic.NewExpressAdminQueryLogic(ctx, s.svcCtx) + return l.ExpressAdminQuery(in) +} + +func (s *ExpressServer) ExpressAdminEstimated(ctx context.Context, in *express.IdRequest) (*express.Response, error) { + l := logic.NewExpressAdminEstimatedLogic(ctx, s.svcCtx) + return l.ExpressAdminEstimated(in) +} + +// API func (s *ExpressServer) ExpressSfBack(ctx context.Context, in *express.EmtpyRequest) (*express.SfResponse, error) { l := logic.NewExpressSfBackLogic(ctx, s.svcCtx) return l.ExpressSfBack(in) @@ -85,29 +101,55 @@ func (s *ExpressServer) ExpressApiQuery(ctx context.Context, in *express.IdApiRe return l.ExpressApiQuery(in) } -func (s *ExpressServer) ExpressAdminQuery(ctx context.Context, in *express.IdRequest) (*express.Response, error) { - l := logic.NewExpressAdminQueryLogic(ctx, s.svcCtx) - return l.ExpressAdminQuery(in) -} - func (s *ExpressServer) ExpressApiEstimated(ctx context.Context, in *express.IdApiRequest) (*express.Response, error) { l := logic.NewExpressApiEstimatedLogic(ctx, s.svcCtx) return l.ExpressApiEstimated(in) } -func (s *ExpressServer) ExpressAdminEstimated(ctx context.Context, in *express.IdRequest) (*express.Response, error) { - l := logic.NewExpressAdminEstimatedLogic(ctx, s.svcCtx) - return l.ExpressAdminEstimated(in) -} - func (s *ExpressServer) ExpressApiCancel(ctx context.Context, in *express.IdApiRequest) (*express.Response, error) { l := logic.NewExpressApiCancelLogic(ctx, s.svcCtx) return l.ExpressApiCancel(in) } -func (s *ExpressServer) ExpressAdminCancel(ctx context.Context, in *express.IdRequest) (*express.Response, error) { - l := logic.NewExpressAdminCancelLogic(ctx, s.svcCtx) - return l.ExpressAdminCancel(in) +func (s *ExpressServer) ApiPrintBarCode(ctx context.Context, in *express.ApiPrintBarCodeRequest) (*express.Response, error) { + l := logic.NewApiPrintBarCodeLogic(ctx, s.svcCtx) + return l.ApiPrintBarCode(in) +} + +func (s *ExpressServer) ApiPrintBarCodePrint(ctx context.Context, in *express.ApiPrintBarCodePrintRequest) (*express.Response, error) { + l := logic.NewApiPrintBarCodePrintLogic(ctx, s.svcCtx) + return l.ApiPrintBarCodePrint(in) +} + +func (s *ExpressServer) ApiPrintExpress(ctx context.Context, in *express.ApiPrintExpressRequest) (*express.Response, error) { + l := logic.NewApiPrintExpressLogic(ctx, s.svcCtx) + return l.ApiPrintExpress(in) +} + +func (s *ExpressServer) ApiPrintExpressTransit(ctx context.Context, in *express.ApiPrintExpressTransitRequest) (*express.Response, error) { + l := logic.NewApiPrintExpressTransitLogic(ctx, s.svcCtx) + return l.ApiPrintExpressTransit(in) +} + +func (s *ExpressServer) ApiPrintExpressPrint(ctx context.Context, in *express.ApiPrintExpressPrintRequest) (*express.Response, error) { + l := logic.NewApiPrintExpressPrintLogic(ctx, s.svcCtx) + return l.ApiPrintExpressPrint(in) +} + +func (s *ExpressServer) ApiPrintProduct(ctx context.Context, in *express.EmtpyRequest) (*express.Response, error) { + l := logic.NewApiPrintProductLogic(ctx, s.svcCtx) + return l.ApiPrintProduct(in) +} + +func (s *ExpressServer) ApiLogin(ctx context.Context, in *express.ApiLoginRequest) (*express.Response, error) { + l := logic.NewApiLoginLogic(ctx, s.svcCtx) + return l.ApiLogin(in) +} + +// 不需要登录 +func (s *ExpressServer) ApiPrintBind(ctx context.Context, in *express.ApiPrintBindRequest) (*express.Response, error) { + l := logic.NewApiPrintBindLogic(ctx, s.svcCtx) + return l.ApiPrintBind(in) } // 添加生成订单的发货信息 diff --git a/services/express/validator/print.go b/services/express/validator/print.go new file mode 100644 index 0000000..e4b5f8e --- /dev/null +++ b/services/express/validator/print.go @@ -0,0 +1,85 @@ +package validator + +import "lone-services/pkg/validate" + +type PrintLoginValidator struct { + Username int `form:"username" json:"username" validate:"required"` + Password int `form:"password" json:"password" validate:"required"` +} + +// GetMessage 提示消息 +func (p PrintLoginValidator) GetMessage() validate.ValidatorMessages { + return validate.ValidatorMessages{ + "Username.required": "用户名不能为空", + "Password.required": "密码不能为空", + } +} + +type PrintExpressTransitValidator struct { + Company string `form:"company" json:"company" validate:"required"` +} + +func (p PrintExpressTransitValidator) GetMessage() validate.ValidatorMessages { + return validate.ValidatorMessages{ + "Company.required": "公司信息不能为空", + } +} + +type PrintETransitBindValidator struct { + Codes string `form:"codes" json:"c" binding:"required"` +} + +// GetMessage 提示消息 +func (p PrintETransitBindValidator) GetMessage() validate.ValidatorMessages { + return validate.ValidatorMessages{ + "Codes.required": "codes不能为空", + } +} + +// PrintBarCodeValidator 创建产品 +type PrintBarCodeValidator struct { + Number int `form:"number" json:"number"` + ProductId int `form:"product_id" json:"product_id" validate:"required"` +} + +// GetMessage 提示消息 +func (p PrintBarCodeValidator) GetMessage() validate.ValidatorMessages { + return validate.ValidatorMessages{ + "ProductId.required": "产品ID不能为空", + } +} + +type PrintBarCodeUseValidator struct { + Id int `form:"id" json:"id" validate:"required"` +} + +// GetMessage 提示消息 +func (p PrintBarCodeUseValidator) GetMessage() validate.ValidatorMessages { + return validate.ValidatorMessages{ + validate.FieldId: validate.FieldIdValue, + } +} + +type PrintOrderValidator struct { + Status uint8 `form:"status" json:"status"` + OrderSn string `form:"order_sn" json:"order_sn"` + Time string `form:"time" json:"time"` +} + +// GetMessage 提示消息 +func (p PrintOrderValidator) GetMessage() validate.ValidatorMessages { + return validate.ValidatorMessages{} +} + +type PrintOrderUseValidator struct { + Id int `form:"id" json:"id" validate:"required"` + TransitId int `form:"transit_id" json:"transit_id"` +} + +// GetMessage 提示消息 +func (p PrintOrderUseValidator) GetMessage() validate.ValidatorMessages { + return validate.ValidatorMessages{ + validate.FieldId: validate.FieldIdValue, + //"TransitId.required": "快递ID不能为空", + } +} diff --git a/services/percutaneous/etc/percutaneous.yaml b/services/percutaneous/etc/percutaneous.yaml new file mode 100644 index 0000000..2c526ea --- /dev/null +++ b/services/percutaneous/etc/percutaneous.yaml @@ -0,0 +1,7 @@ +Nacos: + Hosts: + - host.docker.internal:8848 + NamespaceId: test + Group: LONE_SERVICES + RegisterIP: percutaneous + ConfigID: percutaneous \ No newline at end of file diff --git a/services/percutaneous/internal/config/config.go b/services/percutaneous/internal/config/config.go new file mode 100644 index 0000000..a1979dd --- /dev/null +++ b/services/percutaneous/internal/config/config.go @@ -0,0 +1,13 @@ +package config + +type Config struct { + Nacos NacosConf +} + +type NacosConf struct { + Hosts []string + NamespaceId string `json:",optional"` + Group string `json:",optional"` + RegisterIP string `json:",optional"` + ConfigID string `json:",optional"` +} diff --git a/services/percutaneous/internal/dao/usedLog.go b/services/percutaneous/internal/dao/usedLog.go new file mode 100644 index 0000000..03c43ad --- /dev/null +++ b/services/percutaneous/internal/dao/usedLog.go @@ -0,0 +1,24 @@ +package dao + +import "lone-services/pkg/utils" + +type UsedLog struct { + Id int64 `json:"id" gorm:"id"` + HostUserId int64 `json:"host_user_id" gorm:"host_user_id"` // 用户ID + HostCode string `json:"host_code" gorm:"host_code"` // 设备号 + UserId int64 `json:"user_id" gorm:"user_id"` // 使用人的ID + Data string `json:"data" gorm:"data"` // 数据 + Stamp utils.CustomTime `json:"stamp" gorm:"stamp"` // 标记，多次使用一个标记 + Position int32 `json:"position" gorm:"position"` // 位置 +} + +type UsedLogInfo struct { + Id int64 `json:"id" gorm:"id"` + HostUserId int64 `json:"host_user_id" gorm:"host_user_id"` // 用户ID + HostCode string `json:"host_code" gorm:"host_code"` // 设备号 + UserId int64 `json:"user_id" gorm:"user_id"` // 使用人的ID + Data string `json:"data" gorm:"data"` // 数据 + Stamp utils.CustomTime `json:"stamp" gorm:"stamp"` // 标记，多次使用一个标记 + Position int32 `json:"position" gorm:"position"` // 位置 + CreateTime utils.CustomTime `json:"create_time" gorm:"create_time"` // 时间 +} diff --git a/services/percutaneous/internal/dao/wifi.go b/services/percutaneous/internal/dao/wifi.go new file mode 100644 index 0000000..3b2cc9a --- /dev/null +++ b/services/percutaneous/internal/dao/wifi.go @@ -0,0 +1,27 @@ +package dao + +import "lone-services/pkg/utils" + +const ( + UserTypeStore = 1 + UserTypeUser = 2 + + WifiDone = 1 + WifiNotDone = 2 +) + +type Wifi struct { + Id int64 `json:"id" gorm:"id"` + UserId int64 `json:"user_id" gorm:"user_id"` // 用户ID + UserType int32 `json:"user_type" gorm:"user_type"` // 用户类型，1为用户，2为门店 + Done int32 `json:"done" gorm:"done"` // 是否配置了wifi,2为没有配置，1为配置了 +} + +type WifiInfo struct { + Id int64 `json:"id" gorm:"id"` + UserId int64 `json:"user_id" gorm:"user_id"` // 用户ID + UserType int32 `json:"user_type" gorm:"user_type"` // 用户类型，1为用户，2为门店 + Done int32 `json:"done" gorm:"done"` // 是否配置了wifi,2为没有配置，1为配置了 + UpdateTime utils.CustomTime `json:"update_time" gorm:"update_time"` + CarteTime utils.CustomTime `json:"carte_time" gorm:"carte_time"` +} diff --git a/services/percutaneous/internal/logic/base.go b/services/percutaneous/internal/logic/base.go new file mode 100644 index 0000000..c1a57ec --- /dev/null +++ b/services/percutaneous/internal/logic/base.go @@ -0,0 +1,76 @@ +package logic + +import ( + "lone-services/pkg/modelbase" + "lone-services/pkg/utils" + "lone-services/pkg/validate" + percutaneous "lone-services/rpc/percutaneous/pb" + "reflect" + "strconv" + + jsoniter "github.com/json-iterator/go" +) + +type BaseLogic struct { +} + +func (l *BaseLogic) checkParams(in interface{}, v validate.IValidator) *percutaneous.Response { + rv := reflect.ValueOf(in) + if rv.Kind() != reflect.Ptr || rv.IsNil() { + return &percutaneous.Response{ + Code: utils.ErrorParams.Code, + Msg: "request must be non‑nil proto pointer", + } + } + + resp := validate.ValidateFromProto(in, v) + if resp != utils.StringEmpty { + return &percutaneous.Response{ + Code: utils.ErrorParams.Code, + Msg: resp, + } + } + return nil +} + +func (l *BaseLogic) fail(status utils.Status) (*percutaneous.Response, error) { + return l.out(status, status.Msg) +} +func (l *BaseLogic) out(status utils.Status, msg string) (*percutaneous.Response, error) { + return &percutaneous.Response{Code: status.Code, Msg: msg}, nil +} + +func (l *BaseLogic) outData(status utils.Status, msg, data string) (*percutaneous.Response, error) { + return &percutaneous.Response{Code: status.Code, Msg: msg, Data: data}, nil +} + +func (l *BaseLogic) ok(data any) (*percutaneous.Response, error) { + buf, _ := jsoniter.Marshal(data) + return &percutaneous.Response{Code: utils.Ok.Code, Msg: utils.Ok.Msg, Data: string(buf)}, nil +} + +func (s BaseLogic) SetWhere(w *modelbase.Params, u utils.UserInfo) { + if u.Type == utils.SaleType { + s.SetGroupWhere(w, u, false) + } +} + +func (s BaseLogic) SetGroupWhere(w *modelbase.Params, u utils.UserInfo, checkProvince bool) { + if w.Eq == nil { + w.Eq = make(map[string]string) + } + if u.GroupId < utils.NumberOne { + return + } + + //如果是公司销售 + if u.Type == utils.SaleType { + w.Eq["group_id"] = strconv.Itoa(int(u.GroupId)) + } else if u.SaleProvince > utils.NumberZero { + if checkProvince { + w.Eq["sale_province"] = strconv.Itoa(int(u.SaleProvince)) + } else { + w.Eq["group_id"] = strconv.Itoa(int(u.GroupId)) + } + } +} diff --git a/services/percutaneous/internal/logic/useLogic.go b/services/percutaneous/internal/logic/useLogic.go new file mode 100644 index 0000000..7266d7b --- /dev/null +++ b/services/percutaneous/internal/logic/useLogic.go @@ -0,0 +1,40 @@ +package logic + +import ( + "context" + "lone-services/pkg/utils" + "lone-services/services/percutaneous/validator" + + "lone-services/rpc/percutaneous/pb" + "lone-services/services/percutaneous/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" +) + +type UseLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger + BaseLogic +} + +func NewUseLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UseLogic { + return &UseLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *UseLogic) Use(in *percutaneous.UseRequest) (*percutaneous.Response, error) { + var v validator.UseValidator + if fail := l.checkParams(in, &v); fail != nil { + return fail, nil + } + adminInfo := utils.GetUserFromCtx(l.ctx) + if adminInfo.ID < utils.NumberOne { + return l.fail(utils.ErrorNoLoginInfo) + } + + return l.ok(nil) +} diff --git a/services/percutaneous/internal/logic/usedLogLogic.go b/services/percutaneous/internal/logic/usedLogLogic.go new file mode 100644 index 0000000..8cbc889 --- /dev/null +++ b/services/percutaneous/internal/logic/usedLogLogic.go @@ -0,0 +1,36 @@ +package logic + +import ( + "context" + "lone-services/pkg/utils" + "lone-services/rpc/percutaneous/pb" + "lone-services/services/percutaneous/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" +) + +type UsedLogLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger + BaseLogic +} + +func NewUsedLogLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UsedLogLogic { + return &UsedLogLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *UsedLogLogic) UsedLog(in *percutaneous.UsedLogRequest) (*percutaneous.Response, error) { + adminInfo := utils.GetUserFromCtx(l.ctx) + if adminInfo.ID < utils.NumberOne { + return l.fail(utils.ErrorNoLoginInfo) + } + + //items.Items = info + //return l.ok(items) + return l.ok(nil) +} diff --git a/services/percutaneous/internal/logic/wifiCheckLogic.go b/services/percutaneous/internal/logic/wifiCheckLogic.go new file mode 100644 index 0000000..7fde415 --- /dev/null +++ b/services/percutaneous/internal/logic/wifiCheckLogic.go @@ -0,0 +1,40 @@ +package logic + +import ( + "context" + "lone-services/pkg/utils" + "lone-services/services/percutaneous/validator" + + "lone-services/rpc/percutaneous/pb" + "lone-services/services/percutaneous/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" +) + +type WifiCheckLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger + BaseLogic +} + +func NewWifiCheckLogic(ctx context.Context, svcCtx *svc.ServiceContext) *WifiCheckLogic { + return &WifiCheckLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *WifiCheckLogic) WifiCheck(in *percutaneous.WifiCheckRequest) (*percutaneous.Response, error) { + var v validator.HostCodeValidator + if fail := l.checkParams(in, &v); fail != nil { + return fail, nil + } + adminInfo := utils.GetUserFromCtx(l.ctx) + if adminInfo.ID < utils.NumberOne { + return l.fail(utils.ErrorNoLoginInfo) + } + + return l.ok(nil) +} diff --git a/services/percutaneous/internal/logic/wifiSetLogic.go b/services/percutaneous/internal/logic/wifiSetLogic.go new file mode 100644 index 0000000..dc77cc3 --- /dev/null +++ b/services/percutaneous/internal/logic/wifiSetLogic.go @@ -0,0 +1,40 @@ +package logic + +import ( + "context" + "lone-services/pkg/utils" + "lone-services/services/percutaneous/validator" + + "lone-services/rpc/percutaneous/pb" + "lone-services/services/percutaneous/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" +) + +type WifiSetLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger + BaseLogic +} + +func NewWifiSetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *WifiSetLogic { + return &WifiSetLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *WifiSetLogic) WifiSet(in *percutaneous.WifiSetRequest) (*percutaneous.Response, error) { + var v validator.HostCodeValidator + if fail := l.checkParams(in, &v); fail != nil { + return fail, nil + } + adminInfo := utils.GetUserFromCtx(l.ctx) + if adminInfo.ID < utils.NumberOne { + return l.fail(utils.ErrorNoLoginInfo) + } + + return l.ok(nil) +} diff --git a/services/percutaneous/internal/model/usedLog.go b/services/percutaneous/internal/model/usedLog.go new file mode 100644 index 0000000..e41294b --- /dev/null +++ b/services/percutaneous/internal/model/usedLog.go @@ -0,0 +1,23 @@ +package model + +import ( + "lone-services/pkg/modelbase" + "lone-services/services/percutaneous/internal/dao" +) + +type UsedLogModel struct { + modelbase.Base +} + +func (m UsedLogModel) TableName() string { + return modelbase.Prefix() + "used_log" +} + +func (m UsedLogModel) Init() UsedLogModel { + m.Table = m.TableName() + return m +} + +func (m UsedLogModel) Create(data *dao.UsedLog) error { + return m.Base.Create(data) +} diff --git a/services/percutaneous/internal/model/wifi.go b/services/percutaneous/internal/model/wifi.go new file mode 100644 index 0000000..3bc4fda --- /dev/null +++ b/services/percutaneous/internal/model/wifi.go @@ -0,0 +1,23 @@ +package model + +import ( + "lone-services/pkg/modelbase" + "lone-services/services/percutaneous/internal/dao" +) + +type WifiModel struct { + modelbase.Base +} + +func (m WifiModel) TableName() string { + return modelbase.Prefix() + "wifi" +} + +func (m WifiModel) Init() WifiModel { + m.Table = m.TableName() + return m +} + +func (m WifiModel) Create(data *dao.Wifi) error { + return m.Base.Create(data) +} diff --git a/services/percutaneous/internal/server/percutaneousServer.go b/services/percutaneous/internal/server/percutaneousServer.go new file mode 100644 index 0000000..6a8e453 --- /dev/null +++ b/services/percutaneous/internal/server/percutaneousServer.go @@ -0,0 +1,44 @@ +// Code generated by goctl. DO NOT EDIT. +// goctl 1.10.2 +// Source: percutaneous.proto + +package server + +import ( + "context" + + "lone-services/rpc/percutaneous/pb" + "lone-services/services/percutaneous/internal/logic" + "lone-services/services/percutaneous/internal/svc" +) + +type PercutaneousServer struct { + svcCtx *svc.ServiceContext + percutaneous.UnimplementedPercutaneousServer +} + +func NewPercutaneousServer(svcCtx *svc.ServiceContext) *PercutaneousServer { + return &PercutaneousServer{ + svcCtx: svcCtx, + } +} + +func (s *PercutaneousServer) WifiCheck(ctx context.Context, in *percutaneous.WifiCheckRequest) (*percutaneous.Response, error) { + l := logic.NewWifiCheckLogic(ctx, s.svcCtx) + return l.WifiCheck(in) +} + +func (s *PercutaneousServer) WifiSet(ctx context.Context, in *percutaneous.WifiSetRequest) (*percutaneous.Response, error) { + l := logic.NewWifiSetLogic(ctx, s.svcCtx) + return l.WifiSet(in) +} + +func (s *PercutaneousServer) Use(ctx context.Context, in *percutaneous.UseRequest) (*percutaneous.Response, error) { + l := logic.NewUseLogic(ctx, s.svcCtx) + return l.Use(in) +} + +func (s *PercutaneousServer) UsedLog(ctx context.Context, in *percutaneous.UsedLogRequest) (*percutaneous.Response, error) { + l := logic.NewUsedLogLogic(ctx, s.svcCtx) + return l.UsedLog(in) +} diff --git a/services/percutaneous/internal/svc/servicecontext.go b/services/percutaneous/internal/svc/servicecontext.go new file mode 100644 index 0000000..891e643 --- /dev/null +++ b/services/percutaneous/internal/svc/servicecontext.go @@ -0,0 +1,22 @@ +package svc + +import ( + "lone-services/pkg/utils" + "lone-services/services/percutaneous/internal/config" + + "gorm.io/gorm" +) + +type ServiceContext struct { + Config config.Config + DB *gorm.DB + Prefix string +} + +func NewServiceContext(c config.Config, db *gorm.DB) *ServiceContext { + return &ServiceContext{ + Config: c, + DB: db, + Prefix: utils.GetConfigString("mysql.prefix"), + } +} diff --git a/services/percutaneous/percutaneous.go b/services/percutaneous/percutaneous.go new file mode 100644 index 0000000..04a584c --- /dev/null +++ b/services/percutaneous/percutaneous.go @@ -0,0 +1,172 @@ +package main + +import ( + "flag" + "fmt" + "lone-services/pkg/discovery" + "lone-services/pkg/logRedis" + "lone-services/pkg/modelbase" + "lone-services/pkg/mysql" + "lone-services/pkg/redis" + "lone-services/pkg/utils" + "lone-services/pkg/validate" + percutaneous "lone-services/rpc/percutaneous/pb" + "net" + "os" + "strconv" + + "lone-services/services/percutaneous/internal/config" + "lone-services/services/percutaneous/internal/server" + "lone-services/services/percutaneous/internal/svc" + + "github.com/zeromicro/go-zero/core/conf" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/service" + "github.com/zeromicro/go-zero/zrpc" + "google.golang.org/grpc" + "google.golang.org/grpc/reflection" +) + +var configFile = flag.String("f", "etc/percutaneous.yaml", "the config file") + +func main() { + flag.Parse() + var c config.Config + conf.MustLoad(*configFile, &c) + + // Nacos配置拉取初始化 + nacosParam := utils.NacosConfig{ + Hosts: c.Nacos.Hosts, + NamespaceId: c.Nacos.NamespaceId, + Group: c.Nacos.Group, + ConfigID: c.Nacos.ConfigID, + } + fmt.Println("Nacos Config:", nacosParam) + utils.InitConfig(nacosParam) + + // 日志配置 + logConf := logx.LogConf{ + ServiceName: utils.GetConfigString("log.serviceName"), + Mode: utils.GetConfigString("log.mode"), + Encoding: utils.GetConfigString("log.encoding"), + Level: utils.GetConfigString("log.level"), + Path: utils.GetConfigString("log.path"), + KeepDays: utils.GetConfigInt("log.keepDays"), + MaxSize: utils.GetConfigInt("log.maxSize"), + MaxBackups: utils.GetConfigInt("log.maxBackups"), + Compress: utils.GetConfigBool("log.compress"), + } + logx.SetUp(logConf) + logx.AddWriter(logx.NewWriter(os.Stdout)) + + listenOn := utils.GetConfigString("base.listenOn") + mode := utils.GetConfigString("base.mode") + serviceName := utils.GetConfigString("base.name") + + // 初始化服务发现 + if err := discovery.Init(discovery.Config{ + Hosts: c.Nacos.Hosts, + NamespaceId: c.Nacos.NamespaceId, + Group: c.Nacos.Group, + }); err != nil { + logx.Errorf("nacos init: %v", err) + os.Exit(1) + } + + port, err := listenPort(listenOn) + if err != nil { + logx.Errorf("parse ListenOn: %v", err) + os.Exit(1) + } + + // 注册服务 + if err := discovery.Register(discovery.Instance{ + ServiceName: serviceName, + IP: c.Nacos.RegisterIP, + Port: port, + Group: c.Nacos.Group, + }); err != nil { + logx.Errorf("nacos register: %v", err) + os.Exit(1) + } + logx.Infof("服务注册成功: %s:%d", c.Nacos.RegisterIP, port) + + defer func() { + if err := discovery.Deregister(); err != nil { + logx.Errorf("nacos deregister: %v", err) + } + }() + + // 初始化MySQL + db, err := mysql.New(mysql.Config{ + Host: utils.GetConfigString("mysql.host"), + Port: utils.GetConfigInt("mysql.port"), + User: utils.GetConfigString("mysql.user"), + Password: utils.GetConfigString("mysql.password"), + Database: utils.GetConfigString("mysql.database"), + Charset: utils.GetConfigString("mysql.charset"), + Prefix: utils.GetConfigString("mysql.prefix"), + ReadHost: utils.GetConfigString("mysql_read.host"), + ReadPort: utils.GetConfigInt("mysql_read.port"), + ReadUser: utils.GetConfigString("mysql_read.user"), + ReadPassword: utils.GetConfigString("mysql_read.password"), + ReadDatabase: utils.GetConfigString("mysql_read.database"), + }) + if err != nil { + logx.Errorf("mysql init: %v", err) + os.Exit(1) + } + + // 初始化Redis + if err := redis.Init(redis.Config{ + Host: utils.GetConfigString("redis.host"), + Port: utils.GetConfigInt("redis.port"), + Password: utils.GetConfigString("redis.password"), + DB: utils.GetConfigInt("redis.db"), + }); err != nil { + logx.Errorf("redis init: %v", err) + os.Exit(1) + } + + if err := logRedis.Init(logRedis.LogRedisConfig{ + Host: utils.GetConfigString("log-redis.host"), + Port: utils.GetConfigInt("log-redis.port"), + Password: utils.GetConfigString("log-redis.password"), + DB: utils.GetConfigInt("log-redis.db"), + }); err != nil { + logx.Errorf("log redis init: %v", err) + os.Exit(1) + } + + debug := utils.GetConfigBool("mysql.debug") + modelbase.Init(db, modelbase.Config{Prefix: utils.GetConfigString("mysql.prefix"), Debug: debug}) + + // 初始化服务信息 + rpcConf := zrpc.RpcServerConf{ + ListenOn: listenOn, + } + rpcConf.Mode = mode + ctx := svc.NewServiceContext(c, db) + + s := zrpc.MustNewServer(rpcConf, func(grpcServer *grpc.Server) { + percutaneous.RegisterPercutaneousServer(grpcServer, server.NewPercutaneousServer(ctx)) + if mode == service.DevMode || mode == service.TestMode { + reflection.Register(grpcServer) + } + }) + defer s.Stop() + + s.AddUnaryInterceptors(validate.UnaryServerInterceptor(validate.MustNew())) + + logx.Infof("Starting rpc server at %s...", listenOn) + s.Start() +} + +// listenPort 拆分端口 +func listenPort(listenOn string) (uint64, error) { + _, portStr, err := net.SplitHostPort(listenOn) + if err != nil { + return utils.NumberZero, err + } + return strconv.ParseUint(portStr, utils.NumberTen, utils.NumberSixtyFourth) +} diff --git a/services/percutaneous/percutaneousclient/percutaneous.go b/services/percutaneous/percutaneousclient/percutaneous.go new file mode 100644 index 0000000..6ca280b --- /dev/null +++ b/services/percutaneous/percutaneousclient/percutaneous.go @@ -0,0 +1,59 @@ +// Code generated by goctl. DO NOT EDIT. +// goctl 1.10.2 +// Source: percutaneous.proto + +package percutaneousClient + +import ( + "context" + + "lone-services/rpc/percutaneous/pb" + + "github.com/zeromicro/go-zero/zrpc" + "google.golang.org/grpc" +) + +type ( + Response = percutaneous.Response + UseRequest = percutaneous.UseRequest + UsedLogRequest = percutaneous.UsedLogRequest + WifiCheckRequest = percutaneous.WifiCheckRequest + WifiSetRequest = percutaneous.WifiSetRequest + + Percutaneous interface { + WifiCheck(ctx context.Context, in *WifiCheckRequest, opts ...grpc.CallOption) (*Response, error) + WifiSet(ctx context.Context, in *WifiSetRequest, opts ...grpc.CallOption) (*Response, error) + Use(ctx context.Context, in *UseRequest, opts ...grpc.CallOption) (*Response, error) + UsedLog(ctx context.Context, in *UsedLogRequest, opts ...grpc.CallOption) (*Response, error) + } + + defaultPercutaneous struct { + cli zrpc.Client + } +) + +func NewPercutaneous(cli zrpc.Client) Percutaneous { + return &defaultPercutaneous{ + cli: cli, + } +} + +func (m *defaultPercutaneous) WifiCheck(ctx context.Context, in *WifiCheckRequest, opts ...grpc.CallOption) (*Response, error) { + client := percutaneous.NewPercutaneousClient(m.cli.Conn()) + return client.WifiCheck(ctx, in, opts...) +} + +func (m *defaultPercutaneous) WifiSet(ctx context.Context, in *WifiSetRequest, opts ...grpc.CallOption) (*Response, error) { + client := percutaneous.NewPercutaneousClient(m.cli.Conn()) + return client.WifiSet(ctx, in, opts...) +} + +func (m *defaultPercutaneous) Use(ctx context.Context, in *UseRequest, opts ...grpc.CallOption) (*Response, error) { + client := percutaneous.NewPercutaneousClient(m.cli.Conn()) + return client.Use(ctx, in, opts...) +} + +func (m *defaultPercutaneous) UsedLog(ctx context.Context, in *UsedLogRequest, opts ...grpc.CallOption) (*Response, error) { + client := percutaneous.NewPercutaneousClient(m.cli.Conn()) + return client.UsedLog(ctx, in, opts...) +} diff --git a/services/percutaneous/run.toml b/services/percutaneous/run.toml new file mode 100644 index 0000000..9279ef2 --- /dev/null +++ b/services/percutaneous/run.toml @@ -0,0 +1,46 @@ +[base] + port = 8060 + name = "percutaneous-service" + listenOn = "0.0.0.0:11600" + mode = "dev" +[log] + path = "logs" + serviceName = "percutaneous-service" + mode = "file" + encoding = "plain" + level = "info" + keepDays = 7 + maxSize = 50 + maxBackups = 5 + compress = false +# 测试的地址 +[mysql] + host = '39.106.171.204' + port = 33066 + user = 'root' + password = 'MOLXRZNOU4Y4' + database = 'dms-percutaneous' + charset = 'utf8mb4' + prefix = '' + debug = true +[mysql_read] + host = '39.106.171.204' + port = 33066 + user = 'root' + password = 'MOLXRZNOU4Y4' + database = 'dms-percutaneous' + charset = 'utf8mb4' + prefix = '' + +[redis] + host = '39.106.171.204' + password = 'lLMLcuPpzSj' + port = 6379 + db = 1 +[log-redis] + host = '39.106.171.204' + password = 'lLMLcuPpzSj' + port = 6379 + db = 3 +[encrypt] + data_key = "u2t9T3luZtoRfhBstkFN6TiIMW38BA8a" #内容数据, \ No newline at end of file diff --git a/services/percutaneous/tmp/runner-build b/services/percutaneous/tmp/runner-build new file mode 100644 index 0000000..e8a79a0 Binary files /dev/null and b/services/percutaneous/tmp/runner-build differ diff --git a/services/percutaneous/validator/usedLog.go b/services/percutaneous/validator/usedLog.go new file mode 100644 index 0000000..3bc6198 --- /dev/null +++ b/services/percutaneous/validator/usedLog.go @@ -0,0 +1,22 @@ +package validator + +import "lone-services/pkg/validate" + +// UseValidator 查看列表 +type UseValidator struct { + HostCode string `validate:"required"` + UserId int64 `validate:"required"` + Data string `validate:"required"` + Stamp int32 `validate:"required"` + Position string +} + +// GetMessage 查看列表 - 提示消息 +func (p UseValidator) GetMessage() validate.ValidatorMessages { + return validate.ValidatorMessages{ + "HostCode.required": "设备不能为空", + "UserId.required": "用户不能为空", + "Data.required": "数据不能为空", + "Stamp.required": "标记不能为空", + } +} diff --git a/services/percutaneous/validator/wifi.go b/services/percutaneous/validator/wifi.go new file mode 100644 index 0000000..9834d18 --- /dev/null +++ b/services/percutaneous/validator/wifi.go @@ -0,0 +1,15 @@ +package validator + +import "lone-services/pkg/validate" + +// HostCodeValidator 查看列表 +type HostCodeValidator struct { + HostCode string `validate:"required"` +} + +// GetMessage 查看列表 - 提示消息 +func (p HostCodeValidator) GetMessage() validate.ValidatorMessages { + return validate.ValidatorMessages{ + "HostCode.required": "设备不能为空", + } +}