diff --git a/jdcloud_sdk/services/iotcore/ChangeLog.md b/jdcloud_sdk/services/iotcore/ChangeLog.md index 68748edf..1136f2d2 100644 --- a/jdcloud_sdk/services/iotcore/ChangeLog.md +++ b/jdcloud_sdk/services/iotcore/ChangeLog.md @@ -1,8 +1,10 @@ # 更新历史 # -API版本:1.1.21 +API版本:1.1.24 |发布时间|版本号|更新|说明| -|---|---|---|---| +|---|---|---|--- +|2020-07-02 |1.1.24 |设备检索增加标签支持 | *设备检索增加标签支持 +|2020-06-23 |1.1.22 |增加设备离线记录接口 | *增加设备离线记录接口发布 |2020-06-15 |1.1.21 |增加设备统计接口 | *设备统计接口发布 |2020-06-11 |1.1.20 |增加设备接口 | *设备更新接口发布 |2020-05-28 |1.1.19 |增加朗锐接口 | *(0x03)读保持寄存器 diff --git a/jdcloud_sdk/services/iotcore/apis/AddLooDeviceRequest.py b/jdcloud_sdk/services/iotcore/apis/AddLooDeviceRequest.py index 715388a2..687dc3b6 100644 --- a/jdcloud_sdk/services/iotcore/apis/AddLooDeviceRequest.py +++ b/jdcloud_sdk/services/iotcore/apis/AddLooDeviceRequest.py @@ -32,13 +32,12 @@ def __init__(self, parameters, header=None, version="v2"): class AddLooDeviceParameters(object): - def __init__(self, instanceId, regionId, preOrderId, userPinParam, deviceType): + def __init__(self, instanceId, regionId, preOrderId, userPinParam, ): """ :param instanceId: 设备归属的实例ID :param regionId: 设备归属的实例所在区域 :param preOrderId: 申请单编号 :param userPinParam: 用户Pin - :param deviceType: 设备类型 """ self.instanceId = instanceId @@ -51,7 +50,6 @@ def __init__(self, instanceId, regionId, preOrderId, userPinParam, deviceType): self.manufacturer = None self.identifier = None self.description = None - self.deviceType = deviceType def setDeviceName(self, deviceName): """ diff --git a/jdcloud_sdk/services/iotcore/apis/CreateAdminProductRequest.py b/jdcloud_sdk/services/iotcore/apis/CreateAdminProductRequest.py index d91ae671..3014815d 100644 --- a/jdcloud_sdk/services/iotcore/apis/CreateAdminProductRequest.py +++ b/jdcloud_sdk/services/iotcore/apis/CreateAdminProductRequest.py @@ -32,7 +32,7 @@ def __init__(self, parameters, header=None, version="v2"): class CreateAdminProductParameters(object): - def __init__(self, regionId, instanceId, productName, productType, ): + def __init__(self, regionId, instanceId, productName, productType, collDeviceType): """ :param regionId: 地域ID :param instanceId: IoT Engine实例ID信息 @@ -41,6 +41,7 @@ def __init__(self, regionId, instanceId, productName, productType, ): 0:设备。设备不能挂载子设备。可以直连物联网平台,也可以作为网关的子设备连接物联网平台 1:网关。网关可以挂载子设备,具有子设备管理模块,维持子设备的拓扑关系,和将拓扑关系同步到物联网平台 + :param collDeviceType: 产品名下所有设备的采集器类型 """ self.regionId = regionId @@ -50,6 +51,7 @@ def __init__(self, regionId, instanceId, productName, productType, ): self.productDescription = None self.templateId = None self.internalTags = None + self.collDeviceType = collDeviceType def setProductDescription(self, productDescription): """ diff --git a/jdcloud_sdk/services/iotcore/apis/CreateDeviceTopoRequest.py b/jdcloud_sdk/services/iotcore/apis/CreateDeviceTopoRequest.py new file mode 100644 index 00000000..f213c5bc --- /dev/null +++ b/jdcloud_sdk/services/iotcore/apis/CreateDeviceTopoRequest.py @@ -0,0 +1,45 @@ +# coding=utf8 + +# Copyright 2018 JDCLOUD.COM +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# NOTE: This class is auto generated by the jdcloud code generator program. + +from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest + + +class CreateDeviceTopoRequest(JDCloudRequest): + """ + 边缘代理设备与非直连设备拓扑关系创建接口 + """ + + def __init__(self, parameters, header=None, version="v2"): + super(CreateDeviceTopoRequest, self).__init__( + '/regions/{regionId}/coreinstances/{instanceId}/deviceTopo:create', 'POST', header, version) + self.parameters = parameters + + +class CreateDeviceTopoParameters(object): + + def __init__(self, regionId, instanceId, deviceTopoInfoVO): + """ + :param regionId: 区域id + :param instanceId: 实例Id + :param deviceTopoInfoVO: 方法查询请求 + """ + + self.regionId = regionId + self.instanceId = instanceId + self.deviceTopoInfoVO = deviceTopoInfoVO + diff --git a/jdcloud_sdk/services/iotcore/apis/DeleteDeviceTopoRequest.py b/jdcloud_sdk/services/iotcore/apis/DeleteDeviceTopoRequest.py new file mode 100644 index 00000000..e8a7441d --- /dev/null +++ b/jdcloud_sdk/services/iotcore/apis/DeleteDeviceTopoRequest.py @@ -0,0 +1,45 @@ +# coding=utf8 + +# Copyright 2018 JDCLOUD.COM +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# NOTE: This class is auto generated by the jdcloud code generator program. + +from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest + + +class DeleteDeviceTopoRequest(JDCloudRequest): + """ + 边缘代理设备与非直连设备拓扑关系删除接口 + """ + + def __init__(self, parameters, header=None, version="v2"): + super(DeleteDeviceTopoRequest, self).__init__( + '/regions/{regionId}/coreinstances/{instanceId}/deviceTopo:delete', 'POST', header, version) + self.parameters = parameters + + +class DeleteDeviceTopoParameters(object): + + def __init__(self, regionId, instanceId, deviceTopoInfoVO): + """ + :param regionId: 区域id + :param instanceId: 实例Id + :param deviceTopoInfoVO: 方法查询请求 + """ + + self.regionId = regionId + self.instanceId = instanceId + self.deviceTopoInfoVO = deviceTopoInfoVO + diff --git a/jdcloud_sdk/services/iotcore/apis/DeviceQueryRequest.py b/jdcloud_sdk/services/iotcore/apis/DescribeDeviceRequest.py similarity index 87% rename from jdcloud_sdk/services/iotcore/apis/DeviceQueryRequest.py rename to jdcloud_sdk/services/iotcore/apis/DescribeDeviceRequest.py index 87202aee..34869b21 100644 --- a/jdcloud_sdk/services/iotcore/apis/DeviceQueryRequest.py +++ b/jdcloud_sdk/services/iotcore/apis/DescribeDeviceRequest.py @@ -19,18 +19,18 @@ from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest -class DeviceQueryRequest(JDCloudRequest): +class DescribeDeviceRequest(JDCloudRequest): """ 查询单个设备详细信息 """ def __init__(self, parameters, header=None, version="v2"): - super(DeviceQueryRequest, self).__init__( - '/regions/{regionId}/coreinstances/{instanceId}/device:query', 'GET', header, version) + super(DescribeDeviceRequest, self).__init__( + '/regions/{regionId}/coreinstances/{instanceId}/device:describe', 'GET', header, version) self.parameters = parameters -class DeviceQueryParameters(object): +class DescribeDeviceParameters(object): def __init__(self, regionId, instanceId, deviceId): """ diff --git a/jdcloud_sdk/services/iotcore/apis/DescribeDeviceTopoRequest.py b/jdcloud_sdk/services/iotcore/apis/DescribeDeviceTopoRequest.py new file mode 100644 index 00000000..30506b03 --- /dev/null +++ b/jdcloud_sdk/services/iotcore/apis/DescribeDeviceTopoRequest.py @@ -0,0 +1,45 @@ +# coding=utf8 + +# Copyright 2018 JDCLOUD.COM +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# NOTE: This class is auto generated by the jdcloud code generator program. + +from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest + + +class DescribeDeviceTopoRequest(JDCloudRequest): + """ + 边缘代理设备与非直连设备拓扑关系查询接口 + """ + + def __init__(self, parameters, header=None, version="v2"): + super(DescribeDeviceTopoRequest, self).__init__( + '/regions/{regionId}/coreinstances/{instanceId}/deviceTopo:describe', 'POST', header, version) + self.parameters = parameters + + +class DescribeDeviceTopoParameters(object): + + def __init__(self, regionId, instanceId, deviceTopoPageBO): + """ + :param regionId: 区域id + :param instanceId: 实例Id + :param deviceTopoPageBO: 方法查询请求 + """ + + self.regionId = regionId + self.instanceId = instanceId + self.deviceTopoPageBO = deviceTopoPageBO + diff --git a/jdcloud_sdk/services/iotcore/apis/EventListRequest.py b/jdcloud_sdk/services/iotcore/apis/DescribeEventListRequest.py similarity index 89% rename from jdcloud_sdk/services/iotcore/apis/EventListRequest.py rename to jdcloud_sdk/services/iotcore/apis/DescribeEventListRequest.py index b4a978a0..ecd94a2a 100644 --- a/jdcloud_sdk/services/iotcore/apis/EventListRequest.py +++ b/jdcloud_sdk/services/iotcore/apis/DescribeEventListRequest.py @@ -19,18 +19,18 @@ from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest -class EventListRequest(JDCloudRequest): +class DescribeEventListRequest(JDCloudRequest): """ 设备事件查询 """ def __init__(self, parameters, header=None, version="v2"): - super(EventListRequest, self).__init__( + super(DescribeEventListRequest, self).__init__( '/regions/{regionId}/coreinstances/{instanceId}/event:list', 'POST', header, version) self.parameters = parameters -class EventListParameters(object): +class DescribeEventListParameters(object): def __init__(self, regionId, instanceId, eventReportPageBo): """ diff --git a/jdcloud_sdk/services/iotcore/apis/FunctionListRequest.py b/jdcloud_sdk/services/iotcore/apis/DescribeFunctionListRequest.py similarity index 89% rename from jdcloud_sdk/services/iotcore/apis/FunctionListRequest.py rename to jdcloud_sdk/services/iotcore/apis/DescribeFunctionListRequest.py index f91a3ae3..1b968909 100644 --- a/jdcloud_sdk/services/iotcore/apis/FunctionListRequest.py +++ b/jdcloud_sdk/services/iotcore/apis/DescribeFunctionListRequest.py @@ -19,18 +19,18 @@ from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest -class FunctionListRequest(JDCloudRequest): +class DescribeFunctionListRequest(JDCloudRequest): """ 查询方法调用列表信息 """ def __init__(self, parameters, header=None, version="v2"): - super(FunctionListRequest, self).__init__( + super(DescribeFunctionListRequest, self).__init__( '/regions/{regionId}/coreinstances/{instanceId}/function:list', 'POST', header, version) self.parameters = parameters -class FunctionListParameters(object): +class DescribeFunctionListParameters(object): def __init__(self, regionId, instanceId, functionCallPageBo): """ diff --git a/jdcloud_sdk/services/iotcore/apis/PropertyAcquireRequest.py b/jdcloud_sdk/services/iotcore/apis/DescribePropertyRequest.py similarity index 86% rename from jdcloud_sdk/services/iotcore/apis/PropertyAcquireRequest.py rename to jdcloud_sdk/services/iotcore/apis/DescribePropertyRequest.py index 7decc7dc..b40a2421 100644 --- a/jdcloud_sdk/services/iotcore/apis/PropertyAcquireRequest.py +++ b/jdcloud_sdk/services/iotcore/apis/DescribePropertyRequest.py @@ -19,18 +19,18 @@ from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest -class PropertyAcquireRequest(JDCloudRequest): +class DescribePropertyRequest(JDCloudRequest): """ 查询属性接口 """ def __init__(self, parameters, header=None, version="v2"): - super(PropertyAcquireRequest, self).__init__( - '/regions/{regionId}/coreinstances/{instanceId}/property:acquire', 'GET', header, version) + super(DescribePropertyRequest, self).__init__( + '/regions/{regionId}/coreinstances/{instanceId}/property:describe', 'GET', header, version) self.parameters = parameters -class PropertyAcquireParameters(object): +class DescribePropertyParameters(object): def __init__(self, regionId, instanceId, deviceId): """ diff --git a/jdcloud_sdk/services/iotcore/apis/GetPropertySnapshotRequest.py b/jdcloud_sdk/services/iotcore/apis/DescribePropertySnapshotRequest.py similarity index 85% rename from jdcloud_sdk/services/iotcore/apis/GetPropertySnapshotRequest.py rename to jdcloud_sdk/services/iotcore/apis/DescribePropertySnapshotRequest.py index fb842dc1..9d6fc9ea 100644 --- a/jdcloud_sdk/services/iotcore/apis/GetPropertySnapshotRequest.py +++ b/jdcloud_sdk/services/iotcore/apis/DescribePropertySnapshotRequest.py @@ -19,18 +19,18 @@ from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest -class GetPropertySnapshotRequest(JDCloudRequest): +class DescribePropertySnapshotRequest(JDCloudRequest): """ 属性获取接口 """ def __init__(self, parameters, header=None, version="v2"): - super(GetPropertySnapshotRequest, self).__init__( - '/regions/{regionId}/coreinstances/{instanceId}/property:getSnapshot', 'POST', header, version) + super(DescribePropertySnapshotRequest, self).__init__( + '/regions/{regionId}/coreinstances/{instanceId}/property:describeSnapshot', 'POST', header, version) self.parameters = parameters -class GetPropertySnapshotParameters(object): +class DescribePropertySnapshotParameters(object): def __init__(self, regionId, instanceId, deviceSnapshotRequestVO): """ diff --git a/jdcloud_sdk/services/iotcore/apis/DescribeThingModelRequest.py b/jdcloud_sdk/services/iotcore/apis/DescribeThingModelRequest.py index 91a07d49..ad13a6e1 100644 --- a/jdcloud_sdk/services/iotcore/apis/DescribeThingModelRequest.py +++ b/jdcloud_sdk/services/iotcore/apis/DescribeThingModelRequest.py @@ -21,27 +21,27 @@ class DescribeThingModelRequest(JDCloudRequest): """ - 根据模型ID查看物模型完整信息 + 根据物类型Code查看物模型完整信息 """ def __init__(self, parameters, header=None, version="v2"): super(DescribeThingModelRequest, self).__init__( - '/regions/{regionId}/coreinstances/{instanceId}/thingModel:describeThingModel', 'GET', header, version) + '/regions/{regionId}/coreinstances/{instanceId}/thingModel:describe', 'GET', header, version) self.parameters = parameters class DescribeThingModelParameters(object): - def __init__(self, regionId, instanceId, thingModelId, ): + def __init__(self, regionId, instanceId, thingTypeCode, ): """ :param regionId: 区域id :param instanceId: 实例Id - :param thingModelId: 物模型ID编号 + :param thingTypeCode: 物类型Code """ self.regionId = regionId self.instanceId = instanceId - self.thingModelId = thingModelId + self.thingTypeCode = thingTypeCode self.thingModelVersion = None def setThingModelVersion(self, thingModelVersion): diff --git a/jdcloud_sdk/services/iotcore/apis/ThingTypeListRequest.py b/jdcloud_sdk/services/iotcore/apis/DescribeThingTypeListRequest.py similarity index 93% rename from jdcloud_sdk/services/iotcore/apis/ThingTypeListRequest.py rename to jdcloud_sdk/services/iotcore/apis/DescribeThingTypeListRequest.py index 3e20840b..33209bf4 100644 --- a/jdcloud_sdk/services/iotcore/apis/ThingTypeListRequest.py +++ b/jdcloud_sdk/services/iotcore/apis/DescribeThingTypeListRequest.py @@ -19,18 +19,18 @@ from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest -class ThingTypeListRequest(JDCloudRequest): +class DescribeThingTypeListRequest(JDCloudRequest): """ 查询物类型列表 """ def __init__(self, parameters, header=None, version="v2"): - super(ThingTypeListRequest, self).__init__( + super(DescribeThingTypeListRequest, self).__init__( '/regions/{regionId}/coreinstances/{instanceId}/thingType:list', 'GET', header, version) self.parameters = parameters -class ThingTypeListParameters(object): +class DescribeThingTypeListParameters(object): def __init__(self, regionId, instanceId, ): """ diff --git a/jdcloud_sdk/services/iotcore/apis/ThingTypeDescribeRequest.py b/jdcloud_sdk/services/iotcore/apis/DescribeThingTypeRequest.py similarity index 87% rename from jdcloud_sdk/services/iotcore/apis/ThingTypeDescribeRequest.py rename to jdcloud_sdk/services/iotcore/apis/DescribeThingTypeRequest.py index cadeacab..8b4cf860 100644 --- a/jdcloud_sdk/services/iotcore/apis/ThingTypeDescribeRequest.py +++ b/jdcloud_sdk/services/iotcore/apis/DescribeThingTypeRequest.py @@ -19,18 +19,18 @@ from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest -class ThingTypeDescribeRequest(JDCloudRequest): +class DescribeThingTypeRequest(JDCloudRequest): """ 查询物类型详情 """ def __init__(self, parameters, header=None, version="v2"): - super(ThingTypeDescribeRequest, self).__init__( - '/regions/{regionId}/coreinstances/{instanceId}/thingType:thingTypeDescribe', 'GET', header, version) + super(DescribeThingTypeRequest, self).__init__( + '/regions/{regionId}/coreinstances/{instanceId}/thingType:describe', 'GET', header, version) self.parameters = parameters -class ThingTypeDescribeParameters(object): +class DescribeThingTypeParameters(object): def __init__(self, regionId, instanceId, ): """ diff --git a/jdcloud_sdk/services/iotcore/apis/DownloadCertificateRequest.py b/jdcloud_sdk/services/iotcore/apis/DownloadDeviceCertificateRequest.py similarity index 88% rename from jdcloud_sdk/services/iotcore/apis/DownloadCertificateRequest.py rename to jdcloud_sdk/services/iotcore/apis/DownloadDeviceCertificateRequest.py index 2cb53a52..a4b5f3b1 100644 --- a/jdcloud_sdk/services/iotcore/apis/DownloadCertificateRequest.py +++ b/jdcloud_sdk/services/iotcore/apis/DownloadDeviceCertificateRequest.py @@ -19,18 +19,18 @@ from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest -class DownloadCertificateRequest(JDCloudRequest): +class DownloadDeviceCertificateRequest(JDCloudRequest): """ 下载设备证书接口 """ def __init__(self, parameters, header=None, version="v2"): - super(DownloadCertificateRequest, self).__init__( + super(DownloadDeviceCertificateRequest, self).__init__( '/regions/{regionId}/coreinstances/{instanceId}/device:downloadCertificate', 'GET', header, version) self.parameters = parameters -class DownloadCertificateParameters(object): +class DownloadDeviceCertificateParameters(object): def __init__(self, regionId, instanceId, deviceId): """ diff --git a/jdcloud_sdk/services/iotcore/apis/InvokeFunctionRequest.py b/jdcloud_sdk/services/iotcore/apis/InvokeFunctionRequest.py index 7436d251..02fdc750 100644 --- a/jdcloud_sdk/services/iotcore/apis/InvokeFunctionRequest.py +++ b/jdcloud_sdk/services/iotcore/apis/InvokeFunctionRequest.py @@ -36,7 +36,7 @@ def __init__(self, regionId, instanceId, deviceFunctionVO): """ :param regionId: 区域id :param instanceId: 实例Id - :param deviceFunctionVO: 设备ID + :param deviceFunctionVO: 设备方法 """ self.regionId = regionId diff --git a/jdcloud_sdk/services/iotcore/apis/LoongrayQueryPageRequest.py b/jdcloud_sdk/services/iotcore/apis/LoongrayQueryPageRequest.py index 11392ddf..33a04cdd 100644 --- a/jdcloud_sdk/services/iotcore/apis/LoongrayQueryPageRequest.py +++ b/jdcloud_sdk/services/iotcore/apis/LoongrayQueryPageRequest.py @@ -41,6 +41,8 @@ def __init__(self, instanceId, regionId, ): self.instanceId = instanceId self.regionId = regionId self.deviceName = None + self.manufacturer = None + self.model = None self.status = None self.productKey = None self.deviceType = None @@ -58,6 +60,18 @@ def setDeviceName(self, deviceName): """ self.deviceName = deviceName + def setManufacturer(self, manufacturer): + """ + :param manufacturer: (Optional) 设备厂商,模糊匹配 + """ + self.manufacturer = manufacturer + + def setModel(self, model): + """ + :param model: (Optional) 设备型号,模糊匹配 + """ + self.model = model + def setStatus(self, status): """ :param status: (Optional) 设备状态 0-未激活,1-激活离线,2-激活在线 diff --git a/jdcloud_sdk/services/iotcore/apis/DeviceRegisterRequest.py b/jdcloud_sdk/services/iotcore/apis/RegisterDeviceRequest.py similarity index 90% rename from jdcloud_sdk/services/iotcore/apis/DeviceRegisterRequest.py rename to jdcloud_sdk/services/iotcore/apis/RegisterDeviceRequest.py index 6e271dce..3a64fc2c 100644 --- a/jdcloud_sdk/services/iotcore/apis/DeviceRegisterRequest.py +++ b/jdcloud_sdk/services/iotcore/apis/RegisterDeviceRequest.py @@ -19,18 +19,18 @@ from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest -class DeviceRegisterRequest(JDCloudRequest): +class RegisterDeviceRequest(JDCloudRequest): """ 设备注册接口 """ def __init__(self, parameters, header=None, version="v2"): - super(DeviceRegisterRequest, self).__init__( + super(RegisterDeviceRequest, self).__init__( '/regions/{regionId}/coreinstances/{instanceId}/device:register', 'POST', header, version) self.parameters = parameters -class DeviceRegisterParameters(object): +class RegisterDeviceParameters(object): def __init__(self, regionId, instanceId, deviceInfoVO): """ diff --git a/jdcloud_sdk/services/iotcore/apis/DevicePropertySetRequest.py b/jdcloud_sdk/services/iotcore/apis/SetDevicePropertyRequest.py similarity index 89% rename from jdcloud_sdk/services/iotcore/apis/DevicePropertySetRequest.py rename to jdcloud_sdk/services/iotcore/apis/SetDevicePropertyRequest.py index 27f0e53f..1f5825fe 100644 --- a/jdcloud_sdk/services/iotcore/apis/DevicePropertySetRequest.py +++ b/jdcloud_sdk/services/iotcore/apis/SetDevicePropertyRequest.py @@ -19,18 +19,18 @@ from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest -class DevicePropertySetRequest(JDCloudRequest): +class SetDevicePropertyRequest(JDCloudRequest): """ 设备控制接口 """ def __init__(self, parameters, header=None, version="v2"): - super(DevicePropertySetRequest, self).__init__( + super(SetDevicePropertyRequest, self).__init__( '/regions/{regionId}/coreinstances/{instanceId}/deviceProperty:set', 'POST', header, version) self.parameters = parameters -class DevicePropertySetParameters(object): +class SetDevicePropertyParameters(object): def __init__(self, regionId, instanceId, devicePropertyVO): """ diff --git a/jdcloud_sdk/services/iotcore/apis/UpdateDeviceTopoRequest.py b/jdcloud_sdk/services/iotcore/apis/UpdateDeviceTopoRequest.py new file mode 100644 index 00000000..e0860b76 --- /dev/null +++ b/jdcloud_sdk/services/iotcore/apis/UpdateDeviceTopoRequest.py @@ -0,0 +1,45 @@ +# coding=utf8 + +# Copyright 2018 JDCLOUD.COM +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# NOTE: This class is auto generated by the jdcloud code generator program. + +from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest + + +class UpdateDeviceTopoRequest(JDCloudRequest): + """ + 边缘代理设备与非直连设备拓扑关系更新接口 + """ + + def __init__(self, parameters, header=None, version="v2"): + super(UpdateDeviceTopoRequest, self).__init__( + '/regions/{regionId}/coreinstances/{instanceId}/deviceTopo:update', 'POST', header, version) + self.parameters = parameters + + +class UpdateDeviceTopoParameters(object): + + def __init__(self, regionId, instanceId, deviceTopoInfoVO): + """ + :param regionId: 区域id + :param instanceId: 实例Id + :param deviceTopoInfoVO: 方法查询请求 + """ + + self.regionId = regionId + self.instanceId = instanceId + self.deviceTopoInfoVO = deviceTopoInfoVO + diff --git a/jdcloud_sdk/services/iotcore/apis/UpdateLooDeviceRequest.py b/jdcloud_sdk/services/iotcore/apis/UpdateLooDeviceRequest.py index 202bc039..317affba 100644 --- a/jdcloud_sdk/services/iotcore/apis/UpdateLooDeviceRequest.py +++ b/jdcloud_sdk/services/iotcore/apis/UpdateLooDeviceRequest.py @@ -32,12 +32,11 @@ def __init__(self, parameters, header=None, version="v2"): class UpdateLooDeviceParameters(object): - def __init__(self, instanceId, regionId, deviceId, deviceType): + def __init__(self, instanceId, regionId, deviceId, ): """ :param instanceId: 设备归属的实例ID :param regionId: 设备归属的实例所在区域 :param deviceId: 设备Id - :param deviceType: 设备类型 """ self.instanceId = instanceId @@ -49,7 +48,6 @@ def __init__(self, instanceId, regionId, deviceId, deviceType): self.status = None self.identifier = None self.deviceName = None - self.deviceType = deviceType def setModel(self, model): """ diff --git a/jdcloud_sdk/services/iotcore/client/IotcoreClient.py b/jdcloud_sdk/services/iotcore/client/IotcoreClient.py index b2bb7ddd..2a32426d 100644 --- a/jdcloud_sdk/services/iotcore/client/IotcoreClient.py +++ b/jdcloud_sdk/services/iotcore/client/IotcoreClient.py @@ -26,4 +26,4 @@ def __init__(self, credential, config=None, logger=None): if config is None: config = Config('iotcore.jdcloud-api.com') - super(IotcoreClient, self).__init__(credential, config, 'iotcore', '1.1.21', logger) + super(IotcoreClient, self).__init__(credential, config, 'iotcore', '1.1.24', logger) diff --git a/jdcloud_sdk/services/iotcore/models/DeviceFunctionVO.py b/jdcloud_sdk/services/iotcore/models/DeviceFunctionVO.py index 42bb13bb..ce4aa04a 100644 --- a/jdcloud_sdk/services/iotcore/models/DeviceFunctionVO.py +++ b/jdcloud_sdk/services/iotcore/models/DeviceFunctionVO.py @@ -19,13 +19,15 @@ class DeviceFunctionVO(object): - def __init__(self, deviceId, functionName, inParams=None): + def __init__(self, deviceId, functionKey=None, inParams=None, outParams=None): """ :param deviceId: 设备标识Id - :param inParams: (Optional) 输入参数 - :param functionName: 服务名称 + :param functionKey: (Optional) 方法Key + :param inParams: (Optional) 输入参数(Map类型) + :param outParams: (Optional) 输出参数(Map类型) """ self.deviceId = deviceId + self.functionKey = functionKey self.inParams = inParams - self.functionName = functionName + self.outParams = outParams diff --git a/jdcloud_sdk/services/iotcore/models/DeviceOfflineRecord.py b/jdcloud_sdk/services/iotcore/models/DeviceOfflineRecord.py new file mode 100644 index 00000000..e9ec2bd0 --- /dev/null +++ b/jdcloud_sdk/services/iotcore/models/DeviceOfflineRecord.py @@ -0,0 +1,33 @@ +# coding=utf8 + +# Copyright 2018 JDCLOUD.COM +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# NOTE: This class is auto generated by the jdcloud code generator program. + + +class DeviceOfflineRecord(object): + + def __init__(self, deviceName=None, identifier=None, productName=None, createTime=None): + """ + :param deviceName: (Optional) 设备名称 + :param identifier: (Optional) 设备标识 + :param productName: (Optional) 产品名称 + :param createTime: (Optional) + """ + + self.deviceName = deviceName + self.identifier = identifier + self.productName = productName + self.createTime = createTime diff --git a/jdcloud_sdk/services/iotcore/models/DeviceOnlineCount.py b/jdcloud_sdk/services/iotcore/models/DeviceOnlineCount.py new file mode 100644 index 00000000..11a01ab7 --- /dev/null +++ b/jdcloud_sdk/services/iotcore/models/DeviceOnlineCount.py @@ -0,0 +1,31 @@ +# coding=utf8 + +# Copyright 2018 JDCLOUD.COM +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# NOTE: This class is auto generated by the jdcloud code generator program. + + +class DeviceOnlineCount(object): + + def __init__(self, save_time=None, online_time=None, count_time=None): + """ + :param save_time: (Optional) 统计时间 + :param online_time: (Optional) 在线时长 + :param count_time: (Optional) 上线次数 + """ + + self.save_time = save_time + self.online_time = online_time + self.count_time = count_time diff --git a/jdcloud_sdk/services/iotcore/models/DeviceOnlineInfo.py b/jdcloud_sdk/services/iotcore/models/DeviceOnlineInfo.py new file mode 100644 index 00000000..bc118f26 --- /dev/null +++ b/jdcloud_sdk/services/iotcore/models/DeviceOnlineInfo.py @@ -0,0 +1,37 @@ +# coding=utf8 + +# Copyright 2018 JDCLOUD.COM +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# NOTE: This class is auto generated by the jdcloud code generator program. + + +class DeviceOnlineInfo(object): + + def __init__(self, device_id=None, online_time=None, count_time=None, identifier=None, status=None, collDeviceType=None): + """ + :param device_id: (Optional) 设备ID + :param online_time: (Optional) 在线时长 + :param count_time: (Optional) 上线次数 + :param identifier: (Optional) 连接码 + :param status: (Optional) 设备状态 + :param collDeviceType: (Optional) 采集器类型 + """ + + self.device_id = device_id + self.online_time = online_time + self.count_time = count_time + self.identifier = identifier + self.status = status + self.collDeviceType = collDeviceType diff --git a/jdcloud_sdk/services/iotcore/models/DeviceTopoErrorMap.py b/jdcloud_sdk/services/iotcore/models/DeviceTopoErrorMap.py new file mode 100644 index 00000000..31e937b0 --- /dev/null +++ b/jdcloud_sdk/services/iotcore/models/DeviceTopoErrorMap.py @@ -0,0 +1,29 @@ +# coding=utf8 + +# Copyright 2018 JDCLOUD.COM +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# NOTE: This class is auto generated by the jdcloud code generator program. + + +class DeviceTopoErrorMap(object): + + def __init__(self, deviceId=None, errInfo=None): + """ + :param deviceId: (Optional) 设备ID + :param errInfo: (Optional) 设备信息 + """ + + self.deviceId = deviceId + self.errInfo = errInfo diff --git a/jdcloud_sdk/services/iotcore/models/DeviceTopoInfoVO.py b/jdcloud_sdk/services/iotcore/models/DeviceTopoInfoVO.py new file mode 100644 index 00000000..8a99c03f --- /dev/null +++ b/jdcloud_sdk/services/iotcore/models/DeviceTopoInfoVO.py @@ -0,0 +1,33 @@ +# coding=utf8 + +# Copyright 2018 JDCLOUD.COM +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# NOTE: This class is auto generated by the jdcloud code generator program. + + +class DeviceTopoInfoVO(object): + + def __init__(self, deviceId, thingTypeName, subDevices, deviceName=None): + """ + :param deviceId: 代理设备ID + :param deviceName: (Optional) 代理设备名称 + :param thingTypeName: 物类型名 + :param subDevices: + """ + + self.deviceId = deviceId + self.deviceName = deviceName + self.thingTypeName = thingTypeName + self.subDevices = subDevices diff --git a/jdcloud_sdk/services/iotcore/models/DeviceTopoPageBO.py b/jdcloud_sdk/services/iotcore/models/DeviceTopoPageBO.py new file mode 100644 index 00000000..c47cf465 --- /dev/null +++ b/jdcloud_sdk/services/iotcore/models/DeviceTopoPageBO.py @@ -0,0 +1,39 @@ +# coding=utf8 + +# Copyright 2018 JDCLOUD.COM +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# NOTE: This class is auto generated by the jdcloud code generator program. + + +class DeviceTopoPageBO(object): + + def __init__(self, deviceId=None, subDeviceId=None, subDeviceName=None, order=None, orders=None, pageNo=None, pageSize=None): + """ + :param deviceId: (Optional) 设备标识Id + :param subDeviceId: (Optional) 子设备标识Id + :param subDeviceName: (Optional) 子设备名 + :param order: (Optional) 排序方式;升序-ASC,降序-DESC + :param orders: (Optional) 排序方式;升序-ASC,降序-DESC + :param pageNo: (Optional) 页码 + :param pageSize: (Optional) 每页条数 + """ + + self.deviceId = deviceId + self.subDeviceId = subDeviceId + self.subDeviceName = subDeviceName + self.order = order + self.orders = orders + self.pageNo = pageNo + self.pageSize = pageSize diff --git a/jdcloud_sdk/services/iotcore/models/DeviceTopoRecordVO.py b/jdcloud_sdk/services/iotcore/models/DeviceTopoRecordVO.py new file mode 100644 index 00000000..a922362f --- /dev/null +++ b/jdcloud_sdk/services/iotcore/models/DeviceTopoRecordVO.py @@ -0,0 +1,33 @@ +# coding=utf8 + +# Copyright 2018 JDCLOUD.COM +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# NOTE: This class is auto generated by the jdcloud code generator program. + + +class DeviceTopoRecordVO(object): + + def __init__(self, deviceId=None, name=None, uniqueId=None, online=None): + """ + :param deviceId: (Optional) 子设备ID + :param name: (Optional) 子设备名 + :param uniqueId: (Optional) 设备物理ID + :param online: (Optional) 在线状态 + """ + + self.deviceId = deviceId + self.name = name + self.uniqueId = uniqueId + self.online = online diff --git a/jdcloud_sdk/services/iotcore/models/Product.py b/jdcloud_sdk/services/iotcore/models/Product.py index 7a5abeaf..2ca4650f 100644 --- a/jdcloud_sdk/services/iotcore/models/Product.py +++ b/jdcloud_sdk/services/iotcore/models/Product.py @@ -19,7 +19,7 @@ class Product(object): - def __init__(self, productName=None, productId=None, productType=None, productKey=None, createdTime=None, templateName=None): + def __init__(self, productName=None, productId=None, productType=None, productKey=None, createdTime=None, templateName=None, collDeviceType=None): """ :param productName: (Optional) 产品名称 :param productId: (Optional) 产品ID @@ -29,6 +29,7 @@ def __init__(self, productName=None, productId=None, productType=None, productKe :param productKey: (Optional) 产品Key :param createdTime: (Optional) 创建时间,创建时间,时间为东八区(UTC/GMT+08:00) :param templateName: (Optional) 产品类型,如自定义等 + :param collDeviceType: (Optional) 产品的采集器类型 """ self.productName = productName @@ -37,3 +38,4 @@ def __init__(self, productName=None, productId=None, productType=None, productKe self.productKey = productKey self.createdTime = createdTime self.templateName = templateName + self.collDeviceType = collDeviceType diff --git a/jdcloud_sdk/services/iotcore/models/SubDeviceInfoVO.py b/jdcloud_sdk/services/iotcore/models/SubDeviceInfoVO.py new file mode 100644 index 00000000..f7840006 --- /dev/null +++ b/jdcloud_sdk/services/iotcore/models/SubDeviceInfoVO.py @@ -0,0 +1,33 @@ +# coding=utf8 + +# Copyright 2018 JDCLOUD.COM +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# NOTE: This class is auto generated by the jdcloud code generator program. + + +class SubDeviceInfoVO(object): + + def __init__(self, subDeviceId, subDeviceName=None, serviceName=None, protocolSpec=None): + """ + :param subDeviceId: 子设备ID + :param subDeviceName: (Optional) 子设备名称 + :param serviceName: (Optional) 设备驱动名 + :param protocolSpec: (Optional) 设备通讯协议的详细说明 + """ + + self.subDeviceId = subDeviceId + self.subDeviceName = subDeviceName + self.serviceName = serviceName + self.protocolSpec = protocolSpec diff --git a/jdcloud_sdk/services/iotcore/models/ThingTypeInfoVO.py b/jdcloud_sdk/services/iotcore/models/ThingTypeInfoVO.py index 16e4b083..5235f490 100644 --- a/jdcloud_sdk/services/iotcore/models/ThingTypeInfoVO.py +++ b/jdcloud_sdk/services/iotcore/models/ThingTypeInfoVO.py @@ -19,11 +19,12 @@ class ThingTypeInfoVO(object): - def __init__(self, deviceTypeName, authType=None, connectType=None, createdTime=None, customProfiles=None, deviceTypeCode=None, globalProfiles=None, manufacturerId=None, manufacturerName=None, nodeType=None, code=None, updateTime=None): + def __init__(self, deviceTypeName, code, name, authType=None, connectType=None, createdTime=None, updateTime=None, customProfiles=None, deviceTypeCode=None, globalProfiles=None, manufacturerId=None, manufacturerName=None, nodeType=None): """ :param authType: (Optional) 认证方式 1: 一机一密 2:一型一密 :param connectType: (Optional) 连接类型,蜂窝(2G/3G/4G) :param createdTime: (Optional) 创建时间 + :param updateTime: (Optional) 更新时间 :param customProfiles: (Optional) 自定义档案信息 :param deviceTypeCode: (Optional) 设备类型编号 :param deviceTypeName: 设备类型名称 例如:ttu、电表 @@ -31,13 +32,14 @@ def __init__(self, deviceTypeName, authType=None, connectType=None, createdTime= :param manufacturerId: (Optional) 制造商编号 :param manufacturerName: (Optional) 制造商名称 :param nodeType: (Optional) 节点类型1:直连终端、2:边缘代理、3:非直连终端 - :param code: (Optional) 所属物类型Code - :param updateTime: (Optional) 更新时间 + :param code: 所属物类型Code + :param name: 所属物类型名称 """ self.authType = authType self.connectType = connectType self.createdTime = createdTime + self.updateTime = updateTime self.customProfiles = customProfiles self.deviceTypeCode = deviceTypeCode self.deviceTypeName = deviceTypeName @@ -46,4 +48,4 @@ def __init__(self, deviceTypeName, authType=None, connectType=None, createdTime= self.manufacturerName = manufacturerName self.nodeType = nodeType self.code = code - self.updateTime = updateTime + self.name = name diff --git a/setup.py b/setup.py index 52cc6ea0..4bb39209 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name='jdcloud_sdk', - version="1.6.66", + version="1.6.67", long_description=long_description, long_description_content_type="text/markdown", author='JDCloud API Gateway Team',