diff --git a/rpc/equipment/equipment.pb b/rpc/equipment/equipment.pb index 5701cfd..c0c4db4 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 4ed7b69..68a741c 100644 --- a/rpc/equipment/equipment.proto +++ b/rpc/equipment/equipment.proto @@ -117,6 +117,20 @@ message ApiEditNameRequest { int32 type = 3; } +message AuthorizationBindRequest { + int64 store_id = 1; + string code = 2; +} + +message AuthorizationCancelRequest { + int64 store_id = 1; +} + +message AuthorizationControlRequest { + int64 store_id = 1; + int32 open = 2; +} + message ApiUnBindRequest { string host_code = 1; int32 type = 2; @@ -383,6 +397,37 @@ service Equipment { }; }; + //授权绑定 + rpc AuthorizationBind(AuthorizationBindRequest) returns(Response){ + option (google.api.http) = { + post: "/api/v3/device/authorization/bind" + body: "*" + }; + }; + + // 解绑授权 + rpc AuthorizationCancel(AuthorizationCancelRequest) returns(Response){ + option (google.api.http) = { + post: "/api/v3/device/authorization/cancel" + body: "*" + }; + }; + + // 更改打开权限开关 + rpc AuthorizationControl(AuthorizationControlRequest) returns(Response){ + option (google.api.http) = { + post: "/api/v3/device/authorization/control" + body: "*" + }; + }; + + // 用户端获取授权列表 + rpc AuthorizationItems(EmptyRequest) returns(Response){ + option (google.api.http) = { + post: "/api/v3/device/authorization/items" + body: "*" + }; + }; rpc InternalBindAdd(InternalBindAddRequest) returns(Response); rpc InternalBindInfo(InternalBindInfoRequest) returns(Response); diff --git a/rpc/equipment/pb/equipment.pb.go b/rpc/equipment/pb/equipment.pb.go index a34b093..cce54a6 100644 --- a/rpc/equipment/pb/equipment.pb.go +++ b/rpc/equipment/pb/equipment.pb.go @@ -1098,6 +1098,154 @@ func (x *ApiEditNameRequest) GetType() int32 { return 0 } +type AuthorizationBindRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + StoreId int64 `protobuf:"varint,1,opt,name=store_id,json=storeId,proto3" json:"store_id,omitempty"` + Code string `protobuf:"bytes,2,opt,name=code,proto3" json:"code,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *AuthorizationBindRequest) Reset() { + *x = AuthorizationBindRequest{} + mi := &file_equipment_equipment_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *AuthorizationBindRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*AuthorizationBindRequest) ProtoMessage() {} + +func (x *AuthorizationBindRequest) ProtoReflect() protoreflect.Message { + mi := &file_equipment_equipment_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 AuthorizationBindRequest.ProtoReflect.Descriptor instead. +func (*AuthorizationBindRequest) Descriptor() ([]byte, []int) { + return file_equipment_equipment_proto_rawDescGZIP(), []int{15} +} + +func (x *AuthorizationBindRequest) GetStoreId() int64 { + if x != nil { + return x.StoreId + } + return 0 +} + +func (x *AuthorizationBindRequest) GetCode() string { + if x != nil { + return x.Code + } + return "" +} + +type AuthorizationCancelRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + StoreId int64 `protobuf:"varint,1,opt,name=store_id,json=storeId,proto3" json:"store_id,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *AuthorizationCancelRequest) Reset() { + *x = AuthorizationCancelRequest{} + mi := &file_equipment_equipment_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *AuthorizationCancelRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*AuthorizationCancelRequest) ProtoMessage() {} + +func (x *AuthorizationCancelRequest) ProtoReflect() protoreflect.Message { + mi := &file_equipment_equipment_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 AuthorizationCancelRequest.ProtoReflect.Descriptor instead. +func (*AuthorizationCancelRequest) Descriptor() ([]byte, []int) { + return file_equipment_equipment_proto_rawDescGZIP(), []int{16} +} + +func (x *AuthorizationCancelRequest) GetStoreId() int64 { + if x != nil { + return x.StoreId + } + return 0 +} + +type AuthorizationControlRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + StoreId int64 `protobuf:"varint,1,opt,name=store_id,json=storeId,proto3" json:"store_id,omitempty"` + Open int32 `protobuf:"varint,2,opt,name=open,proto3" json:"open,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *AuthorizationControlRequest) Reset() { + *x = AuthorizationControlRequest{} + mi := &file_equipment_equipment_proto_msgTypes[17] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *AuthorizationControlRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*AuthorizationControlRequest) ProtoMessage() {} + +func (x *AuthorizationControlRequest) ProtoReflect() protoreflect.Message { + mi := &file_equipment_equipment_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 AuthorizationControlRequest.ProtoReflect.Descriptor instead. +func (*AuthorizationControlRequest) Descriptor() ([]byte, []int) { + return file_equipment_equipment_proto_rawDescGZIP(), []int{17} +} + +func (x *AuthorizationControlRequest) GetStoreId() int64 { + if x != nil { + return x.StoreId + } + return 0 +} + +func (x *AuthorizationControlRequest) GetOpen() int32 { + if x != nil { + return x.Open + } + 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"` @@ -1108,7 +1256,7 @@ type ApiUnBindRequest struct { func (x *ApiUnBindRequest) Reset() { *x = ApiUnBindRequest{} - mi := &file_equipment_equipment_proto_msgTypes[15] + mi := &file_equipment_equipment_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1120,7 +1268,7 @@ func (x *ApiUnBindRequest) String() string { func (*ApiUnBindRequest) ProtoMessage() {} func (x *ApiUnBindRequest) ProtoReflect() protoreflect.Message { - mi := &file_equipment_equipment_proto_msgTypes[15] + mi := &file_equipment_equipment_proto_msgTypes[18] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1133,7 +1281,7 @@ func (x *ApiUnBindRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ApiUnBindRequest.ProtoReflect.Descriptor instead. func (*ApiUnBindRequest) Descriptor() ([]byte, []int) { - return file_equipment_equipment_proto_rawDescGZIP(), []int{15} + return file_equipment_equipment_proto_rawDescGZIP(), []int{18} } func (x *ApiUnBindRequest) GetHostCode() string { @@ -1158,7 +1306,7 @@ type EmptyRequest struct { func (x *EmptyRequest) Reset() { *x = EmptyRequest{} - mi := &file_equipment_equipment_proto_msgTypes[16] + mi := &file_equipment_equipment_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1170,7 +1318,7 @@ func (x *EmptyRequest) String() string { func (*EmptyRequest) ProtoMessage() {} func (x *EmptyRequest) ProtoReflect() protoreflect.Message { - mi := &file_equipment_equipment_proto_msgTypes[16] + mi := &file_equipment_equipment_proto_msgTypes[19] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1183,7 +1331,7 @@ func (x *EmptyRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use EmptyRequest.ProtoReflect.Descriptor instead. func (*EmptyRequest) Descriptor() ([]byte, []int) { - return file_equipment_equipment_proto_rawDescGZIP(), []int{16} + return file_equipment_equipment_proto_rawDescGZIP(), []int{19} } type ApiBindExpiryRequest struct { @@ -1197,7 +1345,7 @@ type ApiBindExpiryRequest struct { func (x *ApiBindExpiryRequest) Reset() { *x = ApiBindExpiryRequest{} - mi := &file_equipment_equipment_proto_msgTypes[17] + mi := &file_equipment_equipment_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1209,7 +1357,7 @@ func (x *ApiBindExpiryRequest) String() string { func (*ApiBindExpiryRequest) ProtoMessage() {} func (x *ApiBindExpiryRequest) ProtoReflect() protoreflect.Message { - mi := &file_equipment_equipment_proto_msgTypes[17] + mi := &file_equipment_equipment_proto_msgTypes[20] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1222,7 +1370,7 @@ func (x *ApiBindExpiryRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ApiBindExpiryRequest.ProtoReflect.Descriptor instead. func (*ApiBindExpiryRequest) Descriptor() ([]byte, []int) { - return file_equipment_equipment_proto_rawDescGZIP(), []int{17} + return file_equipment_equipment_proto_rawDescGZIP(), []int{20} } func (x *ApiBindExpiryRequest) GetHostCode() string { @@ -1256,7 +1404,7 @@ type ApiBindExpiryGetRequest struct { func (x *ApiBindExpiryGetRequest) Reset() { *x = ApiBindExpiryGetRequest{} - mi := &file_equipment_equipment_proto_msgTypes[18] + mi := &file_equipment_equipment_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1268,7 +1416,7 @@ func (x *ApiBindExpiryGetRequest) String() string { func (*ApiBindExpiryGetRequest) ProtoMessage() {} func (x *ApiBindExpiryGetRequest) ProtoReflect() protoreflect.Message { - mi := &file_equipment_equipment_proto_msgTypes[18] + mi := &file_equipment_equipment_proto_msgTypes[21] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1281,7 +1429,7 @@ func (x *ApiBindExpiryGetRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ApiBindExpiryGetRequest.ProtoReflect.Descriptor instead. func (*ApiBindExpiryGetRequest) Descriptor() ([]byte, []int) { - return file_equipment_equipment_proto_rawDescGZIP(), []int{18} + return file_equipment_equipment_proto_rawDescGZIP(), []int{21} } func (x *ApiBindExpiryGetRequest) GetHostCode() string { @@ -1308,7 +1456,7 @@ type ApiBeansItemsRequest struct { func (x *ApiBeansItemsRequest) Reset() { *x = ApiBeansItemsRequest{} - mi := &file_equipment_equipment_proto_msgTypes[19] + mi := &file_equipment_equipment_proto_msgTypes[22] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1320,7 +1468,7 @@ func (x *ApiBeansItemsRequest) String() string { func (*ApiBeansItemsRequest) ProtoMessage() {} func (x *ApiBeansItemsRequest) ProtoReflect() protoreflect.Message { - mi := &file_equipment_equipment_proto_msgTypes[19] + mi := &file_equipment_equipment_proto_msgTypes[22] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1333,7 +1481,7 @@ func (x *ApiBeansItemsRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ApiBeansItemsRequest.ProtoReflect.Descriptor instead. func (*ApiBeansItemsRequest) Descriptor() ([]byte, []int) { - return file_equipment_equipment_proto_rawDescGZIP(), []int{19} + return file_equipment_equipment_proto_rawDescGZIP(), []int{22} } func (x *ApiBeansItemsRequest) GetPage() int32 { @@ -1360,7 +1508,7 @@ type ApiBeansAddRequest struct { func (x *ApiBeansAddRequest) Reset() { *x = ApiBeansAddRequest{} - mi := &file_equipment_equipment_proto_msgTypes[20] + mi := &file_equipment_equipment_proto_msgTypes[23] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1372,7 +1520,7 @@ func (x *ApiBeansAddRequest) String() string { func (*ApiBeansAddRequest) ProtoMessage() {} func (x *ApiBeansAddRequest) ProtoReflect() protoreflect.Message { - mi := &file_equipment_equipment_proto_msgTypes[20] + mi := &file_equipment_equipment_proto_msgTypes[23] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1385,7 +1533,7 @@ func (x *ApiBeansAddRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ApiBeansAddRequest.ProtoReflect.Descriptor instead. func (*ApiBeansAddRequest) Descriptor() ([]byte, []int) { - return file_equipment_equipment_proto_rawDescGZIP(), []int{20} + return file_equipment_equipment_proto_rawDescGZIP(), []int{23} } func (x *ApiBeansAddRequest) GetImage() string { @@ -1422,7 +1570,7 @@ type ApiMaskAddRequest struct { func (x *ApiMaskAddRequest) Reset() { *x = ApiMaskAddRequest{} - mi := &file_equipment_equipment_proto_msgTypes[21] + mi := &file_equipment_equipment_proto_msgTypes[24] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1434,7 +1582,7 @@ func (x *ApiMaskAddRequest) String() string { func (*ApiMaskAddRequest) ProtoMessage() {} func (x *ApiMaskAddRequest) ProtoReflect() protoreflect.Message { - mi := &file_equipment_equipment_proto_msgTypes[21] + mi := &file_equipment_equipment_proto_msgTypes[24] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1447,7 +1595,7 @@ func (x *ApiMaskAddRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ApiMaskAddRequest.ProtoReflect.Descriptor instead. func (*ApiMaskAddRequest) Descriptor() ([]byte, []int) { - return file_equipment_equipment_proto_rawDescGZIP(), []int{21} + return file_equipment_equipment_proto_rawDescGZIP(), []int{24} } func (x *ApiMaskAddRequest) GetFacialMaskId() string { @@ -1553,7 +1701,7 @@ type ApiMaskUseRequest struct { func (x *ApiMaskUseRequest) Reset() { *x = ApiMaskUseRequest{} - mi := &file_equipment_equipment_proto_msgTypes[22] + mi := &file_equipment_equipment_proto_msgTypes[25] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1565,7 +1713,7 @@ func (x *ApiMaskUseRequest) String() string { func (*ApiMaskUseRequest) ProtoMessage() {} func (x *ApiMaskUseRequest) ProtoReflect() protoreflect.Message { - mi := &file_equipment_equipment_proto_msgTypes[22] + mi := &file_equipment_equipment_proto_msgTypes[25] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1578,7 +1726,7 @@ func (x *ApiMaskUseRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ApiMaskUseRequest.ProtoReflect.Descriptor instead. func (*ApiMaskUseRequest) Descriptor() ([]byte, []int) { - return file_equipment_equipment_proto_rawDescGZIP(), []int{22} + return file_equipment_equipment_proto_rawDescGZIP(), []int{25} } func (x *ApiMaskUseRequest) GetFacialMaskId() string { @@ -1669,7 +1817,7 @@ type ApiMaskUsedItemsRequest struct { func (x *ApiMaskUsedItemsRequest) Reset() { *x = ApiMaskUsedItemsRequest{} - mi := &file_equipment_equipment_proto_msgTypes[23] + mi := &file_equipment_equipment_proto_msgTypes[26] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1681,7 +1829,7 @@ func (x *ApiMaskUsedItemsRequest) String() string { func (*ApiMaskUsedItemsRequest) ProtoMessage() {} func (x *ApiMaskUsedItemsRequest) ProtoReflect() protoreflect.Message { - mi := &file_equipment_equipment_proto_msgTypes[23] + mi := &file_equipment_equipment_proto_msgTypes[26] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1694,7 +1842,7 @@ func (x *ApiMaskUsedItemsRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ApiMaskUsedItemsRequest.ProtoReflect.Descriptor instead. func (*ApiMaskUsedItemsRequest) Descriptor() ([]byte, []int) { - return file_equipment_equipment_proto_rawDescGZIP(), []int{23} + return file_equipment_equipment_proto_rawDescGZIP(), []int{26} } func (x *ApiMaskUsedItemsRequest) GetFacialMaskId() string { @@ -1729,7 +1877,7 @@ type BindExpiryRequest struct { func (x *BindExpiryRequest) Reset() { *x = BindExpiryRequest{} - mi := &file_equipment_equipment_proto_msgTypes[24] + mi := &file_equipment_equipment_proto_msgTypes[27] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1741,7 +1889,7 @@ func (x *BindExpiryRequest) String() string { func (*BindExpiryRequest) ProtoMessage() {} func (x *BindExpiryRequest) ProtoReflect() protoreflect.Message { - mi := &file_equipment_equipment_proto_msgTypes[24] + mi := &file_equipment_equipment_proto_msgTypes[27] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1754,7 +1902,7 @@ func (x *BindExpiryRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use BindExpiryRequest.ProtoReflect.Descriptor instead. func (*BindExpiryRequest) Descriptor() ([]byte, []int) { - return file_equipment_equipment_proto_rawDescGZIP(), []int{24} + return file_equipment_equipment_proto_rawDescGZIP(), []int{27} } func (x *BindExpiryRequest) GetId() int64 { @@ -1788,7 +1936,7 @@ type InternalUserInfoRequest struct { func (x *InternalUserInfoRequest) Reset() { *x = InternalUserInfoRequest{} - mi := &file_equipment_equipment_proto_msgTypes[25] + mi := &file_equipment_equipment_proto_msgTypes[28] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1800,7 +1948,7 @@ func (x *InternalUserInfoRequest) String() string { func (*InternalUserInfoRequest) ProtoMessage() {} func (x *InternalUserInfoRequest) ProtoReflect() protoreflect.Message { - mi := &file_equipment_equipment_proto_msgTypes[25] + mi := &file_equipment_equipment_proto_msgTypes[28] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1813,7 +1961,7 @@ func (x *InternalUserInfoRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use InternalUserInfoRequest.ProtoReflect.Descriptor instead. func (*InternalUserInfoRequest) Descriptor() ([]byte, []int) { - return file_equipment_equipment_proto_rawDescGZIP(), []int{25} + return file_equipment_equipment_proto_rawDescGZIP(), []int{28} } func (x *InternalUserInfoRequest) GetUserId() int64 { @@ -1839,7 +1987,7 @@ type InternalResponse struct { func (x *InternalResponse) Reset() { *x = InternalResponse{} - mi := &file_equipment_equipment_proto_msgTypes[26] + mi := &file_equipment_equipment_proto_msgTypes[29] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1851,7 +1999,7 @@ func (x *InternalResponse) String() string { func (*InternalResponse) ProtoMessage() {} func (x *InternalResponse) ProtoReflect() protoreflect.Message { - mi := &file_equipment_equipment_proto_msgTypes[26] + mi := &file_equipment_equipment_proto_msgTypes[29] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1864,7 +2012,7 @@ func (x *InternalResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use InternalResponse.ProtoReflect.Descriptor instead. func (*InternalResponse) Descriptor() ([]byte, []int) { - return file_equipment_equipment_proto_rawDescGZIP(), []int{26} + return file_equipment_equipment_proto_rawDescGZIP(), []int{29} } func (x *InternalResponse) GetId() int64 { @@ -1885,7 +2033,7 @@ type SetExpiryRequest struct { func (x *SetExpiryRequest) Reset() { *x = SetExpiryRequest{} - mi := &file_equipment_equipment_proto_msgTypes[27] + mi := &file_equipment_equipment_proto_msgTypes[30] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1897,7 +2045,7 @@ func (x *SetExpiryRequest) String() string { func (*SetExpiryRequest) ProtoMessage() {} func (x *SetExpiryRequest) ProtoReflect() protoreflect.Message { - mi := &file_equipment_equipment_proto_msgTypes[27] + mi := &file_equipment_equipment_proto_msgTypes[30] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1910,7 +2058,7 @@ func (x *SetExpiryRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use SetExpiryRequest.ProtoReflect.Descriptor instead. func (*SetExpiryRequest) Descriptor() ([]byte, []int) { - return file_equipment_equipment_proto_rawDescGZIP(), []int{27} + return file_equipment_equipment_proto_rawDescGZIP(), []int{30} } func (x *SetExpiryRequest) GetId() int64 { @@ -1943,7 +2091,7 @@ type UserBindRequest struct { func (x *UserBindRequest) Reset() { *x = UserBindRequest{} - mi := &file_equipment_equipment_proto_msgTypes[28] + mi := &file_equipment_equipment_proto_msgTypes[31] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1955,7 +2103,7 @@ func (x *UserBindRequest) String() string { func (*UserBindRequest) ProtoMessage() {} func (x *UserBindRequest) ProtoReflect() protoreflect.Message { - mi := &file_equipment_equipment_proto_msgTypes[28] + mi := &file_equipment_equipment_proto_msgTypes[31] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1968,7 +2116,7 @@ func (x *UserBindRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use UserBindRequest.ProtoReflect.Descriptor instead. func (*UserBindRequest) Descriptor() ([]byte, []int) { - return file_equipment_equipment_proto_rawDescGZIP(), []int{28} + return file_equipment_equipment_proto_rawDescGZIP(), []int{31} } func (x *UserBindRequest) GetId() int64 { @@ -1988,7 +2136,7 @@ type ApiVersionRequest struct { func (x *ApiVersionRequest) Reset() { *x = ApiVersionRequest{} - mi := &file_equipment_equipment_proto_msgTypes[29] + mi := &file_equipment_equipment_proto_msgTypes[32] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2000,7 +2148,7 @@ func (x *ApiVersionRequest) String() string { func (*ApiVersionRequest) ProtoMessage() {} func (x *ApiVersionRequest) ProtoReflect() protoreflect.Message { - mi := &file_equipment_equipment_proto_msgTypes[29] + mi := &file_equipment_equipment_proto_msgTypes[32] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2013,7 +2161,7 @@ func (x *ApiVersionRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ApiVersionRequest.ProtoReflect.Descriptor instead. func (*ApiVersionRequest) Descriptor() ([]byte, []int) { - return file_equipment_equipment_proto_rawDescGZIP(), []int{29} + return file_equipment_equipment_proto_rawDescGZIP(), []int{32} } func (x *ApiVersionRequest) GetType() int32 { @@ -2119,7 +2267,15 @@ const file_equipment_equipment_proto_rawDesc = "" + "\x12ApiEditNameRequest\x12\x1b\n" + "\thost_code\x18\x01 \x01(\tR\bhostCode\x12#\n" + "\rhost_nickname\x18\x02 \x01(\tR\fhostNickname\x12\x12\n" + - "\x04type\x18\x03 \x01(\x05R\x04type\"C\n" + + "\x04type\x18\x03 \x01(\x05R\x04type\"I\n" + + "\x18AuthorizationBindRequest\x12\x19\n" + + "\bstore_id\x18\x01 \x01(\x03R\astoreId\x12\x12\n" + + "\x04code\x18\x02 \x01(\tR\x04code\"7\n" + + "\x1aAuthorizationCancelRequest\x12\x19\n" + + "\bstore_id\x18\x01 \x01(\x03R\astoreId\"L\n" + + "\x1bAuthorizationControlRequest\x12\x19\n" + + "\bstore_id\x18\x01 \x01(\x03R\astoreId\x12\x12\n" + + "\x04open\x18\x02 \x01(\x05R\x04open\"C\n" + "\x10ApiUnBindRequest\x12\x1b\n" + "\thost_code\x18\x01 \x01(\tR\bhostCode\x12\x12\n" + "\x04type\x18\x02 \x01(\x05R\x04type\"\x0e\n" + @@ -2189,7 +2345,7 @@ const file_equipment_equipment_proto_rawDesc = "" + "\x02id\x18\x01 \x01(\x03R\x02id\"A\n" + "\x11ApiVersionRequest\x12\x12\n" + "\x04type\x18\x01 \x01(\x05R\x04type\x12\x18\n" + - "\aversion\x18\x02 \x01(\tR\aversion2\xd1\x17\n" + + "\aversion\x18\x02 \x01(\tR\aversion2\xcc\x1b\n" + "\tEquipment\x12Y\n" + "\x05Items\x12\x17.equipment.ItemsRequest\x1a\x13.equipment.Response\"\"\x82\xd3\xe4\x93\x02\x1c:\x01*\x12\x17/admin/v3/version/items\x12T\n" + "\x04Info\x12\x14.equipment.IdRequest\x1a\x13.equipment.Response\"!\x82\xd3\xe4\x93\x02\x1b:\x01*\x12\x16/admin/v3/version/info\x12\\\n" + @@ -2223,7 +2379,11 @@ const file_equipment_equipment_proto_rawDesc = "" + "\vApiBindInfo\x12\x1d.equipment.ApiBindInfoRequest\x1a\x13.equipment.Response\"\x1e\x82\xd3\xe4\x93\x02\x18:\x01*\"\x13/api/v3/device/info\x12g\n" + "\rApiBindUpdate\x12\x1f.equipment.ApiBindUpdateRequest\x1a\x13.equipment.Response\" \x82\xd3\xe4\x93\x02\x1a:\x01*\"\x15/api/v3/device/update\x12e\n" + "\fApiCheckMask\x12\x1a.equipment.IdStringRequest\x1a\x13.equipment.Response\"$\x82\xd3\xe4\x93\x02\x1e:\x01*\"\x19/api/v3/device/check/mask\x12f\n" + - "\vApiEditName\x12\x1d.equipment.ApiEditNameRequest\x1a\x13.equipment.Response\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\"\x18/api/v3/device/edit/name\x12I\n" + + "\vApiEditName\x12\x1d.equipment.ApiEditNameRequest\x1a\x13.equipment.Response\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\"\x18/api/v3/device/edit/name\x12{\n" + + "\x11AuthorizationBind\x12#.equipment.AuthorizationBindRequest\x1a\x13.equipment.Response\",\x82\xd3\xe4\x93\x02&:\x01*\"!/api/v3/device/authorization/bind\x12\x81\x01\n" + + "\x13AuthorizationCancel\x12%.equipment.AuthorizationCancelRequest\x1a\x13.equipment.Response\".\x82\xd3\xe4\x93\x02(:\x01*\"#/api/v3/device/authorization/cancel\x12\x84\x01\n" + + "\x14AuthorizationControl\x12&.equipment.AuthorizationControlRequest\x1a\x13.equipment.Response\"/\x82\xd3\xe4\x93\x02):\x01*\"$/api/v3/device/authorization/control\x12q\n" + + "\x12AuthorizationItems\x12\x17.equipment.EmptyRequest\x1a\x13.equipment.Response\"-\x82\xd3\xe4\x93\x02':\x01*\"\"/api/v3/device/authorization/items\x12I\n" + "\x0fInternalBindAdd\x12!.equipment.InternalBindAddRequest\x1a\x13.equipment.Response\x12K\n" + "\x10InternalBindInfo\x12\".equipment.InternalBindInfoRequest\x1a\x13.equipment.Response\x12R\n" + "\x0fInternalUserAdd\x12\".equipment.InternalUserInfoRequest\x1a\x1b.equipment.InternalResponse\x12Y\n" + @@ -2241,38 +2401,41 @@ func file_equipment_equipment_proto_rawDescGZIP() []byte { return file_equipment_equipment_proto_rawDescData } -var file_equipment_equipment_proto_msgTypes = make([]protoimpl.MessageInfo, 30) +var file_equipment_equipment_proto_msgTypes = make([]protoimpl.MessageInfo, 33) var file_equipment_equipment_proto_goTypes = []any{ - (*Response)(nil), // 0: equipment.Response - (*CreateRequest)(nil), // 1: equipment.CreateRequest - (*EditRequest)(nil), // 2: equipment.EditRequest - (*ItemsRequest)(nil), // 3: equipment.ItemsRequest - (*IdRequest)(nil), // 4: equipment.IdRequest - (*IdStringRequest)(nil), // 5: equipment.IdStringRequest - (*StatusRequest)(nil), // 6: equipment.StatusRequest - (*MaskItemsRequest)(nil), // 7: equipment.MaskItemsRequest - (*BeansItemsRequest)(nil), // 8: equipment.BeansItemsRequest - (*ApiBindAddRequest)(nil), // 9: equipment.ApiBindAddRequest - (*InternalBindAddRequest)(nil), // 10: equipment.InternalBindAddRequest - (*InternalBindInfoRequest)(nil), // 11: equipment.InternalBindInfoRequest - (*ApiBindInfoRequest)(nil), // 12: equipment.ApiBindInfoRequest - (*ApiBindUpdateRequest)(nil), // 13: equipment.ApiBindUpdateRequest - (*ApiEditNameRequest)(nil), // 14: equipment.ApiEditNameRequest - (*ApiUnBindRequest)(nil), // 15: equipment.ApiUnBindRequest - (*EmptyRequest)(nil), // 16: equipment.EmptyRequest - (*ApiBindExpiryRequest)(nil), // 17: equipment.ApiBindExpiryRequest - (*ApiBindExpiryGetRequest)(nil), // 18: equipment.ApiBindExpiryGetRequest - (*ApiBeansItemsRequest)(nil), // 19: equipment.ApiBeansItemsRequest - (*ApiBeansAddRequest)(nil), // 20: equipment.ApiBeansAddRequest - (*ApiMaskAddRequest)(nil), // 21: equipment.ApiMaskAddRequest - (*ApiMaskUseRequest)(nil), // 22: equipment.ApiMaskUseRequest - (*ApiMaskUsedItemsRequest)(nil), // 23: equipment.ApiMaskUsedItemsRequest - (*BindExpiryRequest)(nil), // 24: equipment.BindExpiryRequest - (*InternalUserInfoRequest)(nil), // 25: equipment.InternalUserInfoRequest - (*InternalResponse)(nil), // 26: equipment.InternalResponse - (*SetExpiryRequest)(nil), // 27: equipment.SetExpiryRequest - (*UserBindRequest)(nil), // 28: equipment.UserBindRequest - (*ApiVersionRequest)(nil), // 29: equipment.ApiVersionRequest + (*Response)(nil), // 0: equipment.Response + (*CreateRequest)(nil), // 1: equipment.CreateRequest + (*EditRequest)(nil), // 2: equipment.EditRequest + (*ItemsRequest)(nil), // 3: equipment.ItemsRequest + (*IdRequest)(nil), // 4: equipment.IdRequest + (*IdStringRequest)(nil), // 5: equipment.IdStringRequest + (*StatusRequest)(nil), // 6: equipment.StatusRequest + (*MaskItemsRequest)(nil), // 7: equipment.MaskItemsRequest + (*BeansItemsRequest)(nil), // 8: equipment.BeansItemsRequest + (*ApiBindAddRequest)(nil), // 9: equipment.ApiBindAddRequest + (*InternalBindAddRequest)(nil), // 10: equipment.InternalBindAddRequest + (*InternalBindInfoRequest)(nil), // 11: equipment.InternalBindInfoRequest + (*ApiBindInfoRequest)(nil), // 12: equipment.ApiBindInfoRequest + (*ApiBindUpdateRequest)(nil), // 13: equipment.ApiBindUpdateRequest + (*ApiEditNameRequest)(nil), // 14: equipment.ApiEditNameRequest + (*AuthorizationBindRequest)(nil), // 15: equipment.AuthorizationBindRequest + (*AuthorizationCancelRequest)(nil), // 16: equipment.AuthorizationCancelRequest + (*AuthorizationControlRequest)(nil), // 17: equipment.AuthorizationControlRequest + (*ApiUnBindRequest)(nil), // 18: equipment.ApiUnBindRequest + (*EmptyRequest)(nil), // 19: equipment.EmptyRequest + (*ApiBindExpiryRequest)(nil), // 20: equipment.ApiBindExpiryRequest + (*ApiBindExpiryGetRequest)(nil), // 21: equipment.ApiBindExpiryGetRequest + (*ApiBeansItemsRequest)(nil), // 22: equipment.ApiBeansItemsRequest + (*ApiBeansAddRequest)(nil), // 23: equipment.ApiBeansAddRequest + (*ApiMaskAddRequest)(nil), // 24: equipment.ApiMaskAddRequest + (*ApiMaskUseRequest)(nil), // 25: equipment.ApiMaskUseRequest + (*ApiMaskUsedItemsRequest)(nil), // 26: equipment.ApiMaskUsedItemsRequest + (*BindExpiryRequest)(nil), // 27: equipment.BindExpiryRequest + (*InternalUserInfoRequest)(nil), // 28: equipment.InternalUserInfoRequest + (*InternalResponse)(nil), // 29: equipment.InternalResponse + (*SetExpiryRequest)(nil), // 30: equipment.SetExpiryRequest + (*UserBindRequest)(nil), // 31: equipment.UserBindRequest + (*ApiVersionRequest)(nil), // 32: equipment.ApiVersionRequest } var file_equipment_equipment_proto_depIdxs = []int32{ 3, // 0: equipment.Equipment.Items:input_type -> equipment.ItemsRequest @@ -2282,63 +2445,71 @@ var file_equipment_equipment_proto_depIdxs = []int32{ 6, // 4: equipment.Equipment.Status:input_type -> equipment.StatusRequest 7, // 5: equipment.Equipment.MaskItems:input_type -> equipment.MaskItemsRequest 8, // 6: equipment.Equipment.BeansItems:input_type -> equipment.BeansItemsRequest - 24, // 7: equipment.Equipment.BindExpiry:input_type -> equipment.BindExpiryRequest - 28, // 8: equipment.Equipment.UserBind:input_type -> equipment.UserBindRequest - 21, // 9: equipment.Equipment.ApiMaskAdd:input_type -> equipment.ApiMaskAddRequest - 16, // 10: equipment.Equipment.ApiBindItems:input_type -> equipment.EmptyRequest - 15, // 11: equipment.Equipment.ApiUnBind:input_type -> equipment.ApiUnBindRequest + 27, // 7: equipment.Equipment.BindExpiry:input_type -> equipment.BindExpiryRequest + 31, // 8: equipment.Equipment.UserBind:input_type -> equipment.UserBindRequest + 24, // 9: equipment.Equipment.ApiMaskAdd:input_type -> equipment.ApiMaskAddRequest + 19, // 10: equipment.Equipment.ApiBindItems:input_type -> equipment.EmptyRequest + 18, // 11: equipment.Equipment.ApiUnBind:input_type -> equipment.ApiUnBindRequest 9, // 12: equipment.Equipment.ApiBindAdd:input_type -> equipment.ApiBindAddRequest - 17, // 13: equipment.Equipment.ApiBindExpiry:input_type -> equipment.ApiBindExpiryRequest - 18, // 14: equipment.Equipment.ApiBindExpiryGet:input_type -> equipment.ApiBindExpiryGetRequest - 20, // 15: equipment.Equipment.ApiBeansAdd:input_type -> equipment.ApiBeansAddRequest - 16, // 16: equipment.Equipment.ApiBeansLast:input_type -> equipment.EmptyRequest - 19, // 17: equipment.Equipment.ApiBeansItems:input_type -> equipment.ApiBeansItemsRequest - 22, // 18: equipment.Equipment.ApiMaskUse:input_type -> equipment.ApiMaskUseRequest - 23, // 19: equipment.Equipment.ApiMaskUsedItems:input_type -> equipment.ApiMaskUsedItemsRequest - 22, // 20: equipment.Equipment.ApiMaskStoreUse:input_type -> equipment.ApiMaskUseRequest - 23, // 21: equipment.Equipment.ApiMaskStoreUseItems:input_type -> equipment.ApiMaskUsedItemsRequest - 29, // 22: equipment.Equipment.ApiVersion:input_type -> equipment.ApiVersionRequest + 20, // 13: equipment.Equipment.ApiBindExpiry:input_type -> equipment.ApiBindExpiryRequest + 21, // 14: equipment.Equipment.ApiBindExpiryGet:input_type -> equipment.ApiBindExpiryGetRequest + 23, // 15: equipment.Equipment.ApiBeansAdd:input_type -> equipment.ApiBeansAddRequest + 19, // 16: equipment.Equipment.ApiBeansLast:input_type -> equipment.EmptyRequest + 22, // 17: equipment.Equipment.ApiBeansItems:input_type -> equipment.ApiBeansItemsRequest + 25, // 18: equipment.Equipment.ApiMaskUse:input_type -> equipment.ApiMaskUseRequest + 26, // 19: equipment.Equipment.ApiMaskUsedItems:input_type -> equipment.ApiMaskUsedItemsRequest + 25, // 20: equipment.Equipment.ApiMaskStoreUse:input_type -> equipment.ApiMaskUseRequest + 26, // 21: equipment.Equipment.ApiMaskStoreUseItems:input_type -> equipment.ApiMaskUsedItemsRequest + 32, // 22: equipment.Equipment.ApiVersion:input_type -> equipment.ApiVersionRequest 12, // 23: equipment.Equipment.ApiBindInfo:input_type -> equipment.ApiBindInfoRequest 13, // 24: equipment.Equipment.ApiBindUpdate:input_type -> equipment.ApiBindUpdateRequest 5, // 25: equipment.Equipment.ApiCheckMask:input_type -> equipment.IdStringRequest 14, // 26: equipment.Equipment.ApiEditName:input_type -> equipment.ApiEditNameRequest - 10, // 27: equipment.Equipment.InternalBindAdd:input_type -> equipment.InternalBindAddRequest - 11, // 28: equipment.Equipment.InternalBindInfo:input_type -> equipment.InternalBindInfoRequest - 25, // 29: equipment.Equipment.InternalUserAdd:input_type -> equipment.InternalUserInfoRequest - 25, // 30: equipment.Equipment.InternalUserEditNumber:input_type -> equipment.InternalUserInfoRequest - 0, // 31: equipment.Equipment.Items:output_type -> equipment.Response - 0, // 32: equipment.Equipment.Info:output_type -> equipment.Response - 0, // 33: equipment.Equipment.Create:output_type -> equipment.Response - 0, // 34: equipment.Equipment.Edit:output_type -> equipment.Response - 0, // 35: equipment.Equipment.Status:output_type -> equipment.Response - 0, // 36: equipment.Equipment.MaskItems:output_type -> equipment.Response - 0, // 37: equipment.Equipment.BeansItems:output_type -> equipment.Response - 0, // 38: equipment.Equipment.BindExpiry:output_type -> equipment.Response - 0, // 39: equipment.Equipment.UserBind:output_type -> equipment.Response - 0, // 40: equipment.Equipment.ApiMaskAdd:output_type -> equipment.Response - 0, // 41: equipment.Equipment.ApiBindItems:output_type -> equipment.Response - 0, // 42: equipment.Equipment.ApiUnBind:output_type -> equipment.Response - 0, // 43: equipment.Equipment.ApiBindAdd:output_type -> equipment.Response - 0, // 44: equipment.Equipment.ApiBindExpiry:output_type -> equipment.Response - 0, // 45: equipment.Equipment.ApiBindExpiryGet:output_type -> equipment.Response - 0, // 46: equipment.Equipment.ApiBeansAdd:output_type -> equipment.Response - 0, // 47: equipment.Equipment.ApiBeansLast:output_type -> equipment.Response - 0, // 48: equipment.Equipment.ApiBeansItems:output_type -> equipment.Response - 0, // 49: equipment.Equipment.ApiMaskUse:output_type -> equipment.Response - 0, // 50: equipment.Equipment.ApiMaskUsedItems:output_type -> equipment.Response - 0, // 51: equipment.Equipment.ApiMaskStoreUse:output_type -> equipment.Response - 0, // 52: equipment.Equipment.ApiMaskStoreUseItems:output_type -> equipment.Response - 0, // 53: equipment.Equipment.ApiVersion:output_type -> equipment.Response - 0, // 54: equipment.Equipment.ApiBindInfo:output_type -> equipment.Response - 0, // 55: equipment.Equipment.ApiBindUpdate:output_type -> equipment.Response - 0, // 56: equipment.Equipment.ApiCheckMask:output_type -> equipment.Response - 0, // 57: equipment.Equipment.ApiEditName:output_type -> equipment.Response - 0, // 58: equipment.Equipment.InternalBindAdd:output_type -> equipment.Response - 0, // 59: equipment.Equipment.InternalBindInfo:output_type -> equipment.Response - 26, // 60: equipment.Equipment.InternalUserAdd:output_type -> equipment.InternalResponse - 26, // 61: equipment.Equipment.InternalUserEditNumber:output_type -> equipment.InternalResponse - 31, // [31:62] is the sub-list for method output_type - 0, // [0:31] is the sub-list for method input_type + 15, // 27: equipment.Equipment.AuthorizationBind:input_type -> equipment.AuthorizationBindRequest + 16, // 28: equipment.Equipment.AuthorizationCancel:input_type -> equipment.AuthorizationCancelRequest + 17, // 29: equipment.Equipment.AuthorizationControl:input_type -> equipment.AuthorizationControlRequest + 19, // 30: equipment.Equipment.AuthorizationItems:input_type -> equipment.EmptyRequest + 10, // 31: equipment.Equipment.InternalBindAdd:input_type -> equipment.InternalBindAddRequest + 11, // 32: equipment.Equipment.InternalBindInfo:input_type -> equipment.InternalBindInfoRequest + 28, // 33: equipment.Equipment.InternalUserAdd:input_type -> equipment.InternalUserInfoRequest + 28, // 34: equipment.Equipment.InternalUserEditNumber:input_type -> equipment.InternalUserInfoRequest + 0, // 35: equipment.Equipment.Items:output_type -> equipment.Response + 0, // 36: equipment.Equipment.Info:output_type -> equipment.Response + 0, // 37: equipment.Equipment.Create:output_type -> equipment.Response + 0, // 38: equipment.Equipment.Edit:output_type -> equipment.Response + 0, // 39: equipment.Equipment.Status:output_type -> equipment.Response + 0, // 40: equipment.Equipment.MaskItems:output_type -> equipment.Response + 0, // 41: equipment.Equipment.BeansItems:output_type -> equipment.Response + 0, // 42: equipment.Equipment.BindExpiry:output_type -> equipment.Response + 0, // 43: equipment.Equipment.UserBind:output_type -> equipment.Response + 0, // 44: equipment.Equipment.ApiMaskAdd:output_type -> equipment.Response + 0, // 45: equipment.Equipment.ApiBindItems:output_type -> equipment.Response + 0, // 46: equipment.Equipment.ApiUnBind:output_type -> equipment.Response + 0, // 47: equipment.Equipment.ApiBindAdd:output_type -> equipment.Response + 0, // 48: equipment.Equipment.ApiBindExpiry:output_type -> equipment.Response + 0, // 49: equipment.Equipment.ApiBindExpiryGet:output_type -> equipment.Response + 0, // 50: equipment.Equipment.ApiBeansAdd:output_type -> equipment.Response + 0, // 51: equipment.Equipment.ApiBeansLast:output_type -> equipment.Response + 0, // 52: equipment.Equipment.ApiBeansItems:output_type -> equipment.Response + 0, // 53: equipment.Equipment.ApiMaskUse:output_type -> equipment.Response + 0, // 54: equipment.Equipment.ApiMaskUsedItems:output_type -> equipment.Response + 0, // 55: equipment.Equipment.ApiMaskStoreUse:output_type -> equipment.Response + 0, // 56: equipment.Equipment.ApiMaskStoreUseItems:output_type -> equipment.Response + 0, // 57: equipment.Equipment.ApiVersion:output_type -> equipment.Response + 0, // 58: equipment.Equipment.ApiBindInfo:output_type -> equipment.Response + 0, // 59: equipment.Equipment.ApiBindUpdate:output_type -> equipment.Response + 0, // 60: equipment.Equipment.ApiCheckMask:output_type -> equipment.Response + 0, // 61: equipment.Equipment.ApiEditName:output_type -> equipment.Response + 0, // 62: equipment.Equipment.AuthorizationBind:output_type -> equipment.Response + 0, // 63: equipment.Equipment.AuthorizationCancel:output_type -> equipment.Response + 0, // 64: equipment.Equipment.AuthorizationControl:output_type -> equipment.Response + 0, // 65: equipment.Equipment.AuthorizationItems:output_type -> equipment.Response + 0, // 66: equipment.Equipment.InternalBindAdd:output_type -> equipment.Response + 0, // 67: equipment.Equipment.InternalBindInfo:output_type -> equipment.Response + 29, // 68: equipment.Equipment.InternalUserAdd:output_type -> equipment.InternalResponse + 29, // 69: equipment.Equipment.InternalUserEditNumber:output_type -> equipment.InternalResponse + 35, // [35:70] is the sub-list for method output_type + 0, // [0:35] 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 @@ -2355,7 +2526,7 @@ func file_equipment_equipment_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: unsafe.Slice(unsafe.StringData(file_equipment_equipment_proto_rawDesc), len(file_equipment_equipment_proto_rawDesc)), NumEnums: 0, - NumMessages: 30, + NumMessages: 33, NumExtensions: 0, NumServices: 1, }, diff --git a/rpc/equipment/pb/equipment_grpc.pb.go b/rpc/equipment/pb/equipment_grpc.pb.go index 889750c..57ccd19 100644 --- a/rpc/equipment/pb/equipment_grpc.pb.go +++ b/rpc/equipment/pb/equipment_grpc.pb.go @@ -46,6 +46,10 @@ const ( Equipment_ApiBindUpdate_FullMethodName = "/equipment.Equipment/ApiBindUpdate" Equipment_ApiCheckMask_FullMethodName = "/equipment.Equipment/ApiCheckMask" Equipment_ApiEditName_FullMethodName = "/equipment.Equipment/ApiEditName" + Equipment_AuthorizationBind_FullMethodName = "/equipment.Equipment/AuthorizationBind" + Equipment_AuthorizationCancel_FullMethodName = "/equipment.Equipment/AuthorizationCancel" + Equipment_AuthorizationControl_FullMethodName = "/equipment.Equipment/AuthorizationControl" + Equipment_AuthorizationItems_FullMethodName = "/equipment.Equipment/AuthorizationItems" Equipment_InternalBindAdd_FullMethodName = "/equipment.Equipment/InternalBindAdd" Equipment_InternalBindInfo_FullMethodName = "/equipment.Equipment/InternalBindInfo" Equipment_InternalUserAdd_FullMethodName = "/equipment.Equipment/InternalUserAdd" @@ -84,6 +88,14 @@ type EquipmentClient interface { ApiBindUpdate(ctx context.Context, in *ApiBindUpdateRequest, opts ...grpc.CallOption) (*Response, error) ApiCheckMask(ctx context.Context, in *IdStringRequest, opts ...grpc.CallOption) (*Response, error) ApiEditName(ctx context.Context, in *ApiEditNameRequest, opts ...grpc.CallOption) (*Response, error) + // 授权绑定 + AuthorizationBind(ctx context.Context, in *AuthorizationBindRequest, opts ...grpc.CallOption) (*Response, error) + // 解绑授权 + AuthorizationCancel(ctx context.Context, in *AuthorizationCancelRequest, opts ...grpc.CallOption) (*Response, error) + // 更改打开权限开关 + AuthorizationControl(ctx context.Context, in *AuthorizationControlRequest, opts ...grpc.CallOption) (*Response, error) + // 更改打用户端获取授权列表开权限开关 + AuthorizationItems(ctx context.Context, in *EmptyRequest, opts ...grpc.CallOption) (*Response, error) InternalBindAdd(ctx context.Context, in *InternalBindAddRequest, opts ...grpc.CallOption) (*Response, error) InternalBindInfo(ctx context.Context, in *InternalBindInfoRequest, opts ...grpc.CallOption) (*Response, error) // 添加用户信息 @@ -370,6 +382,46 @@ func (c *equipmentClient) ApiEditName(ctx context.Context, in *ApiEditNameReques return out, nil } +func (c *equipmentClient) AuthorizationBind(ctx context.Context, in *AuthorizationBindRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Equipment_AuthorizationBind_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *equipmentClient) AuthorizationCancel(ctx context.Context, in *AuthorizationCancelRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Equipment_AuthorizationCancel_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *equipmentClient) AuthorizationControl(ctx context.Context, in *AuthorizationControlRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Equipment_AuthorizationControl_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *equipmentClient) AuthorizationItems(ctx context.Context, in *EmptyRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Equipment_AuthorizationItems_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *equipmentClient) InternalBindAdd(ctx context.Context, in *InternalBindAddRequest, opts ...grpc.CallOption) (*Response, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(Response) @@ -442,6 +494,14 @@ type EquipmentServer interface { ApiBindUpdate(context.Context, *ApiBindUpdateRequest) (*Response, error) ApiCheckMask(context.Context, *IdStringRequest) (*Response, error) ApiEditName(context.Context, *ApiEditNameRequest) (*Response, error) + // 授权绑定 + AuthorizationBind(context.Context, *AuthorizationBindRequest) (*Response, error) + // 解绑授权 + AuthorizationCancel(context.Context, *AuthorizationCancelRequest) (*Response, error) + // 更改打开权限开关 + AuthorizationControl(context.Context, *AuthorizationControlRequest) (*Response, error) + // 更改打用户端获取授权列表开权限开关 + AuthorizationItems(context.Context, *EmptyRequest) (*Response, error) InternalBindAdd(context.Context, *InternalBindAddRequest) (*Response, error) InternalBindInfo(context.Context, *InternalBindInfoRequest) (*Response, error) // 添加用户信息 @@ -539,6 +599,18 @@ func (UnimplementedEquipmentServer) ApiCheckMask(context.Context, *IdStringReque func (UnimplementedEquipmentServer) ApiEditName(context.Context, *ApiEditNameRequest) (*Response, error) { return nil, status.Error(codes.Unimplemented, "method ApiEditName not implemented") } +func (UnimplementedEquipmentServer) AuthorizationBind(context.Context, *AuthorizationBindRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method AuthorizationBind not implemented") +} +func (UnimplementedEquipmentServer) AuthorizationCancel(context.Context, *AuthorizationCancelRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method AuthorizationCancel not implemented") +} +func (UnimplementedEquipmentServer) AuthorizationControl(context.Context, *AuthorizationControlRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method AuthorizationControl not implemented") +} +func (UnimplementedEquipmentServer) AuthorizationItems(context.Context, *EmptyRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method AuthorizationItems not implemented") +} func (UnimplementedEquipmentServer) InternalBindAdd(context.Context, *InternalBindAddRequest) (*Response, error) { return nil, status.Error(codes.Unimplemented, "method InternalBindAdd not implemented") } @@ -1058,6 +1130,78 @@ func _Equipment_ApiEditName_Handler(srv interface{}, ctx context.Context, dec fu return interceptor(ctx, in, info, handler) } +func _Equipment_AuthorizationBind_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(AuthorizationBindRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(EquipmentServer).AuthorizationBind(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Equipment_AuthorizationBind_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(EquipmentServer).AuthorizationBind(ctx, req.(*AuthorizationBindRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Equipment_AuthorizationCancel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(AuthorizationCancelRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(EquipmentServer).AuthorizationCancel(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Equipment_AuthorizationCancel_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(EquipmentServer).AuthorizationCancel(ctx, req.(*AuthorizationCancelRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Equipment_AuthorizationControl_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(AuthorizationControlRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(EquipmentServer).AuthorizationControl(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Equipment_AuthorizationControl_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(EquipmentServer).AuthorizationControl(ctx, req.(*AuthorizationControlRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Equipment_AuthorizationItems_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(EmptyRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(EquipmentServer).AuthorizationItems(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Equipment_AuthorizationItems_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(EquipmentServer).AuthorizationItems(ctx, req.(*EmptyRequest)) + } + return interceptor(ctx, in, info, handler) +} + func _Equipment_InternalBindAdd_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(InternalBindAddRequest) if err := dec(in); err != nil { @@ -1245,6 +1389,22 @@ var Equipment_ServiceDesc = grpc.ServiceDesc{ MethodName: "ApiEditName", Handler: _Equipment_ApiEditName_Handler, }, + { + MethodName: "AuthorizationBind", + Handler: _Equipment_AuthorizationBind_Handler, + }, + { + MethodName: "AuthorizationCancel", + Handler: _Equipment_AuthorizationCancel_Handler, + }, + { + MethodName: "AuthorizationControl", + Handler: _Equipment_AuthorizationControl_Handler, + }, + { + MethodName: "AuthorizationItems", + Handler: _Equipment_AuthorizationItems_Handler, + }, { MethodName: "InternalBindAdd", Handler: _Equipment_InternalBindAdd_Handler, diff --git a/services/equipment/equipmentclient/equipment.go b/services/equipment/equipmentclient/equipment.go index 24e0a86..2473c8d 100644 --- a/services/equipment/equipmentclient/equipment.go +++ b/services/equipment/equipmentclient/equipment.go @@ -14,36 +14,39 @@ import ( ) type ( - ApiBeansAddRequest = equipment.ApiBeansAddRequest - ApiBeansItemsRequest = equipment.ApiBeansItemsRequest - ApiBindAddRequest = equipment.ApiBindAddRequest - ApiBindExpiryGetRequest = equipment.ApiBindExpiryGetRequest - ApiBindExpiryRequest = equipment.ApiBindExpiryRequest - ApiBindInfoRequest = equipment.ApiBindInfoRequest - ApiBindUpdateRequest = equipment.ApiBindUpdateRequest - ApiEditNameRequest = equipment.ApiEditNameRequest - ApiMaskAddRequest = equipment.ApiMaskAddRequest - ApiMaskUseRequest = equipment.ApiMaskUseRequest - ApiMaskUsedItemsRequest = equipment.ApiMaskUsedItemsRequest - ApiUnBindRequest = equipment.ApiUnBindRequest - ApiVersionRequest = equipment.ApiVersionRequest - BeansItemsRequest = equipment.BeansItemsRequest - BindExpiryRequest = equipment.BindExpiryRequest - CreateRequest = equipment.CreateRequest - EditRequest = equipment.EditRequest - EmptyRequest = equipment.EmptyRequest - IdRequest = equipment.IdRequest - IdStringRequest = equipment.IdStringRequest - InternalBindAddRequest = equipment.InternalBindAddRequest - InternalBindInfoRequest = equipment.InternalBindInfoRequest - InternalResponse = equipment.InternalResponse - InternalUserInfoRequest = equipment.InternalUserInfoRequest - ItemsRequest = equipment.ItemsRequest - MaskItemsRequest = equipment.MaskItemsRequest - Response = equipment.Response - SetExpiryRequest = equipment.SetExpiryRequest - StatusRequest = equipment.StatusRequest - UserBindRequest = equipment.UserBindRequest + ApiBeansAddRequest = equipment.ApiBeansAddRequest + ApiBeansItemsRequest = equipment.ApiBeansItemsRequest + ApiBindAddRequest = equipment.ApiBindAddRequest + ApiBindExpiryGetRequest = equipment.ApiBindExpiryGetRequest + ApiBindExpiryRequest = equipment.ApiBindExpiryRequest + ApiBindInfoRequest = equipment.ApiBindInfoRequest + ApiBindUpdateRequest = equipment.ApiBindUpdateRequest + ApiEditNameRequest = equipment.ApiEditNameRequest + ApiMaskAddRequest = equipment.ApiMaskAddRequest + ApiMaskUseRequest = equipment.ApiMaskUseRequest + ApiMaskUsedItemsRequest = equipment.ApiMaskUsedItemsRequest + ApiUnBindRequest = equipment.ApiUnBindRequest + ApiVersionRequest = equipment.ApiVersionRequest + AuthorizationBindRequest = equipment.AuthorizationBindRequest + AuthorizationCancelRequest = equipment.AuthorizationCancelRequest + AuthorizationControlRequest = equipment.AuthorizationControlRequest + BeansItemsRequest = equipment.BeansItemsRequest + BindExpiryRequest = equipment.BindExpiryRequest + CreateRequest = equipment.CreateRequest + EditRequest = equipment.EditRequest + EmptyRequest = equipment.EmptyRequest + IdRequest = equipment.IdRequest + IdStringRequest = equipment.IdStringRequest + InternalBindAddRequest = equipment.InternalBindAddRequest + InternalBindInfoRequest = equipment.InternalBindInfoRequest + InternalResponse = equipment.InternalResponse + InternalUserInfoRequest = equipment.InternalUserInfoRequest + ItemsRequest = equipment.ItemsRequest + MaskItemsRequest = equipment.MaskItemsRequest + Response = equipment.Response + SetExpiryRequest = equipment.SetExpiryRequest + StatusRequest = equipment.StatusRequest + UserBindRequest = equipment.UserBindRequest Equipment interface { Items(ctx context.Context, in *ItemsRequest, opts ...grpc.CallOption) (*Response, error) @@ -74,6 +77,14 @@ type ( ApiBindUpdate(ctx context.Context, in *ApiBindUpdateRequest, opts ...grpc.CallOption) (*Response, error) ApiCheckMask(ctx context.Context, in *IdStringRequest, opts ...grpc.CallOption) (*Response, error) ApiEditName(ctx context.Context, in *ApiEditNameRequest, opts ...grpc.CallOption) (*Response, error) + // 授权绑定 + AuthorizationBind(ctx context.Context, in *AuthorizationBindRequest, opts ...grpc.CallOption) (*Response, error) + // 解绑授权 + AuthorizationCancel(ctx context.Context, in *AuthorizationCancelRequest, opts ...grpc.CallOption) (*Response, error) + // 更改打开权限开关 + AuthorizationControl(ctx context.Context, in *AuthorizationControlRequest, opts ...grpc.CallOption) (*Response, error) + // 更改打用户端获取授权列表开权限开关 + AuthorizationItems(ctx context.Context, in *EmptyRequest, opts ...grpc.CallOption) (*Response, error) InternalBindAdd(ctx context.Context, in *InternalBindAddRequest, opts ...grpc.CallOption) (*Response, error) InternalBindInfo(ctx context.Context, in *InternalBindInfoRequest, opts ...grpc.CallOption) (*Response, error) // 添加用户信息 @@ -229,6 +240,30 @@ func (m *defaultEquipment) ApiEditName(ctx context.Context, in *ApiEditNameReque return client.ApiEditName(ctx, in, opts...) } +// 授权绑定 +func (m *defaultEquipment) AuthorizationBind(ctx context.Context, in *AuthorizationBindRequest, opts ...grpc.CallOption) (*Response, error) { + client := equipment.NewEquipmentClient(m.cli.Conn()) + return client.AuthorizationBind(ctx, in, opts...) +} + +// 解绑授权 +func (m *defaultEquipment) AuthorizationCancel(ctx context.Context, in *AuthorizationCancelRequest, opts ...grpc.CallOption) (*Response, error) { + client := equipment.NewEquipmentClient(m.cli.Conn()) + return client.AuthorizationCancel(ctx, in, opts...) +} + +// 更改打开权限开关 +func (m *defaultEquipment) AuthorizationControl(ctx context.Context, in *AuthorizationControlRequest, opts ...grpc.CallOption) (*Response, error) { + client := equipment.NewEquipmentClient(m.cli.Conn()) + return client.AuthorizationControl(ctx, in, opts...) +} + +// 更改打用户端获取授权列表开权限开关 +func (m *defaultEquipment) AuthorizationItems(ctx context.Context, in *EmptyRequest, opts ...grpc.CallOption) (*Response, error) { + client := equipment.NewEquipmentClient(m.cli.Conn()) + return client.AuthorizationItems(ctx, in, opts...) +} + func (m *defaultEquipment) InternalBindAdd(ctx context.Context, in *InternalBindAddRequest, opts ...grpc.CallOption) (*Response, error) { client := equipment.NewEquipmentClient(m.cli.Conn()) return client.InternalBindAdd(ctx, in, opts...) diff --git a/services/equipment/internal/dao/authorizationRecord.go b/services/equipment/internal/dao/authorizationRecord.go new file mode 100644 index 0000000..4c00e82 --- /dev/null +++ b/services/equipment/internal/dao/authorizationRecord.go @@ -0,0 +1,37 @@ +package dao + +import ( + "lone-services/pkg/utils" +) + +type AuthorizationRecordInfo struct { + Id int64 `gorm:"column:id;type:int;not null;autoIncrement" json:"id"` + StoreId int64 `gorm:"column:store_id;type:int;not null" json:"store_id"` // 美容院ID + UserId int64 `gorm:"column:user_id;type:int;not null" json:"user_id"` // 用户ID + Datetime utils.CustomTime `gorm:"column:datetime;type:datetime;default:NULL" json:"datetime"` // 绑定时间 + Status int32 `gorm:"column:status;type:tinyint;default:1" json:"status"` // 2未授权 1 已授权 + Open int32 `gorm:"column:open;type:tinyint(1);not null;default:1" json:"open"` // 是否开启展示,1为默认开启,2为关闭 + CreateAt utils.CustomTime `gorm:"column:create_at;type:datetime;default:CURRENT_TIMESTAMP" json:"create_at"` // 创建时间 + +} + +type AuthorizationRecordCreate struct { + Id int64 `gorm:"column:id;type:int;not null;autoIncrement" json:"id"` + StoreId int64 `gorm:"column:store_id;type:int;not null" json:"store_id"` // 美容院ID + UserId int64 `gorm:"column:user_id;type:int;not null" json:"user_id"` // 用户ID + Datetime utils.CustomTime `gorm:"column:datetime;type:datetime;default:NULL" json:"datetime"` // 绑定时间 + Status int32 `gorm:"column:status;type:tinyint;default:1" json:"status"` // 2未授权 1 已授权 + Open int32 `gorm:"column:open;type:tinyint(1);not null;default:1" json:"open"` // 是否开启展示,1为默认开启,2为关闭 +} + +type AuthorizationRecordItems struct { + Id int64 `json:"id"` + StoreId int64 `json:"store_id"` // 美容院ID + Status int32 `json:"status"` // 2未授权 1 已授权 + Open int32 `json:"open"` // 是否开启展示,1为默认开启,2为关闭 + StoreName string `json:"store_name"` + District string `json:"district"` + Address string `json:"address"` + DistrictArr []int64 `json:"district_arr"` + UsageCount int32 `json:"usage_count"` +} diff --git a/services/equipment/internal/dao/codeBind.go b/services/equipment/internal/dao/codeBind.go new file mode 100644 index 0000000..a126bdc --- /dev/null +++ b/services/equipment/internal/dao/codeBind.go @@ -0,0 +1,29 @@ +package dao + +import ( + "lone-services/pkg/utils" +) + +const CodeName = "bind:code:" + +type CodeBindInfo struct { + Id int64 `gorm:"column:id;type:int;not null;autoIncrement" json:"id"` // ID + UserId int64 `gorm:"column:user_id;type:int;default:0" json:"user_id"` // 用户ID + Step int32 `gorm:"column:step;type:tinyint;default:1" json:"step"` // 步骤 + Bluetooth string `gorm:"column:bluetooth;type:char(30);not null;default:''" json:"bluetooth"` // 蓝牙 + Cmos string `gorm:"column:cmos;type:char(30);not null;default:''" json:"cmos"` // 芯片 + Status int32 `gorm:"column:status;type:tinyint(1);default:1" json:"status"` // 装态。1为正常,2为删除 + Type int32 `gorm:"column:type;type:tinyint(1);default:1" json:"type"` // 类型,1为园屏,2为卵型屏 + CreateTime utils.CustomTime `gorm:"column:create_time;type:datetime;default:CURRENT_TIMESTAMP" json:"create_time"` // 添加时间 + UpdateTime utils.CustomTime `gorm:"column:update_time;type:datetime;default:CURRENT_TIMESTAMP;onUpdate:CURRENT_TIMESTAMP" json:"update_time"` // 更新时间 +} + +type CodeBindCreate struct { + Id int64 `gorm:"column:id;type:int;not null;autoIncrement" json:"id"` // ID + UserId int64 `gorm:"column:user_id;type:int;default:0" json:"user_id"` // 用户ID + Step int32 `gorm:"column:step;type:tinyint;default:1" json:"step"` // 步骤 + Bluetooth string `gorm:"column:bluetooth;type:char(30);not null;default:''" json:"bluetooth"` // 蓝牙 + Cmos string `gorm:"column:cmos;type:char(30);not null;default:''" json:"cmos"` // 芯片 + Status int32 `gorm:"column:status;type:tinyint(1);default:1" json:"status"` // 装态。1为正常,2为删除 + Type int32 `gorm:"column:type;type:tinyint(1);default:1" json:"type"` // 类型,1为园屏,2为卵型屏 +} diff --git a/services/equipment/internal/logic/authorizationBindLogic.go b/services/equipment/internal/logic/authorizationBindLogic.go new file mode 100644 index 0000000..9556562 --- /dev/null +++ b/services/equipment/internal/logic/authorizationBindLogic.go @@ -0,0 +1,90 @@ +package logic + +import ( + "context" + "lone-services/pkg/modelbase" + "lone-services/pkg/redis" + "lone-services/pkg/utils" + "lone-services/services/equipment/internal/dao" + "lone-services/services/equipment/internal/model" + "lone-services/services/equipment/validator" + "strconv" + + "lone-services/rpc/equipment/pb" + "lone-services/services/equipment/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" +) + +type AuthorizationBindLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger + BaseLogic +} + +func NewAuthorizationBindLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AuthorizationBindLogic { + return &AuthorizationBindLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *AuthorizationBindLogic) AuthorizationBind(in *equipment.AuthorizationBindRequest) (*equipment.Response, error) { + var v validator.CodeBindValidator + 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) + } + + key := dao.CodeName + strconv.FormatInt(in.StoreId, utils.NumberTen) + + redisCode, err := redis.Client.Get(l.ctx, key).Result() + if err != nil { + l.Logger.Error(err) + return l.out(utils.Fail, "获取Code失败") + } + if redisCode != in.Code { + return l.out(utils.Fail, "Code不匹配") + } + + w := modelbase.Params{Eq: map[string]string{ + "store_id": strconv.Itoa(int(in.StoreId)), "user_id": strconv.Itoa(int(adminInfo.ID))}} + var info dao.AuthorizationRecordCreate + err = model.AuthorizationRecordModel{}.Init().GetOne(w, &info) + if err != nil { + l.Logger.Error(err) + return l.fail(utils.Fail) + } + + if info.Id > utils.NumberZero { + info.Status = utils.StatusOk + info.Datetime = utils.Now() + _, err = model.AuthorizationRecordModel{}.Init().Edit(w, &info) + if err != nil { + l.Logger.Error(err) + return l.fail(utils.Fail) + } + } else { + info.StoreId = in.StoreId + info.UserId = adminInfo.ID + err = model.AuthorizationRecordModel{}.Init().Create(&info) + if err != nil { + l.Logger.Error(err) + return l.fail(utils.Fail) + } + } + + _, err = redis.Client.Del(l.ctx, key).Result() + if err != nil { + l.Logger.Error(err) + return l.fail(utils.Fail) + } + + return l.ok(utils.Ok) +} diff --git a/services/equipment/internal/logic/authorizationCancelLogic.go b/services/equipment/internal/logic/authorizationCancelLogic.go new file mode 100644 index 0000000..4f05bd7 --- /dev/null +++ b/services/equipment/internal/logic/authorizationCancelLogic.go @@ -0,0 +1,65 @@ +package logic + +import ( + "context" + "lone-services/pkg/modelbase" + "lone-services/pkg/utils" + "lone-services/services/equipment/internal/dao" + "lone-services/services/equipment/internal/model" + "lone-services/services/equipment/validator" + "strconv" + + "lone-services/rpc/equipment/pb" + "lone-services/services/equipment/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" +) + +type AuthorizationCancelLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger + BaseLogic +} + +func NewAuthorizationCancelLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AuthorizationCancelLogic { + return &AuthorizationCancelLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +// AuthorizationCancel 解绑绑定 +func (l *AuthorizationCancelLogic) AuthorizationCancel(in *equipment.AuthorizationCancelRequest) (*equipment.Response, error) { + var v validator.CancelBindValidator + 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) + } + + w := modelbase.Params{Eq: map[string]string{ + "store_id": strconv.Itoa(int(in.StoreId)), "user_id": strconv.Itoa(int(adminInfo.ID))}} + var info dao.AuthorizationRecordCreate + err := model.AuthorizationRecordModel{}.Init().GetOne(w, &info) + if err != nil { + l.Logger.Error(err) + return l.fail(utils.Fail) + } + if info.Id < utils.NumberOne { + return l.fail(utils.ErrorNotFund) + } + + info.Status = utils.StatusFail + _, err = model.AuthorizationRecordModel{}.Init().Edit(w, &info) + if err != nil { + l.Logger.Error(err) + return l.fail(utils.Fail) + } + + return l.ok(utils.NumberOne) +} diff --git a/services/equipment/internal/logic/authorizationControlLogic.go b/services/equipment/internal/logic/authorizationControlLogic.go new file mode 100644 index 0000000..8e760d5 --- /dev/null +++ b/services/equipment/internal/logic/authorizationControlLogic.go @@ -0,0 +1,66 @@ +package logic + +import ( + "context" + "lone-services/pkg/modelbase" + "lone-services/pkg/utils" + "lone-services/services/equipment/internal/dao" + "lone-services/services/equipment/internal/model" + "lone-services/services/equipment/validator" + "strconv" + + "lone-services/rpc/equipment/pb" + "lone-services/services/equipment/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" +) + +type AuthorizationControlLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger + BaseLogic +} + +func NewAuthorizationControlLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AuthorizationControlLogic { + return &AuthorizationControlLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +// 更改打开权限开关 +func (l *AuthorizationControlLogic) AuthorizationControl(in *equipment.AuthorizationControlRequest) (*equipment.Response, error) { + var v validator.ControlBindValidator + 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) + } + + w := modelbase.Params{Eq: map[string]string{ + "store_id": strconv.Itoa(int(in.StoreId)), "user_id": strconv.Itoa(int(adminInfo.ID))}} + var info dao.AuthorizationRecordCreate + err := model.AuthorizationRecordModel{}.Init().GetOne(w, &info) + if err != nil { + l.Logger.Error(err) + return l.fail(utils.Fail) + } + if info.Id < utils.NumberOne { + return l.fail(utils.ErrorNotFund) + } + + info.Open = in.Open + + _, err = model.AuthorizationRecordModel{}.Init().Edit(w, &info) + if err != nil { + l.Logger.Error(err) + return l.fail(utils.Fail) + } + + return l.ok(utils.NumberOne) +} diff --git a/services/equipment/internal/logic/authorizationItemsLogic.go b/services/equipment/internal/logic/authorizationItemsLogic.go new file mode 100644 index 0000000..2c059f5 --- /dev/null +++ b/services/equipment/internal/logic/authorizationItemsLogic.go @@ -0,0 +1,102 @@ +package logic + +import ( + "context" + "lone-services/pkg/modelbase" + "lone-services/pkg/utils" + "lone-services/services/equipment/internal/dao" + "lone-services/services/equipment/internal/model" + "strconv" + + "lone-services/rpc/equipment/pb" + "lone-services/services/equipment/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" +) + +type AuthorizationItemsLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger + BaseLogic +} + +func NewAuthorizationItemsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AuthorizationItemsLogic { + return &AuthorizationItemsLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +// AuthorizationItems 用户端获取授权列表 +func (l *AuthorizationItemsLogic) AuthorizationItems(in *equipment.EmptyRequest) (*equipment.Response, error) { + adminInfo := utils.GetUserFromCtx(l.ctx) + if adminInfo.ID < utils.NumberOne { + return l.fail(utils.ErrorNoLoginInfo) + } + + w := modelbase.Params{Eq: map[string]string{ + "user_id": strconv.Itoa(int(adminInfo.ID))}} + var info []dao.AuthorizationRecordInfo + err := model.AuthorizationRecordModel{}.Init().Items(w, &info) + if err != nil { + l.Logger.Error(err) + return l.fail(utils.Fail) + } + + ids := make(map[int64]int64) + for _, v := range info { + ids[v.StoreId] = v.StoreId + } + + var items []dao.AuthorizationRecordItems + if len(ids) < utils.NumberOne { + return l.ok(items) + } + idsSlice := make([]int64, 0, len(ids)) + for k := range ids { + idsSlice = append(idsSlice, k) + } + + storeItems := svc.GetStores(idsSlice, l.svcCtx.StoreSvcName) + storeIdItems := make(map[int64]dao.AuthorizationRecordItems) + for _, val := range storeItems { + arr := utils.StrToStrArr(val.DistrictIds, utils.DecollatorComma) + districtIds := []int64{} + for _, arrItem := range arr { + num, _ := strconv.Atoi(arrItem) + districtIds = append(districtIds, int64(num)) + } + + ww := modelbase.Params{Eq: map[string]string{ + "store_id": strconv.Itoa(int(val.Id)), + "user_id": strconv.Itoa(int(adminInfo.ID))}} + storeNumber, err := model.AuthorizationRecordModel{}.Init().CountNumber(ww) + if err != nil { + l.Logger.Error(err) + } + + storeIdItems[val.Id] = dao.AuthorizationRecordItems{ + Address: val.Address, + StoreName: val.Name, + District: val.ProvinceName + val.CityName + val.CountyName, + DistrictArr: districtIds, + UsageCount: int32(storeNumber), + } + } + + for _, v := range info { + item, ok := storeIdItems[v.StoreId] + if !ok { + continue + } + item.Id = v.Id + item.Open = v.Open + item.Status = v.Status + item.StoreId = v.StoreId + items = append(items, item) + } + + return l.ok(items) +} diff --git a/services/equipment/internal/model/authorizationRecord.go b/services/equipment/internal/model/authorizationRecord.go new file mode 100644 index 0000000..c752fa3 --- /dev/null +++ b/services/equipment/internal/model/authorizationRecord.go @@ -0,0 +1,23 @@ +package model + +import ( + "lone-services/pkg/modelbase" + "lone-services/services/equipment/internal/dao" +) + +type AuthorizationRecordModel struct { + modelbase.Base +} + +func (m AuthorizationRecordModel) TableName() string { + return modelbase.Prefix() + "authorization_record" +} + +func (m AuthorizationRecordModel) Init() AuthorizationRecordModel { + m.Table = m.TableName() + return m +} + +func (m AuthorizationRecordModel) Create(data *dao.AuthorizationRecordCreate) error { + return m.Base.Create(data) +} diff --git a/services/equipment/internal/model/codeBind.go b/services/equipment/internal/model/codeBind.go new file mode 100644 index 0000000..791c73d --- /dev/null +++ b/services/equipment/internal/model/codeBind.go @@ -0,0 +1,23 @@ +package model + +import ( + "lone-services/pkg/modelbase" + "lone-services/services/equipment/internal/dao" +) + +type CodeBindModel struct { + modelbase.Base +} + +func (m CodeBindModel) TableName() string { + return modelbase.Prefix() + "code_bind" +} + +func (m CodeBindModel) Init() CodeBindModel { + m.Table = m.TableName() + return m +} + +func (m CodeBindModel) Create(data *dao.CodeBindCreate) error { + return m.Base.Create(data) +} diff --git a/services/equipment/internal/server/equipmentServer.go b/services/equipment/internal/server/equipmentServer.go index 2e7a2c3..728fd27 100644 --- a/services/equipment/internal/server/equipmentServer.go +++ b/services/equipment/internal/server/equipmentServer.go @@ -159,6 +159,30 @@ func (s *EquipmentServer) ApiEditName(ctx context.Context, in *equipment.ApiEdit return l.ApiEditName(in) } +// 授权绑定 +func (s *EquipmentServer) AuthorizationBind(ctx context.Context, in *equipment.AuthorizationBindRequest) (*equipment.Response, error) { + l := logic.NewAuthorizationBindLogic(ctx, s.svcCtx) + return l.AuthorizationBind(in) +} + +// 解绑授权 +func (s *EquipmentServer) AuthorizationCancel(ctx context.Context, in *equipment.AuthorizationCancelRequest) (*equipment.Response, error) { + l := logic.NewAuthorizationCancelLogic(ctx, s.svcCtx) + return l.AuthorizationCancel(in) +} + +// 更改打开权限开关 +func (s *EquipmentServer) AuthorizationControl(ctx context.Context, in *equipment.AuthorizationControlRequest) (*equipment.Response, error) { + l := logic.NewAuthorizationControlLogic(ctx, s.svcCtx) + return l.AuthorizationControl(in) +} + +// 更改打用户端获取授权列表开权限开关 +func (s *EquipmentServer) AuthorizationItems(ctx context.Context, in *equipment.EmptyRequest) (*equipment.Response, error) { + l := logic.NewAuthorizationItemsLogic(ctx, s.svcCtx) + return l.AuthorizationItems(in) +} + func (s *EquipmentServer) InternalBindAdd(ctx context.Context, in *equipment.InternalBindAddRequest) (*equipment.Response, error) { l := logic.NewInternalBindAddLogic(ctx, s.svcCtx) return l.InternalBindAdd(in) diff --git a/services/equipment/internal/svc/grpcService.go b/services/equipment/internal/svc/grpcService.go index 1e1f32f..c1e9db2 100644 --- a/services/equipment/internal/svc/grpcService.go +++ b/services/equipment/internal/svc/grpcService.go @@ -48,3 +48,20 @@ func GetStore(id int64, name string) dao.StoreInfo { return storeInfo } + +func GetStores(ids []int64, name string) []*store.InfoResponse { + cli, err := GetRpcClient(name) + if err != nil { + logx.Error(err) + return nil + } + + client := store.NewStoreClient(cli.Conn()) + items, err := client.GetInfoByIds(context.Background(), &store.IdsRequest{Ids: ids}) + if err != nil { + logx.Errorf("get store err: %v", err) + return nil + } + + return items.Items +} diff --git a/services/equipment/validator/codeBind.go b/services/equipment/validator/codeBind.go new file mode 100644 index 0000000..142dbbd --- /dev/null +++ b/services/equipment/validator/codeBind.go @@ -0,0 +1,41 @@ +package validator + +import "lone-services/pkg/validate" + +type CodeBindValidator struct { + Code string `form:"code" json:"code" validate:"required"` + StoreId int64 `form:"store_id" json:"store_id" validate:"required"` +} + +// GetMessage 提示消息 +func (p CodeBindValidator) GetMessage() validate.ValidatorMessages { + return validate.ValidatorMessages{ + "Code.required": "验证码不能为空", + "StoreId.required": "门店ID不能为空", + } +} + +type CancelBindValidator struct { + StoreId int64 `form:"store_id" json:"store_id" validate:"required"` +} + +// GetMessage 提示消息 +func (p CancelBindValidator) GetMessage() validate.ValidatorMessages { + return validate.ValidatorMessages{ + "StoreId.required": "门店ID不能为空", + } +} + +type ControlBindValidator struct { + StoreId int64 `form:"store_id" json:"store_id" validate:"required"` + Open int32 `form:"open" json:"open" validate:"required,oneof:1 2"` +} + +// GetMessage 提示消息 +func (p ControlBindValidator) GetMessage() validate.ValidatorMessages { + return validate.ValidatorMessages{ + "StoreId.required": "门店ID不能为空", + "Open.required": "开启展示不能为空", + "Open.oneof": "开启展示只能是1或2", + } +} diff --git a/services/equipment/validator/usageRecords.go b/services/equipment/validator/usageRecords.go new file mode 100644 index 0000000..88c5486 --- /dev/null +++ b/services/equipment/validator/usageRecords.go @@ -0,0 +1,23 @@ +package validator + +import "lone-services/pkg/validate" + +type UsageRecordsValidator struct { + Id int64 `form:"id" json:"id" validate:"required"` + HostCode string `form:"host_code" json:"host_code" validate:"required"` + ImportMode int32 `form:"import_mode" json:"import_mode"` + PoreFormingStrength int32 `form:"pore_forming_strength" json:"pore_forming_strength"` + ImportStrength int32 `form:"import_strength" json:"import_strength"` + FacialMaskId string `form:"facial_mask_id" json:"facial_mask_id"` + Ts int32 `form:"t_s" json:"t_s"` + Rs int32 `form:"r_s" json:"r_s"` + Ls int32 `form:"l_s" json:"l_s"` +} + +// GetMessage 提示消息 +func (p UsageRecordsValidator) GetMessage() validate.ValidatorMessages { + return validate.ValidatorMessages{ + "Id.required": "ID不能为空", + "HostCode.required": "设备编码不能为空", + } +}