publish jdcloud-sdk-python 1.6.67

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)读保持寄存器

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):
         """

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):
         """

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
+

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
+

jdcloud_sdk/services/iotcore/apis/DeviceQueryRequest.py → 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):
         """

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
+

jdcloud_sdk/services/iotcore/apis/EventListRequest.py → 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):
         """

jdcloud_sdk/services/iotcore/apis/FunctionListRequest.py → 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):
         """

jdcloud_sdk/services/iotcore/apis/PropertyAcquireRequest.py → 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):
         """

jdcloud_sdk/services/iotcore/apis/GetPropertySnapshotRequest.py → 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):
         """

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):

jdcloud_sdk/services/iotcore/apis/ThingTypeListRequest.py → 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, ):
         """

jdcloud_sdk/services/iotcore/apis/ThingTypeDescribeRequest.py → 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, ):
         """