Skip to content

Commit cddf42b

Browse files
Tanc009Tanc009
authored
Merge pull request #101 from Tanc009/master
publish jdcloud-sdk-python 1.6.67
2 parents f8d2629 + 79a8bcf commit cddf42b

34 files changed

Lines changed: 528 additions & 60 deletions

‎jdcloud_sdk/services/iotcore/ChangeLog.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
# 更新历史 #
2-
API版本：1.1.21
2+
API版本：1.1.24
33

44
|发布时间|版本号|更新|说明|
5-
|---|---|---|---|
5+
|---|---|---|---
6+
|2020-07-02 |1.1.24 |设备检索增加标签支持 | *设备检索增加标签支持
7+
|2020-06-23 |1.1.22 |增加设备离线记录接口 | *增加设备离线记录接口发布
68
|2020-06-15 |1.1.21 |增加设备统计接口 | *设备统计接口发布
79
|2020-06-11 |1.1.20 |增加设备接口 | *设备更新接口发布
810
|2020-05-28 |1.1.19 |增加朗锐接口 | *(0x03)读保持寄存器

‎jdcloud_sdk/services/iotcore/apis/AddLooDeviceRequest.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,12 @@ def __init__(self, parameters, header=None, version="v2"):
3232

3333
class AddLooDeviceParameters(object):
3434

35-
def __init__(self, instanceId, regionId, preOrderId, userPinParam, deviceType):
35+
def __init__(self, instanceId, regionId, preOrderId, userPinParam, ):
3636
"""
3737
:param instanceId: 设备归属的实例ID
3838
:param regionId: 设备归属的实例所在区域
3939
:param preOrderId: 申请单编号
4040
:param userPinParam: 用户Pin
41-
:param deviceType: 设备类型
4241
"""
4342

4443
self.instanceId = instanceId
@@ -51,7 +50,6 @@ def __init__(self, instanceId, regionId, preOrderId, userPinParam, deviceType):
5150
self.manufacturer = None
5251
self.identifier = None
5352
self.description = None
54-
self.deviceType = deviceType
5553

5654
def setDeviceName(self, deviceName):
5755
"""

‎jdcloud_sdk/services/iotcore/apis/CreateAdminProductRequest.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def __init__(self, parameters, header=None, version="v2"):
3232

3333
class CreateAdminProductParameters(object):
3434

35-
def __init__(self, regionId, instanceId, productName, productType, ):
35+
def __init__(self, regionId, instanceId, productName, productType, collDeviceType):
3636
"""
3737
:param regionId: 地域ID
3838
:param instanceId: IoT Engine实例ID信息
@@ -41,6 +41,7 @@ def __init__(self, regionId, instanceId, productName, productType, ):
4141
0：设备。设备不能挂载子设备。可以直连物联网平台，也可以作为网关的子设备连接物联网平台
4242
1：网关。网关可以挂载子设备，具有子设备管理模块，维持子设备的拓扑关系，和将拓扑关系同步到物联网平台
4343
44+
:param collDeviceType: 产品名下所有设备的采集器类型
4445
"""
4546

4647
self.regionId = regionId
@@ -50,6 +51,7 @@ def __init__(self, regionId, instanceId, productName, productType, ):
5051
self.productDescription = None
5152
self.templateId = None
5253
self.internalTags = None
54+
self.collDeviceType = collDeviceType
5355

5456
def setProductDescription(self, productDescription):
5557
"""

‎jdcloud_sdk/services/iotcore/apis/CreateDeviceTopoRequest.py‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# coding=utf8
2+
3+
# Copyright 2018 JDCLOUD.COM
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
# NOTE: This class is auto generated by the jdcloud code generator program.
18+
19+
from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest
20+
21+
22+
class CreateDeviceTopoRequest(JDCloudRequest):
23+
"""
24+
边缘代理设备与非直连设备拓扑关系创建接口
25+
"""
26+
27+
def __init__(self, parameters, header=None, version="v2"):
28+
super(CreateDeviceTopoRequest, self).__init__(
29+
'/regions/{regionId}/coreinstances/{instanceId}/deviceTopo:create', 'POST', header, version)
30+
self.parameters = parameters
31+
32+
33+
class CreateDeviceTopoParameters(object):
34+
35+
def __init__(self, regionId, instanceId, deviceTopoInfoVO):
36+
"""
37+
:param regionId: 区域id
38+
:param instanceId: 实例Id
39+
:param deviceTopoInfoVO: 方法查询请求
40+
"""
41+
42+
self.regionId = regionId
43+
self.instanceId = instanceId
44+
self.deviceTopoInfoVO = deviceTopoInfoVO
45+

‎jdcloud_sdk/services/iotcore/apis/DeleteDeviceTopoRequest.py‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# coding=utf8
2+
3+
# Copyright 2018 JDCLOUD.COM
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
# NOTE: This class is auto generated by the jdcloud code generator program.
18+
19+
from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest
20+
21+
22+
class DeleteDeviceTopoRequest(JDCloudRequest):
23+
"""
24+
边缘代理设备与非直连设备拓扑关系删除接口
25+
"""
26+
27+
def __init__(self, parameters, header=None, version="v2"):
28+
super(DeleteDeviceTopoRequest, self).__init__(
29+
'/regions/{regionId}/coreinstances/{instanceId}/deviceTopo:delete', 'POST', header, version)
30+
self.parameters = parameters
31+
32+
33+
class DeleteDeviceTopoParameters(object):
34+
35+
def __init__(self, regionId, instanceId, deviceTopoInfoVO):
36+
"""
37+
:param regionId: 区域id
38+
:param instanceId: 实例Id
39+
:param deviceTopoInfoVO: 方法查询请求
40+
"""
41+
42+
self.regionId = regionId
43+
self.instanceId = instanceId
44+
self.deviceTopoInfoVO = deviceTopoInfoVO
45+

jdcloud_sdk/services/iotcore/apis/DeviceQueryRequest.py renamed to jdcloud_sdk/services/iotcore/apis/DescribeDeviceRequest.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@
1919
from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest
2020

2121

22-
class DeviceQueryRequest(JDCloudRequest):
22+
class DescribeDeviceRequest(JDCloudRequest):
2323
"""
2424
查询单个设备详细信息
2525
"""
2626

2727
def __init__(self, parameters, header=None, version="v2"):
28-
super(DeviceQueryRequest, self).__init__(
29-
'/regions/{regionId}/coreinstances/{instanceId}/device:query', 'GET', header, version)
28+
super(DescribeDeviceRequest, self).__init__(
29+
'/regions/{regionId}/coreinstances/{instanceId}/device:describe', 'GET', header, version)
3030
self.parameters = parameters
3131

3232

33-
class DeviceQueryParameters(object):
33+
class DescribeDeviceParameters(object):
3434

3535
def __init__(self, regionId, instanceId, deviceId):
3636
"""

‎jdcloud_sdk/services/iotcore/apis/DescribeDeviceTopoRequest.py‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# coding=utf8
2+
3+
# Copyright 2018 JDCLOUD.COM
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
# NOTE: This class is auto generated by the jdcloud code generator program.
18+
19+
from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest
20+
21+
22+
class DescribeDeviceTopoRequest(JDCloudRequest):
23+
"""
24+
边缘代理设备与非直连设备拓扑关系查询接口
25+
"""
26+
27+
def __init__(self, parameters, header=None, version="v2"):
28+
super(DescribeDeviceTopoRequest, self).__init__(
29+
'/regions/{regionId}/coreinstances/{instanceId}/deviceTopo:describe', 'POST', header, version)
30+
self.parameters = parameters
31+
32+
33+
class DescribeDeviceTopoParameters(object):
34+
35+
def __init__(self, regionId, instanceId, deviceTopoPageBO):
36+
"""
37+
:param regionId: 区域id
38+
:param instanceId: 实例Id
39+
:param deviceTopoPageBO: 方法查询请求
40+
"""
41+
42+
self.regionId = regionId
43+
self.instanceId = instanceId
44+
self.deviceTopoPageBO = deviceTopoPageBO
45+

jdcloud_sdk/services/iotcore/apis/EventListRequest.py renamed to jdcloud_sdk/services/iotcore/apis/DescribeEventListRequest.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@
1919
from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest
2020

2121

22-
class EventListRequest(JDCloudRequest):
22+
class DescribeEventListRequest(JDCloudRequest):
2323
"""
2424
设备事件查询
2525
"""
2626

2727
def __init__(self, parameters, header=None, version="v2"):
28-
super(EventListRequest, self).__init__(
28+
super(DescribeEventListRequest, self).__init__(
2929
'/regions/{regionId}/coreinstances/{instanceId}/event:list', 'POST', header, version)
3030
self.parameters = parameters
3131

3232

33-
class EventListParameters(object):
33+
class DescribeEventListParameters(object):
3434

3535
def __init__(self, regionId, instanceId, eventReportPageBo):
3636
"""

jdcloud_sdk/services/iotcore/apis/FunctionListRequest.py renamed to jdcloud_sdk/services/iotcore/apis/DescribeFunctionListRequest.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@
1919
from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest
2020

2121

22-
class FunctionListRequest(JDCloudRequest):
22+
class DescribeFunctionListRequest(JDCloudRequest):
2323
"""
2424
查询方法调用列表信息
2525
"""
2626

2727
def __init__(self, parameters, header=None, version="v2"):
28-
super(FunctionListRequest, self).__init__(
28+
super(DescribeFunctionListRequest, self).__init__(
2929
'/regions/{regionId}/coreinstances/{instanceId}/function:list', 'POST', header, version)
3030
self.parameters = parameters
3131

3232

33-
class FunctionListParameters(object):
33+
class DescribeFunctionListParameters(object):
3434

3535
def __init__(self, regionId, instanceId, functionCallPageBo):
3636
"""

jdcloud_sdk/services/iotcore/apis/PropertyAcquireRequest.py renamed to jdcloud_sdk/services/iotcore/apis/DescribePropertyRequest.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@
1919
from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest
2020

2121

22-
class PropertyAcquireRequest(JDCloudRequest):
22+
class DescribePropertyRequest(JDCloudRequest):
2323
"""
2424
查询属性接口
2525
"""
2626

2727
def __init__(self, parameters, header=None, version="v2"):
28-
super(PropertyAcquireRequest, self).__init__(
29-
'/regions/{regionId}/coreinstances/{instanceId}/property:acquire', 'GET', header, version)
28+
super(DescribePropertyRequest, self).__init__(
29+
'/regions/{regionId}/coreinstances/{instanceId}/property:describe', 'GET', header, version)
3030
self.parameters = parameters
3131

3232

33-
class PropertyAcquireParameters(object):
33+
class DescribePropertyParameters(object):
3434

3535
def __init__(self, regionId, instanceId, deviceId):
3636
"""

0 commit comments

Comments
 (0)