pingan_api 0.1.0 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6034e377df491bbd6661177df11cac41f919df32
-  data.tar.gz: 10151d9e1260f5713a46d7ce45798448e45231f5
+  metadata.gz: 7749105cca23336dc92354127ff62eff0bac74c8
+  data.tar.gz: 6af0fba49c3f28a954a611429d75ca52047ff63d
 SHA512:
-  metadata.gz: b5fd4403b6ec4d28fb56538f80510e4ba4c1d1e474cb5f6e6d715dd062ece9704842b0f2e8393fec3f4d3cbc1acef5c652e4d9a5febd22cc9ef498e644d82037
-  data.tar.gz: fa8610af10cddff123de18404dd75112a9c9553d3218080391faf4744fd43889e5605c93c20dfdb5d34074609f6632ff7b2758a54b8ce3661efa838fa5af8991
+  metadata.gz: 05fe6cbf53fcde1aef662933e8b467dfc357c0535b044707a78a0d54bef3a2ab83a2881aeaa5611c65198c769818d27047bdb08589873b0b1a36ef2e98a4db0f
+  data.tar.gz: e4cb5ec1c9829a27d85ba52adec979c3145c82f25da08a9b07a05ac3cef937d1ec7444ff58cf2b59692c4275b84753d1dc2dd4124c0ab2590c4f09d5cd306b06

data/lib/pingan_api.rb

@@ -11,6 +11,7 @@ require 'pingan_api/models/assistance/operation_send_request'
 require 'pingan_api/models/assistance/operation_send_response'
 require 'pingan_api/models/assistance/salvation_query_request'
 require 'pingan_api/models/assistance/salvation_query_response'
+require 'pingan_api/models/assistance/upload_photo_send_request'
 
 module PinganApi
 

data/lib/pingan_api/assistance_business.rb

@@ -23,5 +23,11 @@ module PinganApi
       data = send_request_with_data_and_template(salvation_query, PinganApi.config.salvation_query_request_template)
       return PinganApi::Models::Assistance::SalvationQueryResponse.from_xml(data)
     end
+
+    # 发送照片
+    def send_photo(photo)
+      data = send_request_with_data_and_template(photo, PinganApi.config.upload_photo_send_request_template)
+      return PinganApi::Models::Assistance::OperationSendResponse.from_xml(data)
+    end
   end
 end

data/lib/pingan_api/base.rb

@@ -16,13 +16,14 @@ module PinganApi
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true if uri.scheme == "https"
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      http.read_timeout = 10
 
       pem = File.read(PinganApi.config.cert)
       http.cert = OpenSSL::X509::Certificate.new(pem)
       http.key = OpenSSL::PKey::RSA.new(pem)
 
-      request = Net::HTTP::Post.new("/", initheader = {'Content-Type' =>'application/xml;charset=GBK'})
-      request.body = body.encode('GBK')
+      request = Net::HTTP::Post.new("/", initheader = {'Content-Type' => 'application/xml;charset=' + PinganApi.config.encoding})
+      request.body = body.encode(PinganApi.config.encoding)
 
       return send_request_and_log(http, request)
     end
@@ -33,12 +34,16 @@ module PinganApi
       #log.write_request(request)
       #begin
         # TODO, save response
-        #File.open("tmp/#{Time.now.to_i}_request.xml", "w") { |file| file.write request.body }
+        if PinganApi.config.output_log
+          File.open("tmp/#{Time.now.to_i}_request.xml", "w") { |file| file.write request.body }
+        end
         res = http.request(request)
         #log.write_response(res)
-        #File.open("tmp/#{Time.now.to_i}_response.xml", "w") { |file| file.write res.body.force_encoding("GBK") }
+        if PinganApi.config.output_log
+          File.open("tmp/#{Time.now.to_i}_response.xml", "w") { |file| file.write res.body.force_encoding(PinganApi.config.encoding) }
+        end
 
-        return res.body.force_encoding("GBK")
+        return res.body.force_encoding(PinganApi.config.encoding)
       #rescue => e
         #log.write_error(e.to_s)
       #  return nil

data/lib/pingan_api/configuration.rb

@@ -39,5 +39,29 @@ module PinganApi
     def operation_send_request_template=(template)
       @operation_send_request_template = template
     end
+
+    def upload_photo_send_request_template
+      @upload_photo_send_request_template ||= File.join(File.dirname(File.expand_path(__FILE__)), "templates/assistance/upload_photo_send_request.xml.erb")
+    end
+
+    def upload_photo_send_request_template=(template)
+      @upload_photo_send_request_template = template
+    end
+
+    def output_log
+      @output_log ||= false
+    end
+
+    def output_log=(output_log)
+      @output_log = output_log
+    end
+
+    def encoding
+      @encoding ||= "GBK"
+    end
+
+    def encoding=(encoding)
+      @encoding = encoding
+    end
   end
 end

data/lib/pingan_api/models/assistance/salvation_receive_request.rb

@@ -36,7 +36,9 @@ module PinganApi
                       :gps_x,
                       :gps_y,
                       :salvation_factory_id,
-                      :data_source
+                      :data_source,
+                      :salvation_flag,
+                      :client_type
 
         end
     end

data/lib/pingan_api/models/assistance/upload_photo_send_request.rb

@@ -0,0 +1,57 @@
+require 'pingan_api/models/extensions/attributes'
+require 'pingan_api/models/extensions/map'
+
+module PinganApi
+  module Models
+    module Assistance
+      class UploadPhotoSendRequest
+        include PinganApi::Models::Extensions::Attributes
+        include PinganApi::Models::Extensions::Map
+
+        attr_accessor :tran_code,
+                      :bank_code,
+                      :brno,
+                      :tellerno,
+                      :bk_acct_datetime,
+                      :bk_serial,
+                      :bk_orgn_sril,
+                      :bk_tran_chnl,
+                      :region_code,
+                      
+                      :salvation_id,
+                      :salvation_company_id,
+                      :car_mark,
+
+                      :photo1_shot_date,
+                      :photo1_uploaded_date,
+                      :photo1_gps_x,
+                      :photo1_gps_y,
+                      :photo1_name,
+
+                      :photo2_shot_date,
+                      :photo2_uploaded_date,
+                      :photo2_gps_x,
+                      :photo2_gps_y,
+                      :photo2_name,
+
+                      :photo3_shot_date,
+                      :photo3_uploaded_date,
+                      :photo3_gps_x,
+                      :photo3_gps_y,
+                      :photo3_name,
+
+                      :photo4_shot_date,
+                      :photo4_uploaded_date,
+                      :photo4_gps_x,
+                      :photo4_gps_y,
+                      :photo4_name,
+
+                      :photo5_shot_date,
+                      :photo5_uploaded_date,
+                      :photo5_gps_x,
+                      :photo5_gps_y,
+                      :photo5_name
+      end
+    end
+  end
+end

data/lib/pingan_api/templates/assistance/operation_send_request.xml.erb

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="GBK" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <Request>
   <Head>
     <TRAN_CODE><%= tran_code %></TRAN_CODE>

data/lib/pingan_api/templates/assistance/salvation_query_request.xml.erb

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="GBK" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <Request>
   <Head>
     <TRAN_CODE><%= tran_code %></TRAN_CODE>

data/lib/pingan_api/templates/assistance/salvation_receive_response.xml.erb

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <Response>
   <Head>
     <TRAN_CODE><%= tran_code %></TRAN_CODE>

data/lib/pingan_api/templates/assistance/upload_photo_send_request.xml.erb

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="GBK" ?>
+<Request>
+  <Head>
+    <TRAN_CODE><%= tran_code %></TRAN_CODE>
+    <BANK_CODE><%= bank_code %></BANK_CODE>
+    <BRNO><%= brno %></BRNO>
+    <TELLERNO><%= tellerno %></TELLERNO>
+    <BK_ACCT_DATE><%= bk_acct_datetime.strftime('%Y%m%d') %></BK_ACCT_DATE>
+    <BK_ACCT_TIME><%= bk_acct_datetime.strftime('%H:%M:%S') %></BK_ACCT_TIME>
+    <BK_SERIAL><%= bk_serial %></BK_SERIAL>
+    <BK_ORGN_SRIL><%= bk_orgn_sril %></BK_ORGN_SRIL>
+    <BK_TRAN_CHNL><%= bk_tran_chnl %></BK_TRAN_CHNL>
+    <REGION_CODE><%= region_code %></REGION_CODE>
+  </Head>
+  <Body>
+    <Apply>
+      <SALVATION_ID><%=salvation_id%></SALVATION_ID>
+      <SALVATION_COMPANY_ID><%=salvation_company_id%></SALVATION_COMPANY_ID>
+      <CAR_MARK><%=car_mark%></CAR_MARK>
+      <% if photo1_name %>
+      <PHOTO1>
+        <SHOT_DATE><%=photo1_shot_date.strftime('%Y-%m-%d %H:%M:%S') unless photo1_shot_date.nil? %></SHOT_DATE>
+        <UPLOADE_DATE><%=photo1_uploaded_date.strftime('%Y-%m-%d %H:%M:%S') unless photo1_uploaded_date.nil?%></UPLOADE_DATE>
+        <GPS_X><%=photo1_gps_x%></GPS_X>
+        <GPS_Y><%=photo1_gps_y%></GPS_Y>
+        <PHOTO_NAME><%=photo1_name%></PHOTO_NAME>
+      </PHOTO1>
+      <% end %>
+      <% if photo2_name %>
+      <PHOTO2>
+        <SHOT_DATE><%=photo2_shot_date.strftime('%Y-%m-%d %H:%M:%S') unless photo2_shot_date.nil? %></SHOT_DATE>
+        <UPLOADE_DATE><%=photo2_uploaded_date.strftime('%Y-%m-%d %H:%M:%S') unless photo2_uploaded_date.nil? %></UPLOADE_DATE>
+        <GPS_X><%=photo2_gps_x%></GPS_X>
+        <GPS_Y><%=photo2_gps_y%></GPS_Y>
+        <PHOTO_NAME><%=photo2_name%></PHOTO_NAME>
+      </PHOTO2>
+      <% end %>
+      <% if photo3_name %>
+      <PHOTO3>
+        <SHOT_DATE><%=photo3_shot_date.strftime('%Y-%m-%d %H:%M:%S') unless photo3_shot_date.nil? %></SHOT_DATE>
+        <UPLOADE_DATE><%=photo3_uploaded_date.strftime('%Y-%m-%d %H:%M:%S') unless photo3_uploaded_date.nil? %></UPLOADE_DATE>
+        <GPS_X><%=photo3_gps_x%></GPS_X>
+        <GPS_Y><%=photo3_gps_y%></GPS_Y>
+        <PHOTO_NAME><%=photo3_name%></PHOTO_NAME>
+      </PHOTO3>
+      <% end %>
+      <% if photo4_name %>
+      <PHOTO4>
+        <SHOT_DATE><%=photo4_shot_date.strftime('%Y-%m-%d %H:%M:%S') unless photo4_shot_date.nil? %></SHOT_DATE>
+        <UPLOADE_DATE><%=photo4_uploaded_date.strftime('%Y-%m-%d %H:%M:%S') unless photo4_uploaded_date.nil? %></UPLOADE_DATE>
+        <GPS_X><%=photo4_gps_x%></GPS_X>
+        <GPS_Y><%=photo4_gps_y%></GPS_Y>
+        <PHOTO_NAME><%=photo4_name%></PHOTO_NAME>
+      </PHOTO4>
+      <% end %>
+      <% if photo5_name %>
+      <PHOTO5>
+        <SHOT_DATE><%=photo5_shot_date.strftime('%Y-%m-%d %H:%M:%S') unless photo5_shot_date.nil? %></SHOT_DATE>
+        <UPLOADE_DATE><%=photo5_uploaded_date.strftime('%Y-%m-%d %H:%M:%S') unless photo5_uploaded_date.nil? %></UPLOADE_DATE>
+        <GPS_X><%=photo5_gps_x%></GPS_X>
+        <GPS_Y><%=photo5_gps_y%></GPS_Y>
+        <PHOTO_NAME><%=photo5_name%></PHOTO_NAME>
+      </PHOTO5>
+      <% end %>
+    </Apply>
+  </Body>
+</Request>

data/lib/pingan_api/version.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module PinganApi
-  VERSION = "0.1.0"
-end
+  VERSION = "0.1.10"
+end

data/spec/insurance_spec.rb

@@ -12,12 +12,12 @@ describe '' do
   # end
 
   it "should connect mongoid" do
-  	# log = PinganApi::Models::Log.new
-  	# log.request_body = "asdasdwwd"
-  	# log.save
+  	log = PinganApi::Models::Log.new
+  	log.request_body = "asdasdwwd"
+  	log.save
 
-  	# p log
-    # PinganApi::Models::Log.write
+  	p log
+    #PinganApi::Models::Log.write
   	true.should be_true
   end
 

data/spec/send_photo_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe "AssistanceBusiness", "#feature"  do
+  
+  it "can send photo" do
+    data = PinganApi::Models::Assistance::UploadPhotoSendRequest.new
+    data.tran_code = "100285"
+    data.bank_code = "99940000"
+    #data.salvation_id = aa_case.out_source_no
+    data.brno = "000000"
+    data.tellerno = ""
+    data.bk_acct_datetime = Time.now
+    data.bk_serial = ""
+    data.bk_orgn_sril = ""
+    data.bk_tran_chnl = "WEB"
+    data.region_code = "999999"
+    p data
+    back = PinganApi::AssistanceBusiness.new.send_photo(data)
+    p back
+    'back'.should_not be_empty
+  end
+
+
+  
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pingan_api
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.10
 platform: ruby
 authors:
 - liuzelei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,12 +118,14 @@ files:
 - lib/pingan_api/models/assistance/salvation_query_response.rb
 - lib/pingan_api/models/assistance/salvation_receive_request.rb
 - lib/pingan_api/models/assistance/salvation_receive_response.rb
+- lib/pingan_api/models/assistance/upload_photo_send_request.rb
 - lib/pingan_api/models/extensions/attributes.rb
 - lib/pingan_api/models/extensions/map.rb
 - lib/pingan_api/models/log.rb
 - lib/pingan_api/templates/assistance/operation_send_request.xml.erb
 - lib/pingan_api/templates/assistance/salvation_query_request.xml.erb
 - lib/pingan_api/templates/assistance/salvation_receive_response.xml.erb
+- lib/pingan_api/templates/assistance/upload_photo_send_request.xml.erb
 - lib/pingan_api/templates/samples/assistance/operation_send_request.xml.erb
 - lib/pingan_api/templates/samples/assistance/operation_send_response.xml.erb
 - lib/pingan_api/templates/samples/assistance/salvation_query_request.xml.erb
@@ -141,6 +143,7 @@ files:
 - spec/samples/assistance/salvation_query_response.xml.erb
 - spec/samples/assistance/salvation_receive_request.xml.erb
 - spec/samples/assistance/salvation_receive_response.xml.erb
+- spec/send_photo_spec.rb
 - spec/spec_helper.rb
 - test/test_assistance_bussiness.rb
 - test/test_helper.rb
@@ -165,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: "平安银行业务接口"
@@ -179,6 +182,7 @@ test_files:
 - spec/samples/assistance/salvation_query_response.xml.erb
 - spec/samples/assistance/salvation_receive_request.xml.erb
 - spec/samples/assistance/salvation_receive_response.xml.erb
+- spec/send_photo_spec.rb
 - spec/spec_helper.rb
 - test/test_assistance_bussiness.rb
 - test/test_helper.rb