Merge pull request #95 from Tanc009/master

publish jdcloud-sdk-python 1.6.61

Author: Tanc009

jdcloud_sdk/services/iotcore/ChangeLog.md

@@ -3,6 +3,7 @@ API版本：1.1.15
 
 |发布时间|版本号|更新|说明|
 |---|---|---|---|
+|2020-05-14   |1.1.18   |增加朗锐接口      | *朗瑞查询接口加参数
 |2020-05-14   |1.1.15   |增加朗锐接口      | *增加朗锐的设备接口和电梯运行状态接口
 |2020-04-20   |1.1.5   |增加iotcore融合      | *增加实例列表、实例详情和实例删除接口
 |2020-01-10   |1.1.4   |增加Edge日志上报通知接口      | *增加Edge日志上报通知接口,增加自定义物模型模板接口，增加自定义topic功能

jdcloud_sdk/services/iotcore/apis/AddLooDeviceRequest.py

@@ -32,12 +32,13 @@ def __init__(self, parameters, header=None, version="v2"):
 
 class AddLooDeviceParameters(object):
 
-    def __init__(self, instanceId, regionId, preOrderId, userPinParam, ):
+    def __init__(self, instanceId, regionId, preOrderId, userPinParam, deviceType):
         """
         :param instanceId: 设备归属的实例ID
         :param regionId: 设备归属的实例所在区域
         :param preOrderId: 申请单编号
         :param userPinParam: 用户Pin
+        :param deviceType: 设备类型
         """
 
         self.instanceId = instanceId
@@ -50,6 +51,7 @@ def __init__(self, instanceId, regionId, preOrderId, userPinParam, ):
         self.manufacturer = None
         self.identifier = None
         self.description = None
+        self.deviceType = deviceType
 
     def setDeviceName(self, deviceName):
         """

jdcloud_sdk/services/iotcore/apis/CollectorReadMessageRequest.py

@@ -0,0 +1,53 @@
+# 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 CollectorReadMessageRequest(JDCloudRequest):
+    """
+    获取协议信息
+    """
+
+    def __init__(self, parameters, header=None, version="v2"):
+        super(CollectorReadMessageRequest, self).__init__(
+            '/regions/{regionId}/loongrayinstances/{instanceId}/readCollectorProperty', 'GET', header, version)
+        self.parameters = parameters
+
+
+class CollectorReadMessageParameters(object):
+
+    def __init__(self, instanceId, regionId, identifier, protocol):
+        """
+        :param instanceId: Hub实例Id
+        :param regionId: 区域Id
+        :param identifier: 当前的链接码
+        :param protocol: 当前的协议类型：
+语音播报控制器-输入端子,0X00000~X0007：inputTerminal
+语音播报控制器-播放信息,0X00024~X0027：playInfo
+LR001-516-5B边缘数据采集器-传感器管理：sensor
+LR001-516-5B边缘数据采集器-采集器属性：collectorProperty
+LR001-516-5B边缘数据采集器-电梯属性：elevatorProperty
+
+        """
+
+        self.instanceId = instanceId
+        self.regionId = regionId
+        self.identifier = identifier
+        self.protocol = protocol
+

jdcloud_sdk/services/iotcore/apis/CollectorWriteMessageRequest.py

@@ -0,0 +1,96 @@
+# 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 CollectorWriteMessageRequest(JDCloudRequest):
+    """
+    写入采集器数据
+    """
+
+    def __init__(self, parameters, header=None, version="v2"):
+        super(CollectorWriteMessageRequest, self).__init__(
+            '/regions/{regionId}/loongrayinstances/{instanceId}/writeCollectorProperty', 'POST', header, version)
+        self.parameters = parameters
+
+
+class CollectorWriteMessageParameters(object):
+
+    def __init__(self, instanceId, regionId, identifier, data):
+        """
+        :param instanceId: Hub实例Id
+        :param regionId: 区域Id
+        :param identifier: 当前的链接码
+        :param data: 当前待写入的数据
+如指定播放设备，寄存地址：13对应16进制0x0D，寄存器值:2
+{
+  "13":2
+}
+如播放控制，寄存地址：14对应16进制0x0E，寄存器值:1
+{
+  "14": 1
+}
+如音量设置，寄存地址：15对应16进制0x0F，寄存器值:10，取值范围0~30
+{
+  "15": 10
+}
+如指定文件夹和文件播放,寄存地址：16对应16进制0x10，寄存器值:1
+寄存器值为两字节，第一个字节为文件夹，第二个字节为文件名
+如0x01文件夹,0x03文件名，0x0103换算为10进制为259
+{
+  "16": 259
+}
+如组合播放，寄存器地址：17、18和19，寄存器值：257、258和259，寄存器值的算法和指定文件夹和文件播放是一致的，如259可换算为0x01文件夹,0x03文件名
+{
+  "17": 257,
+  "18": 258,
+  "19": 259
+}
+如播放广告，寄存地址：32对应16进制0x20，寄存器值:259，寄存器值的算法和指定文件夹和文件播放是一致的，如259可换算为0x01文件夹,0x03文件名
+{
+  "32": 259
+}
+如指定文件夹循环播放，寄存地址：33对应16进制0x21，寄存器值:256，寄存器值的算法，如256可换算为0x0100文件夹
+{
+  "33": 256
+}
+如指定文件夹随机播放，寄存地址：34对应16进制0x22，寄存器值:256，寄存器值的算法，如256可换算为0x0100文件夹
+{
+  "34": 256
+}
+如指定曲目播放，寄存地址：35对应16进制0x23，寄存器值:13,歌曲选择范围为0~3000
+{
+  "35": 13
+}
+
+        """
+
+        self.instanceId = instanceId
+        self.regionId = regionId
+        self.identifier = identifier
+        self.protocol = None
+        self.data = data
+
+    def setProtocol(self, protocol):
+        """
+        :param protocol: (Optional) 当前的协议类型,非必填项
+
+        """
+        self.protocol = protocol
+

jdcloud_sdk/services/iotcore/apis/CreateAdminProductRequest.py

@@ -0,0 +1,71 @@
+# 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 CreateAdminProductRequest(JDCloudRequest):
+    """
+    新建产品
+    """
+
+    def __init__(self, parameters, header=None, version="v2"):
+        super(CreateAdminProductRequest, self).__init__(
+            '/regions/{regionId}/loongrayinstances/{instanceId}/productsAdmin', 'POST', header, version)
+        self.parameters = parameters
+
+
+class CreateAdminProductParameters(object):
+
+    def __init__(self, regionId, instanceId, productName, productType, ):
+        """
+        :param regionId: 地域ID
+        :param instanceId: IoT Engine实例ID信息
+        :param productName: 产品名称，名称不可为空，3-30个字符，只支持汉字、英文字母、数字、下划线“_”及中划线“-”，必须以汉字、英文字母及数字开头结尾
+        :param productType: 节点类型，取值：
+0：设备。设备不能挂载子设备。可以直连物联网平台，也可以作为网关的子设备连接物联网平台
+1：网关。网关可以挂载子设备，具有子设备管理模块，维持子设备的拓扑关系，和将拓扑关系同步到物联网平台
+
+        """
+
+        self.regionId = regionId
+        self.instanceId = instanceId
+        self.productName = productName
+        self.productType = productType
+        self.productDescription = None
+        self.templateId = None
+        self.internalTags = None
+
+    def setProductDescription(self, productDescription):
+        """
+        :param productDescription: (Optional) 产品描述，80字符以内
+        """
+        self.productDescription = productDescription
+
+    def setTemplateId(self, templateId):
+        """
+        :param templateId: (Optional) 物模型模板ID，内部参数，用户不可见，默认为自定义
+        """
+        self.templateId = templateId
+
+    def setInternalTags(self, internalTags):
+        """
+        :param internalTags: (Optional) 内部标签，内部参数，用户不可见，隐藏标签：hidden:true
+        """
+        self.internalTags = internalTags
+

jdcloud_sdk/services/iotcore/apis/DeleteDeviceRequest.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 DeleteDeviceRequest(JDCloudRequest):
+    """
+    设备删除接口
+    """
+
+    def __init__(self, parameters, header=None, version="v2"):
+        super(DeleteDeviceRequest, self).__init__(
+            '/regions/{regionId}/coreinstances/{instanceId}/device:delete', 'DELETE', header, version)
+        self.parameters = parameters
+
+
+class DeleteDeviceParameters(object):
+
+    def __init__(self, regionId, instanceId, deviceId):
+        """
+        :param regionId: 区域id
+        :param instanceId: 实例Id
+        :param deviceId: 设备ID
+        """
+
+        self.regionId = regionId
+        self.instanceId = instanceId
+        self.deviceId = deviceId
+

jdcloud_sdk/services/iotcore/apis/DeleteProductWithAdminRequest.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 DeleteProductWithAdminRequest(JDCloudRequest):
+    """
+    删除产品
+    """
+
+    def __init__(self, parameters, header=None, version="v2"):
+        super(DeleteProductWithAdminRequest, self).__init__(
+            '/regions/{regionId}/loongrayinstances/{instanceId}/products/{productKey}/admin', 'DELETE', header, version)
+        self.parameters = parameters
+
+
+class DeleteProductWithAdminParameters(object):
+
+    def __init__(self, regionId, instanceId, productKey, ):
+        """
+        :param regionId: 地域ID
+        :param instanceId: IoT Engine实例ID信息
+        :param productKey: 产品Key
+        """
+
+        self.regionId = regionId
+        self.instanceId = instanceId
+        self.productKey = productKey
+

jdcloud_sdk/services/iotcore/apis/DescribeProductWithAdminRequest.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 DescribeProductWithAdminRequest(JDCloudRequest):
+    """
+    查看产品
+    """
+
+    def __init__(self, parameters, header=None, version="v2"):
+        super(DescribeProductWithAdminRequest, self).__init__(
+            '/regions/{regionId}/loongrayinstances/{instanceId}/products/{productKey}/admin', 'GET', header, version)
+        self.parameters = parameters
+
+
+class DescribeProductWithAdminParameters(object):
+
+    def __init__(self, regionId, instanceId, productKey, ):
+        """
+        :param regionId: 地域ID
+        :param instanceId: IoT Engine实例ID信息
+        :param productKey: 产品Key
+        """
+
+        self.regionId = regionId
+        self.instanceId = instanceId
+        self.productKey = productKey
+