增加查找单个设备信息

Author: fandaddy

OneNetApi.py

@@ -33,16 +33,17 @@ def _call(self, url, method, jdata = None, params = None):
                 res = s.post(url, data = jdata, headers = self.header)
             else:
                 res = s.post(url, headers = self.header)
-
         if method == 'GET':
             res = s.get(url, headers = self.header, params = params)
+        if method == 'PUT':
+            res = s.put(url, headers = self.header, data = jdata)
+
         return res
 
 
     ##### 设备相关操作 #######
     # 新增设备
     def device_add(self, title = None, desc = None, tags = None, location = None, private = 'true', protocol = 'HTTP'):
-        api = base_url+'/devices'
         values = {}
         if title == None:
             return 0
@@ -61,6 +62,32 @@ def device_add(self, title = None, desc = None, tags = None, location = None, pr
         jdata = json.dumps(values)
         api = "/devices"
         return self._call(api, 'POST', jdata)
+    
+    #更新设备信息
+    def device_update(self, device_id = None, title = None, desc = None, private = 'true', tags = None, location = None):
+        values = {}
+        if device_id == None:
+            return 0
+        api = "/devices/{device_id}".format(device_id = device_id)
+        if title != None:
+            values['title'] = title
+        if desc != None:
+            values['desc'] = desc
+        if private != None:
+            values['private'] = private
+        if tags != None:
+            values['tags'] = tags
+        if location != None:
+            values['location'] = location
+        jdata = json.dumps(values)
+        return self._call(api, 'PUT', jdata) 
+    
+    #查找单个设备信息
+    def device_info(self, device_id = None):
+        if device_id == None:
+            return 0
+        api = "/devices/{device_id}".format(device_id = device_id)
+        return self._call(api, 'GET')
 
 
     # 数据点操作

demo01.py

@@ -8,15 +8,27 @@
     test = OneNetApi("Ur api key")
 
     # 添加设备
-    title = "test11"
-    desc = "testing"
-    tags = ["test1", "test2"]
-    private = "false"
-    res1 = test.device_add(title = title, desc = desc, tags = tags, private = private)
-    print res1.content
+    #title = "test11"
+    #desc = "testing"
+    #tags = ["test1", "test2"]
+    #private = "false"
+    #res1 = test.device_add(title = title, desc = desc, tags = tags, private = private)
+    #print res1.content
+
+    # 更新设备
+    #device_id = **********
+    #title = "test_abs"
+    #private = 'true'
+    #res2 = test.device_update(device_id = device_id, title = title, private = private)
+    #print res2.content
+
+    # 查询设备
+    device_id = ********
+    res3 = test.device_info(device_id = device_id)
+    print res3.content
 
     # 添加数据
-    #device_id = *****
+    #device_id = ********
     #无名参数要放在keyword前面
     #res1 = test.datapoint_add(device_id, 'temperature', 70)
     #print res1.content