hua_oceanconnect_adapter.rb in imperituroard-1.0.2

- old
+ new

@@ -72,10 +72,15 @@
       internal_func.printer_texter("get_token: start. Step3, data: #{data.to_s}", "debug")
       request.content_type = 'application/x-www-form-urlencoded'
       request.body = URI.encode_www_form(data)
       res = https.request(request)
       out_resp = {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+      fff = {:func => "get_token",
+             :iot_fun => "",
+             :req_header => {:content_type => 'application/x-www-form-urlencoded'
+             }}
+      client_iot_mongo.audit_iot_logger(fff, url_string, data, out_resp)
     rescue
       out_resp = {:code => 500, :message => "failed get token"}
     end
     jjj = {:procedure => "get_token", :answ => out_resp}
     internal_func.printer_texter(jjj, "debug")
@@ -104,10 +109,14 @@
       internal_func.printer_texter("token_logout Step3 data: #{data.to_s}", "debug")
       request.content_type = 'application/json'
       request.body = URI.encode_www_form(data)
       res = https.request(request)
       out_resp = {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+      fff = {:func => "token_logout",
+             :iot_fun => "logout"
+      }
+      client_iot_mongo.audit_iot_logger(fff, url_string, data, out_resp)
     rescue
       out_resp = {:code => 500, :message => "failed logout token"}
     end
     jjj = {:procedure => "token_logout", :answ => out_resp}
     internal_func.printer_texter(jjj, "debug")
@@ -129,11 +138,10 @@
     request.content_type = 'application/json'
     request['Authorization'] = 'Bearer ' + token
     request['app_key'] = app_id
     request.body = {nodeId: node_id}.to_json
     res = https.request(request)
-    p res.body.to_s
     {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
   end
 
   #2.2.4 Registering a Directly Connected Device (Password Mode) (V2)
   def dev_register_passw_code_mode2(app_id, secret, node_id, name_p, description_p, device_type, profile, manufacturer_id, manufacturer_name, model)
@@ -218,30 +226,25 @@
       request = Net::HTTP::Delete.new(uri.path)
       request.content_type = 'application/json'
       request['Authorization'] = 'Bearer ' + token
       request['app_key'] = app_id
       res = https.request(request)
-      p "res.code"
-      p res.code
-      p res.body
       if res.body != nil
         out_resp = {:code => res.code, :message => res.message, :body => {:answ => JSON.parse(res.body.to_s)}}
       else
         out_resp = {:code => res.code, :message => res.message, :body => {:answ => "no data"}}
       end
-
       fff = {:func => "dev_delete",
              :iot_fun => "2.2.12",
              :req_header => {:authorization => 'Bearer ' + token,
                              :content_type => 'application/json',
                              :app_key => app_id
              }}
       client_iot_mongo.audit_iot_logger(fff, url_string, "Delete", out_resp)
     rescue
       out_resp = {:code => 500, :message => "dev_delete: Unknown IOT error"}
     end
-    p out_resp
     out_resp
   end
 
 
   #2.2.44 Querying the Device ID
@@ -308,10 +311,11 @@
     {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
   end
 
   #2.9.6 Querying Directly Connected Devices and Their Mounted Devices in Batches
   def querying_device_direct_conn(app_id, secret, dev_list)
+    output_str = {}
     token = get_token(app_id, secret)[:body]["accessToken"]
     path = "/iocm/app/dm/v1.1.0/queryDevicesByIds"
     url_string = "https://" + platformip + ":" + platformport + path
     uri = URI.parse url_string
     https = Net::HTTP.new(uri.host, uri.port)
@@ -321,13 +325,22 @@
     https.verify_mode = OpenSSL::SSL::VERIFY_NONE
     request = Net::HTTP::Post.new(uri.path)
     request.content_type = 'application/json'
     request['Authorization'] = 'Bearer ' + token
     request['app_key'] = app_id
-    request.body = {deviceIds: dev_list}.to_json
+    req_body = {deviceIds: dev_list}
+    request.body = req_body.to_json
     res = https.request(request)
-    {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+    output_str = {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+    fff = {:func => "querying_device_direct_conn",
+           :iot_fun => "2.9.6",
+           :req_header => {:authorization => 'Bearer ' + token,
+                           :content_type => 'application/json',
+                           :app_key => app_id
+           }}
+    client_iot_mongo.audit_iot_logger(fff, url_string, req_body, output_str)
+    output_str
   end
 
 
   #2.9.19 Querying the Complete Device Type List of All Device Capabilities
   def querying_device_type_list(app_id, secret)
@@ -388,18 +401,26 @@
       https.verify_mode = OpenSSL::SSL::VERIFY_NONE
       request = Net::HTTP::Put.new(uri.path)
       request.content_type = 'application/json'
       request['Authorization'] = 'Bearer ' + token
       request['app_key'] = app_id
-      request.body = {location: address}.to_json
+      req_b = {location: address}
+      request.body = req_b.to_json
       res = https.request(request)
       p res.code
       p res.body
       if res.body != nil
         out_resp = {:code => res.code, :message => res.message, :body => {:answ => JSON.parse(res.body.to_s)}}
       else
         out_resp = {:code => res.code, :message => res.message, :body => {:answ => "no data"}}
       end
+      fff = {:func => "dev_modify_location_v2",
+             :iot_fun => "2.2.11",
+             :req_header => {:authorization => 'Bearer ' + token,
+                             :content_type => 'application/json',
+                             :app_key => app_id
+             }}
+      client_iot_mongo.audit_iot_logger(fff, url_string, req_b, out_resp)
     rescue
       out_resp = {:code => 500, :message => "dev_modify_location_v2: Unknown IOT error"}
     end
     p out_resp
     out_resp
\ No newline at end of file